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
..
armor	Updated to new UE, not done with complete implementation	2013-07-26 18:16:21 -04:00
gui	Chemical Injection Chamber initial work	2013-12-24 00:23:30 -05:00
infuse	Remove Maganese Alloy in hopes for better balance, fixed several GUI color issues as well as Osmium Ore darkness	2013-12-01 17:45:19 -05:00
lang	Chemical Injection Chamber initial work	2013-12-24 00:23:30 -05:00
models	Large Model variants. Fluid contents rendering still needs work but that's not using an obj model. It could potentially; it would be a lot cleaner in code but would mean a *lot* of blender work.	2013-12-18 18:42:05 +00:00
render	Kill induction module and start on balloons :)	2013-12-20 01:05:41 -05:00
sound	Merge branch 'master' into development	2013-12-24 14:44:17 -05:00
textures	Finished shard textures	2013-12-24 11:40:19 -05:00