Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mods/decoblocks/nodes.lua
#	mods/decoblocks/textures/decoblocks_bamboo.png
#	mods/decoblocks/textures/decoblocks_bamboo_top.png

mods/decoblocks/nodes.lua

@@ -78,11 +78,19 @@ minetest.register_node("decoblocks:bamboo_block", {
 	"decoblocks_bamboo.png",
 	},
 	groups = {choppy = 1, oddly_breakable_by_hand = 2, wood=1},
-	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
+	sounds = default.node_sound_wood_defaults(),
 	on_place = minetest.rotate_node
 })
 
+minetest.register_node("decoblocks:bamboo_planks", {
+	description = "Bamboo Wood Planks",
+	tiles = {"decoblocks_bamboo_planks.png"},
+	groups = {cracky = 3, stone = 2},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+
 minetest.register_node("decoblocks:old_stone_tiles", {
 	description = "Old Stone Tiles",
 	tiles = {"decoblocks_old_stone_tiles.png"},