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
..
buildcraft/api	Updated UE API	2013-12-01 14:41:01 +08:00
calclavia/lib	MekanismInduction module - done!	2013-11-16 10:21:37 -05:00
cofh/api	Fix RF support	2013-11-30 01:02:44 -05:00
dan200	Update every applicable API, remove some unused imports	2013-09-30 22:37:16 +01:00
ic2/api	Updated UE API	2013-12-01 14:41:01 +08:00
mekanism	Merge branch 'master' into multipart-experimental-new	2013-12-05 22:37:27 -05:00
micdoodle8/mods/galacticraft/api	Update every applicable API, remove some unused imports	2013-09-30 22:37:16 +01:00
powercrystals/minefactoryreloaded/api	Add IDeepStorageUnit support	2013-11-29 15:39:37 -05:00
rebelkeithy/mods/metallurgy/api	Update every applicable API, remove some unused imports	2013-09-30 22:37:16 +01:00
thermalexpansion/api	MekanismInduction module - done!	2013-11-16 10:21:37 -05:00
universalelectricity	Updated UE API	2013-12-02 21:37:58 +08:00