fairiestoy e0e3db682e Cleaning up conflicts ...

Merge https://github.com/fairiestoy/classic_technic

Conflicts:
	technic/machines/switching_station.lua

2013-12-22 03:39:45 +01:00

..

cans.lua

Move files to subfolders

2013-07-11 12:31:00 -04:00

chainsaw.lua

Initial commit from latest non screwed up zipball

2013-10-05 22:34:18 +02:00

flashlight.lua

Initial commit from latest non screwed up zipball

2013-10-05 22:34:18 +02:00

init.lua

Initial commit from latest non screwed up zipball

2013-10-05 22:34:18 +02:00

mining_drill.lua

Initial commit from latest non screwed up zipball

2013-10-05 22:34:18 +02:00

mining_laser_mk1.lua

Merge branch 'master' of https://github.com/Pitriss/classic_technic

2013-10-06 16:25:47 +02:00

sonic_screwdriver.lua

Initial commit from latest non screwed up zipball

2013-10-05 22:34:18 +02:00

tree_tap.lua

reffiling of rubber tree trunks is now affected by time_speed

2013-11-29 16:59:09 +01:00