Aidan Brady 389f3cd988 Merge branch 'master' into development ... Conflicts: common/mekanism/common/tileentity/TileEntityChemicalFormulator.java		2013-12-15 23:22:39 -05:00
..
api	Fixed gas/fluid transfer	2013-12-15 00:03:45 -05:00
client	Fix crashes	2013-12-15 23:01:36 -05:00
common	Merge branch 'master' into development	2013-12-15 23:22:39 -05:00
generators	Work on Chemical Infuser/Formulator official implementation (without models yet)	2013-12-14 22:29:25 -05:00
induction	Work on Chemical Infuser/Formulator official implementation (without models yet)	2013-12-14 22:29:25 -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