merge upstream 🐱

This commit is contained in:
Milan* 2017-03-03 09:03:32 +01:00
commit 3fe3f3c35a
2 changed files with 24 additions and 0 deletions

View File

@ -260,3 +260,11 @@ minetest.register_craft({
{'moreblocks:slab_stone'},
},
})
minetest.register_craft({
output = "realchess:chessboard",
recipe = {
{"dye:black", "dye:white", "dye:black"},
{"moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood"}
},
})

View File

@ -30,6 +30,22 @@ register_stair_slab_panel_micro("obsidian_block", "block", "default:obsidian_blo
0
)
local name = {"red", "green", "white", "black", "blue", "brown", "cyan",
"grey", "dark_green", "dark_grey", "magenta", "orange", "pink",
"red", "violet", "yellow"}
for i = 1, 16 do
local name = name[i]
register_stair_slab_panel_micro(name, "block", "wool:"..name,
{cracky=3},
{"wool_"..name..".png"},
name .. "wool",
"block",
0
)
table.insert(circular_saw.known_stairs, "wool:"..name)
end
table.insert(circular_saw.known_stairs, "default:stone_block")
table.insert(circular_saw.known_stairs, "default:desert_stone_block")
table.insert(circular_saw.known_stairs, "default:sandstone_block")