Aidan Brady 4e77e677ed Merge branch 'master' of https://github.com/aidancbrady/Mekanism		2013-11-02 21:18:52 -04:00
..
armor	Updated to new UE, not done with complete implementation	2013-07-26 18:16:21 -04:00
gui	Configurable machine output colors	2013-11-02 01:31:32 -04:00
infuse	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
lang	Update en_US.lang	2013-11-02 23:19:43 +00:00
render	Fix typo, start work on fancy Energy Cube rendering :)	2013-11-02 21:07:55 -04:00
sound	Fixed ridiculous client updates when GUI is open, fancy active sorter rendering, sorter eject sound effect :)	2013-11-01 23:51:10 -04:00
textures	Deleted Theoretical Elementizer, Weather Orb, and Steve's Stopwatch. They are no longer fitting for Mekanism's goal.	2013-11-01 11:33:00 -04:00