Merge pull request #23 from VanessaE/master

solar panel doesn't actually need a side texture.
2012-08-13 03:08:12 -07:00 · 2012-08-13 03:08:12 -07:00 · 987de2c7d5
commit 987de2c7d5
parent cf6106ce43 2a7f49ee04
10 changed files with 9 additions and 12 deletions
--- a/mesecons/wires.lua
+++ b/mesecons/wires.lua
@ -92,16 +92,16 @@ for zmy=0, 1 do
 		table.insert(nodebox, box_bump1)
 		table.insert(nodebox, box_bump2)
 		tiles_off = {
-			"wires_off.png",
-			"wires_off.png",
+			"wires_bump_off.png",
+			"wires_bump_off.png",
 			"wires_vertical_off.png",
 			"wires_vertical_off.png",
 			"wires_vertical_off.png",
 			"wires_vertical_off.png"
 		}
 		tiles_on = {
-			"wires_on.png",
-			"wires_on.png",
+			"wires_bump_on.png",
+			"wires_bump_on.png",
 			"wires_vertical_on.png",
 			"wires_vertical_on.png",
 			"wires_vertical_on.png",
@ -110,16 +110,16 @@ for zmy=0, 1 do
 	else
 		table.insert(nodebox, box_center)
 		tiles_off = {
-			"wires_vertical_off.png",
-			"wires_vertical_off.png",
+			"wires_off.png",
+			"wires_off.png",
 			"wires_vertical_off.png",
 			"wires_vertical_off.png",
 			"wires_vertical_off.png",
 			"wires_vertical_off.png"
 		}
 		tiles_on = {
-			"wires_vertical_on.png",
-			"wires_vertical_on.png",
+			"wires_on.png",
+			"wires_on.png",
 			"wires_vertical_on.png",
 			"wires_vertical_on.png",
 			"wires_vertical_on.png",
--- a/mesecons_solarpanel/init.lua
+++ b/mesecons_solarpanel/init.lua
@ -1,10 +1,7 @@
 -- Solar Panel
 minetest.register_node("mesecons_solarpanel:solar_panel", {
 	drawtype = "nodebox",
-	tile_images = {
-		"jeija_solar_panel.png",
-		"jeija_solar_panel_sides.png"
-		},
+	tiles = { "jeija_solar_panel.png", },
 	inventory_image = "jeija_solar_panel.png",
 	wield_image = "jeija_solar_panel.png",
 	paramtype = "light",
--- a/mesecons_textures/textures/jeija_solar_panel.png
+++ b/mesecons_textures/textures/jeija_solar_panel.png
--- a/mesecons_textures/textures/jeija_solar_panel_sides.png
+++ b/mesecons_textures/textures/jeija_solar_panel_sides.png
--- a/mesecons_textures/textures/wires_bump_off.png
+++ b/mesecons_textures/textures/wires_bump_off.png
--- a/mesecons_textures/textures/wires_bump_on.png
+++ b/mesecons_textures/textures/wires_bump_on.png
--- a/mesecons_textures/textures/wires_off.png
+++ b/mesecons_textures/textures/wires_off.png
--- a/mesecons_textures/textures/wires_on.png
+++ b/mesecons_textures/textures/wires_on.png
--- a/mesecons_textures/textures/wires_vertical_off.png
+++ b/mesecons_textures/textures/wires_vertical_off.png
--- a/mesecons_textures/textures/wires_vertical_on.png
+++ b/mesecons_textures/textures/wires_vertical_on.png