Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2021-06-20 17:10:29 +02:00
commit 3d63271855

View File

@ -570,7 +570,7 @@ minetest.register_craft({
}) })
minetest.register_craft({ minetest.register_craft({
output = "homedecor:kitchen_cabinet", output = "homedecor:kitchen_cabinet_colorable",
recipe = { recipe = {
{"group:wood", "group:stick", "group:wood", }, {"group:wood", "group:stick", "group:wood", },
{"group:wood", "group:stick", "group:wood", }, {"group:wood", "group:stick", "group:wood", },
@ -579,53 +579,53 @@ minetest.register_craft({
}) })
minetest.register_craft({ minetest.register_craft({
output = "homedecor:kitchen_cabinet_steel", output = "homedecor:kitchen_cabinet_colorable_steel",
recipe = { recipe = {
{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
{"", "homedecor:kitchen_cabinet", ""}, {"", "homedecor:kitchen_cabinet_colorable", ""},
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "homedecor:kitchen_cabinet_steel", output = "homedecor:kitchen_cabinet_colorable_steel",
recipe = { recipe = {
{"moreblocks:slab_steelblock_1"}, {"moreblocks:slab_steelblock_1"},
{ "homedecor:kitchen_cabinet" }, { "homedecor:kitchen_cabinet_colorable" },
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "homedecor:kitchen_cabinet_marble", output = "homedecor:kitchen_cabinet_colorable_marble",
recipe = { recipe = {
{"building_blocks:slab_marble"}, {"building_blocks:slab_marble"},
{"homedecor:kitchen_cabinet"}, {"homedecor:kitchen_cabinet_colorable"},
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "homedecor:kitchen_cabinet_marble", output = "homedecor:kitchen_cabinet_colorable_marble",
recipe = { recipe = {
{"technic:slab_marble_1"}, {"technic:slab_marble_1"},
{"homedecor:kitchen_cabinet"}, {"homedecor:kitchen_cabinet_colorable"},
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "homedecor:kitchen_cabinet_granite", output = "homedecor:kitchen_cabinet_colorable_granite",
recipe = { recipe = {
{"technic:slab_granite_1"}, {"technic:slab_granite_1"},
{"homedecor:kitchen_cabinet"}, {"homedecor:kitchen_cabinet_colorable"},
} }
}) })
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = "homedecor:kitchen_cabinet_half 2", output = "homedecor:kitchen_cabinet_colorable_half 2",
recipe = { "homedecor:kitchen_cabinet" } recipe = { "homedecor:kitchen_cabinet_colorable" }
}) })
minetest.register_craft({ minetest.register_craft({
output = "homedecor:kitchen_cabinet_with_sink", output = "homedecor:kitchen_cabinet_colorable_with_sink",
recipe = { recipe = {
{"group:wood", "default:steel_ingot", "group:wood", }, {"group:wood", "default:steel_ingot", "group:wood", },
{"group:wood", "default:steel_ingot", "group:wood", }, {"group:wood", "default:steel_ingot", "group:wood", },