Merge branch 'cherry-pick-c3a57b9e' into 'master'

Merge branch 'patch-1' into 'master'

add default:sandstone_block

Submitted by ClaudiusMinimus on 2016-08-17
Added Sandstone Block, see lines: 683-693
line: 685 shows "default_sandstone_block.png", which is probably correct, but I am not sure, since I cannot test locally yet

See merge request !1

See merge request !2

depends.txt

@@ -1,2 +1,3 @@
 default
+darkage ?
 moretrees?

init.lua

@@ -548,9 +548,33 @@ columnia.register_column_ia("ice", "default:ice",
          default.node_sound_glass_defaults()
          )
 
-columnia.register_column_ia("nyancat_rainbow", "default:nyancat_rainbow",
+columnia.register_column_ia("serpentine", "darkage:serpentine",
          {cracky=3},
-         {"default_nc_rb.png"},
+         {"darkage_serpentine.png"},
+         "Serpentine Columin",
+         "Serpentine Top",
+         "Serpentine Bottom",
+         "Serpentine Crosslink",
+         "Serpentine Link",
+         "Serpentine Linkdown",
+         default.node_sound_stone_defaults()
+         )
+
+columnia.register_column_ia("marble", "darkage:marble",
+         {cracky=3},
+         {"darkage_marble.png"},
+         "Marble Columin",
+         "Marble Top",
+         "Marble Bottom",
+         "Marble Crosslink",
+         "Marble Link",
+         "Marble Linkdown",
+         default.node_sound_stone_defaults()
+         )
+
+columnia.register_column_ia("nyancat_rainbow", "nyancat:rainbow",
+         {cracky=3},
+         {"nyancat_rainbow.png"},
          "Rainbow Column",
          "Rainbow Top",
          "Rainbow Bottom",
@@ -655,6 +679,18 @@ columnia.register_column_ia("sandstonebrick", "default:sandstonebrick",
 		"Sandstone Brick Column Linkdown",
 		default.node_sound_stone_defaults()
         )
+        
+    columnia.register_column_ia("sandstone_block", "default:sandstone_block",
+    		{crumbly=2,cracky=2},
+    		{"default_sandstone_block.png"},
+    		"Sandstone Block Column",
+    		"Sandstone Block Column Top",
+    		"Sandstone Block Column Bottom",
+    		"Sandstone Block Column Crosslink",
+    		"Sandstone Block Column Link",
+    		"Sandstone Block Column Linkdown",
+    		default.node_sound_stone_defaults()
+            )        
 		
 columnia.register_column_ia("wood", "default:wood",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},