Commit Graph

5 Commits

Author SHA1 Message Date
Jeija 23bebfc054 Merge branch 'master' into nextgen
Conflicts:
	mesecons/internal.lua
	mesecons/wires.lua
	mesecons_pistons/init.lua
2012-12-21 16:22:25 +01:00
Jeija 13befe3bba Fix #62 (Hopefully this time) 2012-12-16 19:03:46 +01:00
Jeija 0aab812487 Fix addPosRule without mesecon: in vertical wires (issue #62) 2012-12-16 13:02:05 +01:00
Jeija 44dc1a128c Upload cleaned up mesecons to nextgen branch 2012-12-15 18:45:51 +01:00
Jeija c0d3bd2abb Include experimental vertical wires (needs textures) 2012-12-13 18:42:45 +01:00