Aidan Brady 31f8566a1f Merge branch 'master' into multipart-experimental-new ... Conflicts: common/mekanism/common/Mekanism.java		2013-12-12 08:43:21 -05:00
..
block	minor changes	2013-12-08 21:40:00 -05:00
entity	Fixed Obsidian TNT render	2013-12-02 07:19:22 -05:00
item	Merge, hopefully without screwing too much up.	2013-12-12 01:56:05 +00:00
tileentity	A few rendering fixes, fixed VoiceServer hanging	2013-12-07 23:28:13 -05:00
MekanismRenderer.java	Work on jetpacks	2013-12-05 15:50:38 -05:00
ModelCustomArmor.java	Work on gas masks/scuba gear stuff	2013-12-06 15:26:44 -05:00
RenderPartTransmitter.java	Remove now-unused generics	2013-12-06 07:57:26 -05:00
RenderTickHandler.java	More work on networking system, unstable	2013-12-09 17:34:53 -05:00