Aidan C. Brady 9194f71630 Merge branch 'master' of https://github.com/aidancbrady/Mekanism ... Conflicts: common/mekanism/common/Mekanism.java		2013-10-13 01:04:04 -04:00
..
armor	Updated to new UE, not done with complete implementation	2013-07-26 18:16:21 -04:00
gui	Fixed minor GUI issues, recipe type interface is now a GuiElement	2013-10-08 17:47:03 -04:00
infuse	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
lang	Merge pull request #287 from Vexatos/patch-2	2013-10-12 09:24:54 -07:00
render	Logistical Transporters now have complete network functionality. Actual item transport is the next step!	2013-08-06 01:40:41 -04:00
sound	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
textures	Add proper IC2 item support, add maganese for future use	2013-10-13 01:01:30 -04:00