diff options
author | Jeija <norrepli@gmail.com> | 2012-12-31 18:32:46 +0100 |
---|---|---|
committer | Jeija <norrepli@gmail.com> | 2012-12-31 18:32:46 +0100 |
commit | ec07fc27d7ef76114fd977283c36a20afe26f13f (patch) | |
tree | e8eab0fd457abdd33adaebbd46c4cf77e2fefd1c /mesecons_textures | |
parent | 5921f6d46caa18310435046a22d5aa0f529998f0 (diff) | |
parent | 52ddd4bdc931a1f806ea581002b0f39ba83158bc (diff) | |
download | mesecons-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')
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 Binary files differnew file mode 100644 index 0000000..85ca90b --- /dev/null +++ b/mesecons_textures/textures/jeija_insulated_wire_curved_tb_off.png diff --git a/mesecons_textures/textures/jeija_insulated_wire_curved_tb_on.png b/mesecons_textures/textures/jeija_insulated_wire_curved_tb_on.png Binary files differnew file mode 100644 index 0000000..772d9a6 --- /dev/null +++ b/mesecons_textures/textures/jeija_insulated_wire_curved_tb_on.png diff --git a/mesecons_textures/textures/jeija_insulated_wire_ends_off.png b/mesecons_textures/textures/jeija_insulated_wire_ends_off.png Binary files differindex accb72a..1fb4782 100644 --- a/mesecons_textures/textures/jeija_insulated_wire_ends_off.png +++ b/mesecons_textures/textures/jeija_insulated_wire_ends_off.png diff --git a/mesecons_textures/textures/jeija_insulated_wire_ends_on.png b/mesecons_textures/textures/jeija_insulated_wire_ends_on.png Binary files differindex 8148edd..91736ed 100644 --- a/mesecons_textures/textures/jeija_insulated_wire_ends_on.png +++ b/mesecons_textures/textures/jeija_insulated_wire_ends_on.png 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 diff --git a/mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_off.png b/mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_off.png Binary files differnew file mode 100644 index 0000000..a897b29 --- /dev/null +++ b/mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_off.png diff --git a/mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_on.png b/mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_on.png Binary files differnew file mode 100644 index 0000000..8fc312b --- /dev/null +++ b/mesecons_textures/textures/jeija_insulated_wire_tjunction_tb_on.png diff --git a/mesecons_textures/textures/jeija_piston_pusher_normal.png b/mesecons_textures/textures/jeija_piston_pusher_normal.png Binary files differdeleted file mode 100644 index d4a3525..0000000 --- a/mesecons_textures/textures/jeija_piston_pusher_normal.png +++ /dev/null diff --git a/mesecons_textures/textures/jeija_piston_pusher_sticky.png b/mesecons_textures/textures/jeija_piston_pusher_sticky.png Binary files differdeleted file mode 100644 index 971150c..0000000 --- a/mesecons_textures/textures/jeija_piston_pusher_sticky.png +++ /dev/null diff --git a/mesecons_textures/textures/jeija_piston_side.png b/mesecons_textures/textures/jeija_piston_side.png Binary files differdeleted file mode 100644 index 7ae047c..0000000 --- a/mesecons_textures/textures/jeija_piston_side.png +++ /dev/null diff --git a/mesecons_textures/textures/jeija_piston_sticky_side.png b/mesecons_textures/textures/jeija_piston_sticky_side.png Binary files differdeleted file mode 100644 index 544da97..0000000 --- a/mesecons_textures/textures/jeija_piston_sticky_side.png +++ /dev/null diff --git a/mesecons_textures/textures/jeija_piston_tb.png b/mesecons_textures/textures/jeija_piston_tb.png Binary files differdeleted file mode 100644 index 43751e0..0000000 --- a/mesecons_textures/textures/jeija_piston_tb.png +++ /dev/null diff --git a/mesecons_textures/textures/mesecons_piston_back.png b/mesecons_textures/textures/mesecons_piston_back.png Binary files differnew file mode 100644 index 0000000..6a57dce --- /dev/null +++ b/mesecons_textures/textures/mesecons_piston_back.png diff --git a/mesecons_textures/textures/mesecons_piston_bottom.png b/mesecons_textures/textures/mesecons_piston_bottom.png Binary files differnew file mode 100644 index 0000000..5a3af9b --- /dev/null +++ b/mesecons_textures/textures/mesecons_piston_bottom.png diff --git a/mesecons_textures/textures/mesecons_piston_left.png b/mesecons_textures/textures/mesecons_piston_left.png Binary files differnew file mode 100644 index 0000000..215dd73 --- /dev/null +++ b/mesecons_textures/textures/mesecons_piston_left.png diff --git a/mesecons_textures/textures/mesecons_piston_on_front.png b/mesecons_textures/textures/mesecons_piston_on_front.png Binary files differnew file mode 100644 index 0000000..0ade67e --- /dev/null +++ b/mesecons_textures/textures/mesecons_piston_on_front.png diff --git a/mesecons_textures/textures/mesecons_piston_pusher_back.png b/mesecons_textures/textures/mesecons_piston_pusher_back.png Binary files differnew file mode 100644 index 0000000..fe87943 --- /dev/null +++ b/mesecons_textures/textures/mesecons_piston_pusher_back.png diff --git a/mesecons_textures/textures/mesecons_piston_pusher_bottom.png b/mesecons_textures/textures/mesecons_piston_pusher_bottom.png Binary files differnew file mode 100644 index 0000000..87c4e81 --- /dev/null +++ b/mesecons_textures/textures/mesecons_piston_pusher_bottom.png diff --git a/mesecons_textures/textures/mesecons_piston_pusher_front.png b/mesecons_textures/textures/mesecons_piston_pusher_front.png Binary files differnew file mode 100644 index 0000000..8ec9dc6 --- /dev/null +++ b/mesecons_textures/textures/mesecons_piston_pusher_front.png diff --git a/mesecons_textures/textures/mesecons_piston_pusher_front_sticky.png b/mesecons_textures/textures/mesecons_piston_pusher_front_sticky.png Binary files differnew file mode 100644 index 0000000..e38b4e6 --- /dev/null +++ b/mesecons_textures/textures/mesecons_piston_pusher_front_sticky.png diff --git a/mesecons_textures/textures/mesecons_piston_pusher_left.png b/mesecons_textures/textures/mesecons_piston_pusher_left.png Binary files differnew file mode 100644 index 0000000..bc5495b --- /dev/null +++ b/mesecons_textures/textures/mesecons_piston_pusher_left.png diff --git a/mesecons_textures/textures/mesecons_piston_pusher_right.png b/mesecons_textures/textures/mesecons_piston_pusher_right.png Binary files differnew file mode 100644 index 0000000..32ee32f --- /dev/null +++ b/mesecons_textures/textures/mesecons_piston_pusher_right.png diff --git a/mesecons_textures/textures/mesecons_piston_pusher_top.png b/mesecons_textures/textures/mesecons_piston_pusher_top.png Binary files differnew file mode 100644 index 0000000..72f04e9 --- /dev/null +++ b/mesecons_textures/textures/mesecons_piston_pusher_top.png diff --git a/mesecons_textures/textures/mesecons_piston_right.png b/mesecons_textures/textures/mesecons_piston_right.png Binary files differnew file mode 100644 index 0000000..176463c --- /dev/null +++ b/mesecons_textures/textures/mesecons_piston_right.png diff --git a/mesecons_textures/textures/mesecons_piston_top.png b/mesecons_textures/textures/mesecons_piston_top.png Binary files differnew file mode 100644 index 0000000..5c8bace --- /dev/null +++ b/mesecons_textures/textures/mesecons_piston_top.png diff --git a/mesecons_textures/textures/wires_full_off.png b/mesecons_textures/textures/wires_full_off.png Binary files differnew file mode 100644 index 0000000..58164fa --- /dev/null +++ b/mesecons_textures/textures/wires_full_off.png diff --git a/mesecons_textures/textures/wires_full_on.png b/mesecons_textures/textures/wires_full_on.png Binary files differnew file mode 100644 index 0000000..98a86c8 --- /dev/null +++ b/mesecons_textures/textures/wires_full_on.png |