Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2021-11-01 10:41:33 +01:00
commit 8816db8ecf

View File

@ -1486,9 +1486,9 @@ minetest.register_craft({
minetest.register_craft({ minetest.register_craft({
output = "scifi_nodes:plant8", output = "scifi_nodes:plant8",
recipe = { recipe = {
{"flowers:viola","default:junglegrass"}, {"flowers:viola","default:junglegrass", "default:grass_1"},
{"default:dirt",""}, {"default:dirt","",""},
{"scifi_nodes:greybolts",""} {"scifi_nodes:greybolts","",""}
} }
}) })
@ -1635,15 +1635,6 @@ minetest.register_craft({
} }
}) })
minetest.register_craft({
output = 'scifi_nodes:doomwall43 6',
recipe = {
{"scifi_nodes:white","dye:black","scifi_nodes:white"},
{"scifi_nodes:black","dye:dark_green","scifi_nodes:black"},
{"scifi_nodes:white","dye:yellow","scifi_nodes:white"}
}
})
minetest.register_craft({ minetest.register_craft({
output = 'scifi_nodes:doomwall43 6', output = 'scifi_nodes:doomwall43 6',
recipe = { recipe = {