tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
Mekanism-tilera-Edition/common/mekanism
History
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
..
api A few attempts to get multipart working. @unpairedbracket, I don’t know what the hell I’m doing, you’re gonna need to go over this. 2013-12-02 22:14:21 -05:00
client Merge branch 'master' into multipart-experimental-new 2013-12-05 22:37:27 -05:00
common Merge branch 'master' into multipart-experimental-new 2013-12-05 22:37:27 -05:00
generators Merge branch 'master' into multipart-experimental-new 2013-12-05 22:37:27 -05:00
induction Merge branch 'master' into multipart-experimental-new 2013-12-05 22:37:27 -05:00
tools Some work on things, got rid of version constants, they're supposed to differ per module. 2013-11-20 11:01:13 -05:00