Merge branch 'github'

models.lua

@@ -29,6 +29,7 @@ minetest.register_node("scifi_nodes:slope_"..name, {
 		},
 	paramtype = "light",
 	paramtype2 = "facedir",
+	use_texture_alpha = "clip",
 	light_source = light,
 	groups = {cracky=1},
 	on_place = minetest.rotate_node
@@ -69,106 +70,104 @@ scifi_nodes.register_slope("blklt2", "Black stripe light", {"scifi_nodes_black_l
 local node = {}
 
 node.types = {
-	{"blue",      "blue lines",        "blue"},
-	{"holes",       "metal with holes","holes"},
-	{"white2",      "plastic",         "white2"},
-    {"super_white",      "Super Plastic",         "super_white", 11},
-    {"ultra_white",      "Ultra Plastic",         "ultra_white", default.LIGHT_MAX},
+	{"blue",      "blue lines"},
+	{"holes",       "metal with holes"},
+	{"white2",      "plastic",},
+	{"super_white",      "Super Plastic", 11},
+	{"ultra_white",      "Ultra Plastic", default.LIGHT_MAX},
 --	{"engine",      "engine",          "engine"},
-	{"wall",      "metal wall",        "wall"},
-	{"white",      "plastic wall",     "white"},
-	{"stripes2top",     "dirty metal block","metal2"},
-	{"rough",      "rough metal",      "rough"},
-	{"lighttop",      "metal block",      "metal"},
-	{"red",      "red lines",          "red"},
-	{"green",      "green lines",      "green"},
-	{"vent2",      "vent",              "vent"},
-	{"stripes",      "hazard stripes", "stripes"},
-	{"rust",      "rusty metal",       "rust"},
-	{"mesh",      "metal mesh",       "mesh"},
-	{"black",      "black wall",       "black"},
-	{"blackoct",      "black octagon",       "blackoct"},
-	{"blackpipe",      "black pipe",       "blackpipe"},
-	{"blacktile",      "black tile",       "blktl"},
-	{"blacktile2",      "black tile 2",       "blktl2"},
-	{"blackvent",      "black vent",       "blkvnt"},
-	{"bluebars",      "blue bars",       "bluebars"},
-	{"bluemetal",      "blue metal",       "blumtl"},
-	{"bluetile",      "blue tile",       "blutl"},
-	{"greytile",      "grey tile",       "grytl"},
-	{"mesh2",      "metal floormesh",       "mesh2"},
-	{"white",      "plastic wall",       "white"},
-	{"pipe",      "wall pipe",       "pipe2"},
-	{"pipeside",      "side pipe",       "pipe3"},
-	{"tile",      "white tile",       "tile"},
-	{"whiteoct",      "white octagon",       "whiteoct"},
-	{"whitetile",      "white tile2",       "whttl"},
-	{"black_detail",      "black detail",       "blckdtl"},
-	{"green_square",      "green metal block",       "grnblck"},
-	{"red_square",      "red metal block",       "redblck"},
-	{"grey_square",      "grey metal block",       "greyblck"},
-	{"blue_square",      "blue metal block",       "blublck"},
-	{"black_mesh",      "black vent block",       "blckmsh"},
-	{"dent",      "dented metal block",       "dent"},
-	{"greenmetal",      "green metal wall",       "grnmetl"},
-	{"greenmetal2",      "green metal wall2",       "grnmetl2"},
-	{"greenlights",      "green wall lights",       "grnlt", 10},
-	{"greenlights2",      "green wall lights2",       "grnlt2", 10},
-	{"greenbar",      "green light bar",       "grnlghtbr", 10},
-	{"green2",      "green wall panel",       "grn2"},
-	{"greentubes",      "green pipes",       "grntubes"},
-	{"grey",      "grey wall",       "gry"},
-	{"greybolts",      "grey wall bolts",       "gryblts"},
-	{"greybars",      "grey bars",       "grybrs"},
-	{"greydots",      "grey wall dots",       "grydts"},
-	{"greygreenbar",      "gray power pipe",       "grygrnbr", 10},
-	{"octofloor",      "Doom floor",       "octofloor"},
-	{"octofloor2",      "Brown Doom floor",       "octofloor2"},
-	{"doomwall1",      "Doom wall 1",       "doomwall1"},
-	{"doomwall2",      "Doom wall 2",       "doomwall2"},
-	{"doomwall3",      "Doom wall 3",       "doomwall3"},
-	{"doomwall4",      "Doom wall 4",       "doomwall4"},
-	{"doomwall41",      "Doom wall 4.1",       "doomwall4.1"},
-	{"doomwall42",      "Doom wall 4.2",       "doomwall4.2"},
-	{"doomwall43",      "Doom wall 4.3",       "doomwall4.3"},
-	{"doomwall431",      "Doom wall 4.3.1",       "doomwall4.3.1"},
-	{"doomwall44",      "Doom wall 4.4",       "doomwall4.4"},
-	{"blackdmg",      "Damaged black wall",       "blckdmg"},
-	{"blackdmgstripe",      "Damaged black wall(stripes)",       "blckdmgstripe"},
-	{"doomengine",      "Doom engine wall",       "doomengine"},
+	{"wall",      "metal wall"},
+	{"white",      "plastic wall"},
+	{"stripes2top",     "dirty metal block"},
+	{"rough",      "rough metal"},
+	{"lighttop",      "metal block"},
+	{"red",      "red lines"},
+	{"green",      "green lines"},
+	{"vent2",      "vent"},
+	{"stripes",      "hazard stripes"},
+	{"rust",      "rusty metal"},
+	{"mesh",      "metal mesh"},
+	{"black",      "black wall"},
+	{"blackoct",      "black octagon"},
+	{"blackpipe",      "black pipe"},
+	{"blacktile",      "black tile"},
+	{"blacktile2",      "black tile 2"},
+	{"blackvent",      "black vent"},
+	{"bluebars",      "blue bars"},
+	{"bluemetal",      "blue metal"},
+	{"bluetile",      "blue tile"},
+	{"greytile",      "grey tile"},
+	{"mesh2",      "metal floormesh"},
+	{"pipe",      "wall pipe"},
+	{"pipeside",      "side pipe"},
+	{"tile",      "white tile"},
+	{"whiteoct",      "white octagon"},
+	{"whitetile",      "white tile2"},
+	{"black_detail",      "black detail"},
+	{"green_square",      "green metal block"},
+	{"red_square",      "red metal block"},
+	{"grey_square",      "grey metal block"},
+	{"blue_square",      "blue metal block"},
+	{"black_mesh",      "black vent block"},
+	{"dent",      "dented metal block"},
+	{"greenmetal",      "green metal wall"},
+	{"greenmetal2",      "green metal wall2"},
+	{"greenlights",      "green wall lights",       10},
+	{"greenlights2",      "green wall lights2",     10},
+	{"greenbar",      "green light bar",            10},
+	{"green2",      "green wall panel"},
+	{"greentubes",      "green pipes"},
+	{"grey",      "grey wall"},
+	{"greybolts",      "grey wall bolts"},
+	{"greybars",      "grey bars"},
+	{"greydots",      "grey wall dots"},
+	{"greygreenbar",      "gray power pipe",        10},
+	{"octofloor",      "Doom floor"},
+	{"octofloor2",      "Brown Doom floor"},
+	{"doomwall1",      "Doom wall 1"},
+	{"doomwall2",      "Doom wall 2"},
+	{"doomwall3",      "Doom wall 3"},
+	{"doomwall4",      "Doom wall 4"},
+	{"doomwall41",      "Doom wall 4.1"},
+	{"doomwall42",      "Doom wall 4.2"},
+	{"doomwall43",      "Doom wall 4.3"},
+	{"doomwall431",      "Doom wall 4.3.1"},
+	{"doomwall44",      "Doom wall 4.4"},
+	{"blackdmg",      "Damaged black wall"},
+	{"blackdmgstripe",      "Damaged black wall(stripes)"},
+	{"doomengine",      "Doom engine wall"},
 --	{"monitorwall",      "Wall monitors",       "monitorwall"},
-	{"screen3",      "Wall monitor",       "screen3"},
-	{"doomlight",      "Doom light",       "doomlight", 12},
-	{"bluwllight",      "Blue wall light", "capsule3", default.LIGHT_MAX},
-	{"bluegrid",      "Blue Grid", "bluegrid", 5},
-	{"fan",      "Fan",       "fan"},
-	{"ppllght",      "Purple wall light", "", default.LIGHT_MAX},
-	{"pplwll",      "Purple wall", "", 0},
-	{"pplwll2",      "Purple wall2", "", 0},
-	{"pplwll3",      "Purple wall3", "", 0},
-	{"pplwll4",      "Purple wall4", "", 0},
-	{"pplblk",      "Purple tile", "", 0},
-	{"purple",      "Purple node", "", 0},
-	{"rock",      "Moonstone", "", 0},
-	{"rock2",      "Moonstone2", "", 0},
-	{"blackvnt",      "Black vent", "", 0},
-	{"blackplate",      "Black plate", "", 0},
+	{"screen3",      "Wall monitor"},
+	{"doomlight",      "Doom light",       12},
+	{"bluwllight",      "Blue wall light", default.LIGHT_MAX},
+	{"bluegrid",      "Blue Grid", 5},
+	{"fan",      "Fan"},
+	{"ppllght",      "Purple wall light", default.LIGHT_MAX},
+	{"pplwll",      "Purple wall"},
+	{"pplwll2",      "Purple wall2"},
+	{"pplwll3",      "Purple wall3"},
+	{"pplwll4",      "Purple wall4"},
+	{"pplblk",      "Purple tile"},
+	{"purple",      "Purple node"},
+	{"rock",      "Moonstone"},
+	{"rock2",      "Moonstone2"},
+	{"blackvnt",      "Black vent"},
+	{"blackplate",      "Black plate"},
 }
 
 if minetest.global_exists("stairsplus") then
-
 	for _, row in ipairs(node.types) do
 		local name = row[1]
-		local desc = row[2]
-		local light = row[4]
+
 		-- Node Definition
-		stairsplus:register_all("scifi_nodes", row[1], "scifi_nodes:"..name, {
-			description = desc,
+		stairsplus:register_all("scifi_nodes", name, "scifi_nodes:"..name, {
+			description = row[2],
 			tiles = {"scifi_nodes_"..name..".png"},
+			use_texture_alpha = "clip",
 			groups = {cracky=1},
 			paramtype = "light",
 			paramtype2 = "facedir",
-			light_source = light,
+			light_source = row[3],
 		})
 	end
 end

nodeboxes.lua

@@ -281,7 +281,7 @@ minetest.register_node("scifi_nodes:pplwndw", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	groups = {cracky=3},
 	sounds = default.node_sound_glass_defaults(),
 	node_box = {
@@ -308,7 +308,7 @@ minetest.register_node("scifi_nodes:gloshroom", {
 	walkable = false,
 	buildable_to = true,
 	sunlight_propagates = false,
-	use_texture_alpha =  true,
+	use_texture_alpha = "blend",
 	groups = {fleshy=1, oddly_breakable_by_hand=1, dig_immediate=3},
 	node_box = {
 		type = "fixed",
@@ -335,7 +335,7 @@ minetest.register_node("scifi_nodes:pot_lid", {
 	},
 	inventory_image = "scifi_nodes_pod_inv.png",
 	wield_image = "scifi_nodes_pod_inv.png",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	groups = {cracky=1, not_in_creative_inventory=1},
@@ -529,7 +529,7 @@ minetest.register_node("scifi_nodes:lightbars", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = default.LIGHT_MAX,
 	node_box = {
 		type = "fixed",
@@ -550,7 +550,7 @@ tiles = {{
 		name = "scifi_nodes_liquid.png",
 		animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 1.00},
 	}},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = default.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
@@ -570,7 +570,7 @@ minetest.register_node("scifi_nodes:liquid_pipe2", {
 tiles = {
 		"scifi_nodes_orange.png",
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = default.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
@@ -854,7 +854,7 @@ minetest.register_node("scifi_nodes:windowcorner", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -885,7 +885,7 @@ minetest.register_node("scifi_nodes:windowstraight", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -912,7 +912,7 @@ minetest.register_node("scifi_nodes:windowcorner2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -943,7 +943,7 @@ minetest.register_node("scifi_nodes:windowstraight2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -970,7 +970,7 @@ minetest.register_node("scifi_nodes:capsule", {
 		"scifi_nodes_capsule.png",
 		"scifi_nodes_capsule.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1000,7 +1000,7 @@ minetest.register_node("scifi_nodes:capsule3", {
 		"scifi_nodes_capsule3.png",
 		"scifi_nodes_capsule3.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1030,7 +1030,7 @@ minetest.register_node("scifi_nodes:capsule2", {
 		"scifi_nodes_capsule2.png",
 		"scifi_nodes_capsule2.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1118,7 +1118,7 @@ minetest.register_node("scifi_nodes:glassscreen", {
 		"scifi_nodes_glscrn.png",
 		"scifi_nodes_glscrn.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1204,7 +1204,7 @@ minetest.register_node("scifi_nodes:windowpanel", {
     },
     drawtype = "nodebox",
     paramtype = "light",
-    use_texture_alpha = true,
+    use_texture_alpha = "blend",
     sunlight_propagates = true,
     paramtype2 = "facedir",
     node_box = {

nodes.lua

@@ -346,7 +346,7 @@ minetest.register_node("scifi_nodes:octrng", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = 10,
 	groups = {cracky=2},
 	sounds = default.node_sound_glass_defaults(),
@@ -361,7 +361,7 @@ minetest.register_node("scifi_nodes:octgrn", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = 10,
 	groups = {cracky=2},
 	sounds = default.node_sound_glass_defaults(),
@@ -376,7 +376,7 @@ minetest.register_node("scifi_nodes:octbl", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = 10,
 	groups = {cracky=2},
 	sounds = default.node_sound_glass_defaults(),
@@ -391,7 +391,7 @@ minetest.register_node("scifi_nodes:octppl", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = 10,
 	groups = {cracky=2},
 	sounds = default.node_sound_glass_defaults(),
@@ -491,7 +491,7 @@ minetest.register_node("scifi_nodes:glass", {
 	tiles = {
 		"scifi_nodes_glass.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	paramtype = "light",
 	groups = {cracky=1},
 	sounds = default.node_sound_glass_defaults()

octagon_panes.lua

@@ -26,7 +26,7 @@ local function register(basename, description, texture)
       fixed = {{-0.5, -0.5, -0.25, 0.5, 0.5, 0.25}},
     },
     groups = {cracky = 3, oddly_breakable_by_hand = 3},
-    use_texture_alpha = true,
+    use_texture_alpha = "blend",
     sounds = default.node_sound_glass_defaults()
   })
 
@@ -51,7 +51,7 @@ local function register(basename, description, texture)
       fixed = {{-0.5, -0.5, -0.25, 0.5, 1.5, 0.25}},
     },
     groups = {cracky = 3, oddly_breakable_by_hand = 3},
-    use_texture_alpha = true,
+    use_texture_alpha = "blend",
     sounds = default.node_sound_glass_defaults()
   })
 
@@ -76,7 +76,7 @@ local function register(basename, description, texture)
       fixed = {{-0.5, -0.5, 0.75, 0.5, 0.5, 1.25}},
     },
     groups = {cracky = 3, oddly_breakable_by_hand = 3},
-    use_texture_alpha = true,
+    use_texture_alpha = "blend",
     sounds = default.node_sound_glass_defaults()
   })