Merge remote-tracking branch 'upstream/master'

crafts.lua

@@ -767,16 +767,6 @@ minetest.register_craft({
     }
 })
 
--- 4 green light bar from 4 green metal, 2 green dye, 1 lightbar
-minetest.register_craft({
-    output = "scifi_nodes:greenbar_animated 4",
-    recipe = {
-        {"scifi_nodes:greenbar", "", "scifi_nodes:greenbar"},
-        {"", "mesecons:wire_00000000_off", ""},
-        {"scifi_nodes:greenbar", "", "scifi_nodes:greenbar"}
-    }
-})
-
 -- 4 green metal block from 4 green metal
 minetest.register_craft({
     output = "scifi_nodes:green_square 4",
@@ -1292,13 +1282,10 @@ minetest.register_craft({
 })
 
 -- https://forum.minetest.net/viewtopic.php?f=10&t=13125&p=261481#p261481
--- with modified recipe
 minetest.register_craft({
-    output = 'scifi_nodes:windowpanel',
+    output = 'scifi_nodes:windowpanel 4',
     recipe = {
-        {"scifi_nodes:glass_pane","scifi_nodes:glass_pane",""},
+        {"scifi_nodes:glass","",""}
-        {"scifi_nodes:glass_pane","scifi_nodes:glass_pane",""},
-        {"","",""}
     }
 })
 

init.lua

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

nodeboxes.lua

@@ -475,12 +475,6 @@ minetest.register_node("scifi_nodes:light_dynamic", {
 		type = "wallmounted",
 		fixed = {-0.5, -0.5, -0.5, -0.45, 0.5, 0.5}
 	},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			fixed = {-0.5, -0.5, -0.5, -0.45, 0.5, 0.5}
-		}
-	},
 	paramtype2 = "wallmounted",
 	light_source = default.LIGHT_MAX,
 	groups = {cracky=1, oddly_breakable_by_hand=1},

nodes.lua

@@ -182,23 +182,6 @@ minetest.register_node("scifi_nodes:disc", {
 	groups = {cracky=1}
 })
 
-minetest.register_node("scifi_nodes:greenbar_animated", {
-	description = "animated green light bar",
-	sunlight_propagates = false,
-	tiles = {
-		"scifi_nodes_greenbar.png",
-		"scifi_nodes_greenbar.png", {
-			name="scifi_nodes_greenbar_animated.png",
-			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.00},
-		}
-	},
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky=1},
-	light_source = 10,
-	sounds = default.node_sound_glass_defaults(),
-	on_place = minetest.rotate_node
-})
 
 minetest.register_node("scifi_nodes:blink", {
 	description = "blinking light",