Merge remote-tracking branch 'refs/remotes/origin/master' into layout-refactor

node_axle.lua

@@ -8,12 +8,12 @@ minetest.register_node("digtron:axle", {
 	is_ground_content = false,
 	-- Aims in the +Z direction by default
 	tiles = {
-		"digtron_axel_top.png",
-		"digtron_axel_top.png",
-		"digtron_axel_side.png",
-		"digtron_axel_side.png",
-		"digtron_axel_side.png",
-		"digtron_axel_side.png",
+		"digtron_plate.png^digtron_axel_top.png",
+		"digtron_plate.png^digtron_axel_top.png",
+		"digtron_plate.png^digtron_axel_side.png",
+		"digtron_plate.png^digtron_axel_side.png",
+		"digtron_plate.png^digtron_axel_side.png",
+		"digtron_plate.png^digtron_axel_side.png",
 	},
 	
 	drawtype = "nodebox",

node_builders.lua

@@ -14,7 +14,7 @@ minetest.register_node("digtron:builder", {
 		"digtron_plate.png^[transformR270",
 		"digtron_plate.png",
 		"digtron_plate.png^[transformR180",
-		"digtron_builder.png",
+		"digtron_plate.png^digtron_builder.png",
 		"digtron_plate.png",
 	},
 	

node_controllers.lua

@@ -27,7 +27,7 @@ minetest.register_node("digtron:controller", {
 		"digtron_plate.png",
 		"digtron_plate.png^[transformR180",
 		"digtron_plate.png",
-		"digtron_control.png",
+		"digtron_plate.png^digtron_control.png",
 	},
 	
 	drawtype = "nodebox",
@@ -133,7 +133,7 @@ minetest.register_node("digtron:auto_controller", {
 		"digtron_plate.png^[colorize:#88000030",
 		"digtron_plate.png^[transformR180^[colorize:#88000030",
 		"digtron_plate.png^[colorize:#88000030",
-		"digtron_control.png^[colorize:#88000030",
+		"digtron_plate.png^digtron_control.png^[colorize:#88000030",
 	},
 	
 	drawtype = "nodebox",
@@ -206,7 +206,7 @@ minetest.register_node("digtron:pusher", {
 		"digtron_plate.png^[colorize:#00880030",
 		"digtron_plate.png^[transformR180^[colorize:#00880030",
 		"digtron_plate.png^[colorize:#00880030",
-		"digtron_control.png^[colorize:#00880030",
+		"digtron_plate.png^digtron_control.png^[colorize:#00880030",
 	},
 	
 	drawtype = "nodebox",

node_diggers.lua

@@ -69,7 +69,7 @@ minetest.register_node("digtron:digger", {
 				length = 1.0,
 			},
 		},
-		"digtron_motor.png",
+		"digtron_plate.png^digtron_motor.png",
 	},
 
 	-- returns fuel_cost, item_produced
@@ -119,7 +119,7 @@ minetest.register_node("digtron:intermittent_digger", {
 				length = 1.0,
 			},
 		},
-		"digtron_intermittent_motor.png",
+		"digtron_plate.png^digtron_intermittent_motor.png",
 	},
 	
 	on_construct = intermittent_on_construct,
@@ -181,7 +181,7 @@ minetest.register_node("digtron:soft_digger", {
 				length = 1.0,
 			},
 		},
-		"digtron_motor.png^[colorize:#88880030",
+		"digtron_plate.png^digtron_motor.png^[colorize:#88880030",
 	},
 	
 	execute_dig = function(pos, protected_nodes, nodes_dug, controlling_coordinate)
@@ -238,7 +238,7 @@ minetest.register_node("digtron:intermittent_soft_digger", {
 				length = 1.0,
 			},
 		},
-		"digtron_intermittent_motor.png^[colorize:#88880030",
+		"digtron_plate.png^digtron_intermittent_motor.png^[colorize:#88880030",
 	},
 	
 	on_construct = intermittent_on_construct,

node_misc.lua

@@ -34,7 +34,7 @@ minetest.register_node("digtron:light", {
 	description = "Digtron Light",
 	groups = {cracky = 3,  oddly_breakable_by_hand=3, digtron = 1},
 	drop = "digtron:light",
-	tiles = {"digtron_light.png"},
+	tiles = {"digtron_plate.png^digtron_light.png"},
 	drawtype = "nodebox",
 	paramtype = "light",
 	is_ground_content = false,

node_storage.lua

@@ -8,7 +8,7 @@ minetest.register_node("digtron:inventory",
 	sounds = digtron.metal_sounds,
 	paramtype2= "facedir",
 	is_ground_content = false,
-	tiles = {"digtron_inventory.png"},
+	tiles = {"digtron_plate.png^digtron_inventory.png"},
 
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
@@ -67,7 +67,7 @@ minetest.register_node("digtron:fuelstore",
 	sounds = digtron.metal_sounds,
 	paramtype2= "facedir",
 	is_ground_content = false,
-	tiles = {"digtron_fuelstore.png"},
+	tiles = {"digtron_plate.png^digtron_fuelstore.png"},
 
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
@@ -146,7 +146,7 @@ minetest.register_node("digtron:combined_storage",
 	sounds = digtron.metal_sounds,
 	paramtype2= "facedir",
 	is_ground_content = false,
-	tiles = {"digtron_combined_storage.png"},
+	tiles = {"digtron_plate.png^digtron_combined_storage.png"},
 
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)