Mekanism-tilera-Edition/common/mekanism/client/render
Aidan Brady d36409f4b0 Merge branch 'master' into multipart-experimental-new
Conflicts:
	common/mekanism/client/model/ModelJetpack.java
	common/mekanism/client/render/ModelCustomArmor.java
	common/mekanism/common/Mekanism.java
	common/mekanism/common/item/ItemJetpack.java
	common/mekanism/common/tileentity/TileEntityUniversalCable.java
	common/mekanism/induction/client/render/RenderWire.java
	common/mekanism/induction/common/tileentity/TileEntityMultimeter.java
	common/mekanism/induction/common/tileentity/TileEntityWire.java
	common/mekanism/induction/common/wire/PartUniversalConductor.java
	common/mekanism/induction/common/wire/PartWire.java
2013-12-05 22:37:27 -05:00
..
block Rendering and transmitter performance enhancements, finish Rotary Condensentrator for the most part 2013-11-28 21:43:53 -05:00
entity Fixed Obsidian TNT render 2013-12-02 07:19:22 -05:00
item Work on jetpacks 2013-12-05 15:50:38 -05:00
tileentity Bins are nice to hoppers now. 2013-12-04 21:55:56 -05:00
MekanismRenderer.java Work on jetpacks 2013-12-05 15:50:38 -05:00
ModelCustomArmor.java Bugfixes and the beginnings of jetpacks! 2013-12-03 23:36:06 -05:00
RenderPartTransmitter.java Fix pressurized tube render 2013-12-03 16:23:08 -05:00
RenderTickHandler.java Work on jetpacks 2013-12-05 15:50:38 -05:00