Aidan C. Brady 646b22f5b5 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development ... Conflicts: common/mekanism/common/multipart/PartTransmitter.java		2013-12-16 09:56:01 -05:00
..
api	Fixed gas/fluid transfer	2013-12-15 00:03:45 -05:00
client	Make a start on Multipart Transporters.	2013-12-16 14:00:43 +00:00
common	Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development	2013-12-16 09:56:01 -05:00
generators	Work on Chemical Infuser/Formulator official implementation (without models yet)	2013-12-14 22:29:25 -05:00
induction	Killed off CalclaviaLib	2013-12-16 07:28:55 -05:00
tools	Some work on things, got rid of version constants, they're supposed to differ per module.	2013-11-20 11:01:13 -05:00