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
..
client	Re-add EnumColor to API!	2013-12-01 00:03:40 -05:00
common	Merge branch 'master' into multipart-experimental-new	2013-12-05 22:37:27 -05:00