merge upstream 🐈

This commit is contained in:
Milan* 2017-05-26 20:16:30 +02:00
commit db86b41035

View File

@ -38,12 +38,12 @@ register_stair_slab_panel_micro("twigs", "block", "trunks:twigs",
0
)
register_stair_slab_panel_micro("stonebrick", "block", "illuna:stonebrick",
register_stair_slab_panel_micro("illuna_stonebrick", "block", "illuna:stonebrick",
{cracky=3},
{"default_stone_brick.png"},
"Stonebrick",
"block",
0
3
)
local name = {"red", "green", "white", "black", "blue", "brown", "cyan",