diff options
| author | Jeija <norrepli@googlemail.com> | 2012-08-13 03:08:12 -0700 |
|---|---|---|
| committer | Jeija <norrepli@googlemail.com> | 2012-08-13 03:08:12 -0700 |
| commit | 987de2c7d5df3a389234b0122406afaaa3b1fafe (patch) | |
| tree | a469500b3bce75dcf91045ed51a27d05047a9566 | |
| parent | cf6106ce43cfd6c96d3eda4b7cb82bbc4c4d608a (diff) | |
| parent | 2a7f49ee04079089fa7b1ad1865c451e73ac3c8f (diff) | |
| download | mesecons-987de2c7d5df3a389234b0122406afaaa3b1fafe.tar mesecons-987de2c7d5df3a389234b0122406afaaa3b1fafe.tar.gz mesecons-987de2c7d5df3a389234b0122406afaaa3b1fafe.tar.bz2 mesecons-987de2c7d5df3a389234b0122406afaaa3b1fafe.tar.xz mesecons-987de2c7d5df3a389234b0122406afaaa3b1fafe.zip | |
Merge pull request #23 from VanessaE/master
solar panel doesn't actually need a side texture.
| -rw-r--r-- | mesecons/wires.lua | 16 | ||||
| -rw-r--r-- | mesecons_solarpanel/init.lua | 5 | ||||
| -rw-r--r-- | mesecons_textures/textures/jeija_solar_panel.png | bin | 686 -> 652 bytes | |||
| -rw-r--r-- | mesecons_textures/textures/jeija_solar_panel_sides.png | bin | 215 -> 0 bytes | |||
| -rw-r--r-- | mesecons_textures/textures/wires_bump_off.png | bin | 0 -> 347 bytes | |||
| -rw-r--r-- | mesecons_textures/textures/wires_bump_on.png | bin | 0 -> 386 bytes | |||
| -rw-r--r-- | mesecons_textures/textures/wires_off.png | bin | 532 -> 272 bytes | |||
| -rw-r--r-- | mesecons_textures/textures/wires_on.png | bin | 640 -> 286 bytes | |||
| -rw-r--r-- | mesecons_textures/textures/wires_vertical_off.png | bin | 643 -> 320 bytes | |||
| -rw-r--r-- | mesecons_textures/textures/wires_vertical_on.png | bin | 754 -> 341 bytes |
10 files changed, 9 insertions, 12 deletions
diff --git a/mesecons/wires.lua b/mesecons/wires.lua index 450aae2..f478548 100644 --- 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", diff --git a/mesecons_solarpanel/init.lua b/mesecons_solarpanel/init.lua index 7ec24af..f26c89d 100644 --- 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", diff --git a/mesecons_textures/textures/jeija_solar_panel.png b/mesecons_textures/textures/jeija_solar_panel.png Binary files differindex 5ff0640..a7b0f75 100644 --- a/mesecons_textures/textures/jeija_solar_panel.png +++ b/mesecons_textures/textures/jeija_solar_panel.png diff --git a/mesecons_textures/textures/jeija_solar_panel_sides.png b/mesecons_textures/textures/jeija_solar_panel_sides.png Binary files differdeleted file mode 100644 index c5fac85..0000000 --- a/mesecons_textures/textures/jeija_solar_panel_sides.png +++ /dev/null diff --git a/mesecons_textures/textures/wires_bump_off.png b/mesecons_textures/textures/wires_bump_off.png Binary files differnew file mode 100644 index 0000000..1e0bd74 --- /dev/null +++ b/mesecons_textures/textures/wires_bump_off.png diff --git a/mesecons_textures/textures/wires_bump_on.png b/mesecons_textures/textures/wires_bump_on.png Binary files differnew file mode 100644 index 0000000..da9a661 --- /dev/null +++ b/mesecons_textures/textures/wires_bump_on.png diff --git a/mesecons_textures/textures/wires_off.png b/mesecons_textures/textures/wires_off.png Binary files differindex bbe5e08..01c3fd8 100644 --- a/mesecons_textures/textures/wires_off.png +++ b/mesecons_textures/textures/wires_off.png diff --git a/mesecons_textures/textures/wires_on.png b/mesecons_textures/textures/wires_on.png Binary files differindex d3ffb04..8ea4a80 100644 --- a/mesecons_textures/textures/wires_on.png +++ b/mesecons_textures/textures/wires_on.png diff --git a/mesecons_textures/textures/wires_vertical_off.png b/mesecons_textures/textures/wires_vertical_off.png Binary files differindex 21fd0cd..bd2c9f7 100644 --- a/mesecons_textures/textures/wires_vertical_off.png +++ b/mesecons_textures/textures/wires_vertical_off.png diff --git a/mesecons_textures/textures/wires_vertical_on.png b/mesecons_textures/textures/wires_vertical_on.png Binary files differindex 2280764..a458f8f 100644 --- a/mesecons_textures/textures/wires_vertical_on.png +++ b/mesecons_textures/textures/wires_vertical_on.png |
