Aidan C. Brady d63628bebc Merge branch 'master' into development ... Conflicts: common/mekanism/client/ClientProxy.java common/mekanism/client/HolidayManager.java common/mekanism/client/sound/SoundHandler.java common/mekanism/client/sound/TileSound.java		2013-12-24 14:44:17 -05:00
..
api	Chemical Injection Chamber initial work	2013-12-24 00:23:30 -05:00
client	Merge branch 'master' into development	2013-12-24 14:44:17 -05:00
common	Merge branch 'master' into development	2013-12-24 14:44:17 -05:00
generators	Loads of javadocs, cleaned up Gas API code, removed old induction interfaces, made configurable machines notify neighbor when configuration changes, added functionality for GasStack-based ChemicaIInputs.	2013-12-23 17:06:22 -05:00
tools	Bump version, work on multipart transporters	2013-12-20 16:47:09 -05:00