summaryrefslogtreecommitdiff
path: root/mesecons_textures/textures
diff options
context:
space:
mode:
authorJeija <norrepli@gmail.com>2012-12-31 18:32:46 +0100
committerJeija <norrepli@gmail.com>2012-12-31 18:32:46 +0100
commitec07fc27d7ef76114fd977283c36a20afe26f13f (patch)
treee8eab0fd457abdd33adaebbd46c4cf77e2fefd1c /mesecons_textures/textures
parent5921f6d46caa18310435046a22d5aa0f529998f0 (diff)
parent52ddd4bdc931a1f806ea581002b0f39ba83158bc (diff)
downloadmesecons-ec07fc27d7ef76114fd977283c36a20afe26f13f.tar
mesecons-ec07fc27d7ef76114fd977283c36a20afe26f13f.tar.gz
mesecons-ec07fc27d7ef76114fd977283c36a20afe26f13f.tar.bz2
mesecons-ec07fc27d7ef76114fd977283c36a20afe26f13f.tar.xz
mesecons-ec07fc27d7ef76114fd977283c36a20afe26f13f.zip
Merge branch 'nextgen'
Conflicts: mesecons/wires.lua
Diffstat (limited to 'mesecons_textures/textures')
-rw-r--r--mesecons_textures/textures/jeija_insulated_wire_curved_tb_off.pngbin0 -> 253 bytes
-rw-r--r--mesecons_textures/textures/jeija_insulated_wire_curved_tb_on.pngbin0 -> 196 bytes
-rw-r--r--mesecons_textures/textures/jeija_insulated_wire_ends_off.pngbin172 -> 173 bytes
-rw-r--r--mesecons_textures/textures/jeija_insulated_wire_ends_on.pngbin172 -> 166 bytes
-rw-r--r--mesecons_textures/textures/jeija_insulated_wire_sides_off.png (renamed from mesecons_textures/textures/jeija_insulated_wire_sides.png)bin200 -> 200 bytes
-rw-r--r--mesecons_textures/textures/jeija_insulated_wire_sides_on.pngbin0 -> 169 bytes
-rw-r--r--mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_off.pngbin0 -> 244 bytes
-rw-r--r--mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_on.pngbin0 -> 207 bytes
-rw-r--r--mesecons_textures/textures/jeija_piston_pusher_normal.pngbin793 -> 0 bytes
-rw-r--r--mesecons_textures/textures/jeija_piston_pusher_sticky.pngbin782 -> 0 bytes
-rw-r--r--mesecons_textures/textures/jeija_piston_side.pngbin793 -> 0 bytes
-rw-r--r--mesecons_textures/textures/jeija_piston_sticky_side.pngbin782 -> 0 bytes
-rw-r--r--mesecons_textures/textures/jeija_piston_tb.pngbin778 -> 0 bytes
-rw-r--r--mesecons_textures/textures/mesecons_piston_back.pngbin0 -> 763 bytes
-rw-r--r--mesecons_textures/textures/mesecons_piston_bottom.pngbin0 -> 791 bytes
-rw-r--r--mesecons_textures/textures/mesecons_piston_left.pngbin0 -> 790 bytes
-rw-r--r--mesecons_textures/textures/mesecons_piston_on_front.pngbin0 -> 759 bytes
-rw-r--r--mesecons_textures/textures/mesecons_piston_pusher_back.pngbin0 -> 781 bytes
-rw-r--r--mesecons_textures/textures/mesecons_piston_pusher_bottom.pngbin0 -> 762 bytes
-rw-r--r--mesecons_textures/textures/mesecons_piston_pusher_front.pngbin0 -> 759 bytes
-rw-r--r--mesecons_textures/textures/mesecons_piston_pusher_front_sticky.pngbin0 -> 738 bytes
-rw-r--r--mesecons_textures/textures/mesecons_piston_pusher_left.pngbin0 -> 790 bytes
-rw-r--r--mesecons_textures/textures/mesecons_piston_pusher_right.pngbin0 -> 802 bytes
-rw-r--r--mesecons_textures/textures/mesecons_piston_pusher_top.pngbin0 -> 787 bytes
-rw-r--r--mesecons_textures/textures/mesecons_piston_right.pngbin0 -> 786 bytes
-rw-r--r--mesecons_textures/textures/mesecons_piston_top.pngbin0 -> 790 bytes
-rw-r--r--mesecons_textures/textures/wires_full_off.pngbin0 -> 465 bytes
-rw-r--r--mesecons_textures/textures/wires_full_on.pngbin0 -> 464 bytes
28 files changed, 0 insertions, 0 deletions
diff --git a/mesecons_textures/textures/jeija_insulated_wire_curved_tb_off.png b/mesecons_textures/textures/jeija_insulated_wire_curved_tb_off.png
new file mode 100644
index 0000000..85ca90b
--- /dev/null
+++ b/mesecons_textures/textures/jeija_insulated_wire_curved_tb_off.png
Binary files differ
diff --git a/mesecons_textures/textures/jeija_insulated_wire_curved_tb_on.png b/mesecons_textures/textures/jeija_insulated_wire_curved_tb_on.png
new file mode 100644
index 0000000..772d9a6
--- /dev/null
+++ b/mesecons_textures/textures/jeija_insulated_wire_curved_tb_on.png
Binary files differ
diff --git a/mesecons_textures/textures/jeija_insulated_wire_ends_off.png b/mesecons_textures/textures/jeija_insulated_wire_ends_off.png
index accb72a..1fb4782 100644
--- a/mesecons_textures/textures/jeija_insulated_wire_ends_off.png
+++ b/mesecons_textures/textures/jeija_insulated_wire_ends_off.png
Binary files differ
diff --git a/mesecons_textures/textures/jeija_insulated_wire_ends_on.png b/mesecons_textures/textures/jeija_insulated_wire_ends_on.png
index 8148edd..91736ed 100644
--- a/mesecons_textures/textures/jeija_insulated_wire_ends_on.png
+++ b/mesecons_textures/textures/jeija_insulated_wire_ends_on.png
Binary files differ
diff --git a/mesecons_textures/textures/jeija_insulated_wire_sides.png b/mesecons_textures/textures/jeija_insulated_wire_sides_off.png
index db33f14..db33f14 100644
--- a/mesecons_textures/textures/jeija_insulated_wire_sides.png
+++ b/mesecons_textures/textures/jeija_insulated_wire_sides_off.png
Binary files differ
diff --git a/mesecons_textures/textures/jeija_insulated_wire_sides_on.png b/mesecons_textures/textures/jeija_insulated_wire_sides_on.png
new file mode 100644
index 0000000..f76e9a8
--- /dev/null
+++ b/mesecons_textures/textures/jeija_insulated_wire_sides_on.png
Binary files differ
diff --git a/mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_off.png b/mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_off.png
new file mode 100644
index 0000000..a897b29
--- /dev/null
+++ b/mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_off.png
Binary files differ
diff --git a/mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_on.png b/mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_on.png
new file mode 100644
index 0000000..8fc312b
--- /dev/null
+++ b/mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_on.png
Binary files differ
diff --git a/mesecons_textures/textures/jeija_piston_pusher_normal.png b/mesecons_textures/textures/jeija_piston_pusher_normal.png
deleted file mode 100644
index d4a3525..0000000
--- a/mesecons_textures/textures/jeija_piston_pusher_normal.png
+++ /dev/null
Binary files differ
diff --git a/mesecons_textures/textures/jeija_piston_pusher_sticky.png b/mesecons_textures/textures/jeija_piston_pusher_sticky.png
deleted file mode 100644
index 971150c..0000000
--- a/mesecons_textures/textures/jeija_piston_pusher_sticky.png
+++ /dev/null
Binary files differ
diff --git a/mesecons_textures/textures/jeija_piston_side.png b/mesecons_textures/textures/jeija_piston_side.png
deleted file mode 100644
index 7ae047c..0000000
--- a/mesecons_textures/textures/jeija_piston_side.png
+++ /dev/null
Binary files differ
diff --git a/mesecons_textures/textures/jeija_piston_sticky_side.png b/mesecons_textures/textures/jeija_piston_sticky_side.png
deleted file mode 100644
index 544da97..0000000
--- a/mesecons_textures/textures/jeija_piston_sticky_side.png
+++ /dev/null
Binary files differ
diff --git a/mesecons_textures/textures/jeija_piston_tb.png b/mesecons_textures/textures/jeija_piston_tb.png
deleted file mode 100644
index 43751e0..0000000
--- a/mesecons_textures/textures/jeija_piston_tb.png
+++ /dev/null
Binary files differ
diff --git a/mesecons_textures/textures/mesecons_piston_back.png b/mesecons_textures/textures/mesecons_piston_back.png
new file mode 100644
index 0000000..6a57dce
--- /dev/null
+++ b/mesecons_textures/textures/mesecons_piston_back.png
Binary files differ
diff --git a/mesecons_textures/textures/mesecons_piston_bottom.png b/mesecons_textures/textures/mesecons_piston_bottom.png
new file mode 100644
index 0000000..5a3af9b
--- /dev/null
+++ b/mesecons_textures/textures/mesecons_piston_bottom.png
Binary files differ
diff --git a/mesecons_textures/textures/mesecons_piston_left.png b/mesecons_textures/textures/mesecons_piston_left.png
new file mode 100644
index 0000000..215dd73
--- /dev/null
+++ b/mesecons_textures/textures/mesecons_piston_left.png
Binary files differ
diff --git a/mesecons_textures/textures/mesecons_piston_on_front.png b/mesecons_textures/textures/mesecons_piston_on_front.png
new file mode 100644
index 0000000..0ade67e
--- /dev/null
+++ b/mesecons_textures/textures/mesecons_piston_on_front.png
Binary files differ
diff --git a/mesecons_textures/textures/mesecons_piston_pusher_back.png b/mesecons_textures/textures/mesecons_piston_pusher_back.png
new file mode 100644
index 0000000..fe87943
--- /dev/null
+++ b/mesecons_textures/textures/mesecons_piston_pusher_back.png
Binary files differ
diff --git a/mesecons_textures/textures/mesecons_piston_pusher_bottom.png b/mesecons_textures/textures/mesecons_piston_pusher_bottom.png
new file mode 100644
index 0000000..87c4e81
--- /dev/null
+++ b/mesecons_textures/textures/mesecons_piston_pusher_bottom.png
Binary files differ
diff --git a/mesecons_textures/textures/mesecons_piston_pusher_front.png b/mesecons_textures/textures/mesecons_piston_pusher_front.png
new file mode 100644
index 0000000..8ec9dc6
--- /dev/null
+++ b/mesecons_textures/textures/mesecons_piston_pusher_front.png
Binary files differ
diff --git a/mesecons_textures/textures/mesecons_piston_pusher_front_sticky.png b/mesecons_textures/textures/mesecons_piston_pusher_front_sticky.png
new file mode 100644
index 0000000..e38b4e6
--- /dev/null
+++ b/mesecons_textures/textures/mesecons_piston_pusher_front_sticky.png
Binary files differ
diff --git a/mesecons_textures/textures/mesecons_piston_pusher_left.png b/mesecons_textures/textures/mesecons_piston_pusher_left.png
new file mode 100644
index 0000000..bc5495b
--- /dev/null
+++ b/mesecons_textures/textures/mesecons_piston_pusher_left.png
Binary files differ
diff --git a/mesecons_textures/textures/mesecons_piston_pusher_right.png b/mesecons_textures/textures/mesecons_piston_pusher_right.png
new file mode 100644
index 0000000..32ee32f
--- /dev/null
+++ b/mesecons_textures/textures/mesecons_piston_pusher_right.png
Binary files differ
diff --git a/mesecons_textures/textures/mesecons_piston_pusher_top.png b/mesecons_textures/textures/mesecons_piston_pusher_top.png
new file mode 100644
index 0000000..72f04e9
--- /dev/null
+++ b/mesecons_textures/textures/mesecons_piston_pusher_top.png
Binary files differ
diff --git a/mesecons_textures/textures/mesecons_piston_right.png b/mesecons_textures/textures/mesecons_piston_right.png
new file mode 100644
index 0000000..176463c
--- /dev/null
+++ b/mesecons_textures/textures/mesecons_piston_right.png
Binary files differ
diff --git a/mesecons_textures/textures/mesecons_piston_top.png b/mesecons_textures/textures/mesecons_piston_top.png
new file mode 100644
index 0000000..5c8bace
--- /dev/null
+++ b/mesecons_textures/textures/mesecons_piston_top.png
Binary files differ
diff --git a/mesecons_textures/textures/wires_full_off.png b/mesecons_textures/textures/wires_full_off.png
new file mode 100644
index 0000000..58164fa
--- /dev/null
+++ b/mesecons_textures/textures/wires_full_off.png
Binary files differ
diff --git a/mesecons_textures/textures/wires_full_on.png b/mesecons_textures/textures/wires_full_on.png
new file mode 100644
index 0000000..98a86c8
--- /dev/null
+++ b/mesecons_textures/textures/wires_full_on.png
Binary files differ