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
..
textures	New textures for lumps and ingots.	2013-07-05 02:28:22 -04:00
crafts.lua	fixed problem with missing technic:brass_ingot	2013-11-17 01:59:05 +01:00
depends.txt	Possible fix for Conversion errors	2013-10-28 04:49:04 +01:00
init.lua	imported fixed worldgen	2013-10-05 23:36:32 +02:00
nodes.lua	Merge branch 'indev'	2013-07-08 16:57:56 -04:00
oregen.lua	imported fixed worldgen	2013-10-05 23:36:32 +02:00