diff options
author | Jeija <norrepli@gmail.com> | 2012-12-23 17:21:34 +0100 |
---|---|---|
committer | Jeija <norrepli@gmail.com> | 2012-12-23 17:21:34 +0100 |
commit | c508bfaea62156684ea90b04e8963fb9e30dfaf2 (patch) | |
tree | 331dcced93f3da27b6fbbc39da7e9486918908bc | |
parent | af8fd75fa484cdf881e2414f3baa3a0eed6562e9 (diff) | |
parent | 5e8e003b8c45e6cf4898f960d312b1f442a5e012 (diff) | |
download | mesecons-c508bfaea62156684ea90b04e8963fb9e30dfaf2.tar mesecons-c508bfaea62156684ea90b04e8963fb9e30dfaf2.tar.gz mesecons-c508bfaea62156684ea90b04e8963fb9e30dfaf2.tar.bz2 mesecons-c508bfaea62156684ea90b04e8963fb9e30dfaf2.tar.xz mesecons-c508bfaea62156684ea90b04e8963fb9e30dfaf2.zip |
Merge branch 'nextgen' of https://github.com/Jeija/minetest-mod-mesecons into nextgen
-rw-r--r-- | mesecons_extrawires/crossing.lua | 2 | ||||
-rw-r--r-- | mesecons_extrawires/tjunction.lua | 12 | ||||
-rw-r--r-- | mesecons_insulated/init.lua | 16 | ||||
-rw-r--r-- | mesecons_textures/textures/jeija_insulated_wire_sides_off.png (renamed from mesecons_textures/textures/jeija_insulated_wire_sides.png) | bin | 200 -> 200 bytes | |||
-rw-r--r-- | mesecons_textures/textures/jeija_insulated_wire_sides_on.png | bin | 0 -> 169 bytes |
5 files changed, 15 insertions, 15 deletions
diff --git a/mesecons_extrawires/crossing.lua b/mesecons_extrawires/crossing.lua index 2b35af1..9b381bf 100644 --- a/mesecons_extrawires/crossing.lua +++ b/mesecons_extrawires/crossing.lua @@ -6,7 +6,7 @@ end minetest.register_node("mesecons_extrawires:crossing_on", { drawtype = "nodebox", - tiles = {"jeija_insulated_wire_sides.png"}, + tiles = {"jeija_insulated_wire_sides_on.png"}, paramtype = "light", walkable = false, stack_max = 99, diff --git a/mesecons_extrawires/tjunction.lua b/mesecons_extrawires/tjunction.lua index cb16cfb..aa100f5 100644 --- a/mesecons_extrawires/tjunction.lua +++ b/mesecons_extrawires/tjunction.lua @@ -28,11 +28,11 @@ end minetest.register_node("mesecons_extrawires:tjunction_on", { drawtype = "nodebox", tiles = { - "jeija_insulated_wire_sides.png", - "jeija_insulated_wire_sides.png", + "jeija_insulated_wire_sides_on.png", + "jeija_insulated_wire_sides_on.png", "jeija_insulated_wire_ends_on.png", "jeija_insulated_wire_ends_on.png", - "jeija_insulated_wire_sides.png", + "jeija_insulated_wire_sides_on.png", "jeija_insulated_wire_ends_on.png" }, paramtype = "light", @@ -55,11 +55,11 @@ minetest.register_node("mesecons_extrawires:tjunction_off", { drawtype = "nodebox", description = "T-junction", tiles = { - "jeija_insulated_wire_sides.png", - "jeija_insulated_wire_sides.png", + "jeija_insulated_wire_sides_off.png", + "jeija_insulated_wire_sides_off.png", "jeija_insulated_wire_ends_off.png", "jeija_insulated_wire_ends_off.png", - "jeija_insulated_wire_sides.png", + "jeija_insulated_wire_sides_off.png", "jeija_insulated_wire_ends_off.png" }, paramtype = "light", diff --git a/mesecons_insulated/init.lua b/mesecons_insulated/init.lua index 8bf75c7..37f64c8 100644 --- a/mesecons_insulated/init.lua +++ b/mesecons_insulated/init.lua @@ -11,12 +11,12 @@ minetest.register_node("mesecons_insulated:insulated_on", { drawtype = "nodebox", description = "insulated mesecons", tiles = { - "jeija_insulated_wire_sides.png", - "jeija_insulated_wire_sides.png", + "jeija_insulated_wire_sides_on.png", + "jeija_insulated_wire_sides_on.png", "jeija_insulated_wire_ends_on.png", "jeija_insulated_wire_ends_on.png", - "jeija_insulated_wire_sides.png", - "jeija_insulated_wire_sides.png" + "jeija_insulated_wire_sides_on.png", + "jeija_insulated_wire_sides_on.png" }, paramtype = "light", paramtype2 = "facedir", @@ -43,12 +43,12 @@ minetest.register_node("mesecons_insulated:insulated_off", { drawtype = "nodebox", description = "insulated mesecons", tiles = { - "jeija_insulated_wire_sides.png", - "jeija_insulated_wire_sides.png", + "jeija_insulated_wire_sides_off.png", + "jeija_insulated_wire_sides_off.png", "jeija_insulated_wire_ends_off.png", "jeija_insulated_wire_ends_off.png", - "jeija_insulated_wire_sides.png", - "jeija_insulated_wire_sides.png" + "jeija_insulated_wire_sides_off.png", + "jeija_insulated_wire_sides_off.png" }, paramtype = "light", paramtype2 = "facedir", diff --git a/mesecons_textures/textures/jeija_insulated_wire_sides.png b/mesecons_textures/textures/jeija_insulated_wire_sides_off.png Binary files differindex db33f14..db33f14 100644 --- a/mesecons_textures/textures/jeija_insulated_wire_sides.png +++ b/mesecons_textures/textures/jeija_insulated_wire_sides_off.png diff --git a/mesecons_textures/textures/jeija_insulated_wire_sides_on.png b/mesecons_textures/textures/jeija_insulated_wire_sides_on.png Binary files differnew file mode 100644 index 0000000..f76e9a8 --- /dev/null +++ b/mesecons_textures/textures/jeija_insulated_wire_sides_on.png |