Jeija ae4bd1e21c Merge branch 'master' into nextgen ...

Conflicts:
	mesecons_pistons/init.lua

2012-12-16 08:59:06 +01:00

..

crossing.lua

Attempt to update the wire crossing.

2012-12-15 17:53:03 -05:00

depends.txt

crossing wire moved into mesecons

2012-09-07 13:18:53 -07:00

init.lua

Include experimental vertical wires (needs textures)

2012-12-13 18:42:45 +01:00

tjunction.lua

Include experimental vertical wires (needs textures)

2012-12-13 18:42:45 +01:00

vertical.lua

Upload cleaned up mesecons to nextgen branch

2012-12-15 18:45:51 +01:00