Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Sys Quatre 2020-12-24 21:10:26 +01:00
commit d66e04f9b1
2 changed files with 6 additions and 4 deletions

View File

@ -1282,10 +1282,13 @@ minetest.register_craft({
}) })
-- https://forum.minetest.net/viewtopic.php?f=10&t=13125&p=261481#p261481 -- https://forum.minetest.net/viewtopic.php?f=10&t=13125&p=261481#p261481
-- with modified recipe
minetest.register_craft({ minetest.register_craft({
output = 'scifi_nodes:windowpanel 4', output = 'scifi_nodes:windowpanel',
recipe = { recipe = {
{"scifi_nodes:glass","",""} {"scifi_nodes:glass_pane","scifi_nodes:glass_pane",""},
{"scifi_nodes:glass_pane","scifi_nodes:glass_pane",""},
{"","",""}
} }
}) })

View File

@ -20,7 +20,6 @@ dofile(MP.."/nodeboxes.lua")
dofile(MP.."/palm_scanner.lua") dofile(MP.."/palm_scanner.lua")
dofile(MP.."/digicode.lua") dofile(MP.."/digicode.lua")
dofile(MP.."/models.lua") dofile(MP.."/models.lua")
dofile(MP.."/crafts.lua")
dofile(MP.."/octagon_panes.lua") dofile(MP.."/octagon_panes.lua")
dofile(MP.."/crafts.lua")
minetest.log("action", "[scifi_nodes] loaded.") minetest.log("action", "[scifi_nodes] loaded.")