Aidan Brady f8091d1b15 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction ... Conflicts: src/resonantinduction/contractor/TileEntityEMContractor.java src/resonantinduction/model/ModelEMContractor.java src/resonantinduction/render/RenderEMContractor.java		2013-08-03 22:35:23 -04:00
..
resonantinduction	Merge branch 'master' of https://github.com/calclavia/Resonant-Induction	2013-08-03 22:35:23 -04:00