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
..
gui	Fix some pesky bugs and crashes	2013-12-03 16:56:03 -05:00
model	Jetpack work!	2013-12-04 19:14:27 -05:00
nei	A few fixes and enhancements	2013-11-29 21:31:39 -05:00
render	Merge branch 'master' into multipart-experimental-new	2013-12-05 22:37:27 -05:00
sound	Fix a few jetpack things	2013-12-04 17:22:00 -05:00
voice	Add option to disable voice server	2013-10-26 23:55:11 -04:00
CapeBufferDownload.java	Fixed capes :)	2013-10-14 15:54:10 -04:00
ClientConnectionHandler.java	Fix a few bugs, work on jetpack networking	2013-12-04 15:43:03 -05:00
ClientPlayerTickHandler.java	Cool stuff!	2013-12-05 16:42:00 -05:00
ClientProxy.java	Merge branch 'master' into multipart-experimental-new	2013-12-05 22:37:27 -05:00
ClientTickHandler.java	Slightly speed up Digital Miner	2013-12-02 18:54:21 -05:00
MekanismClient.java	Cool stuff!	2013-12-05 16:42:00 -05:00
MekanismKeyHandler.java	Synchronized network code, should be thread safe.	2013-10-20 00:04:11 -04:00
ThreadClientUpdate.java	Machines eject into transporters.	2013-10-31 14:46:14 -04:00
ThreadTankSparkle.java	Fixed API for @micdoodle8	2013-11-30 23:19:24 -05:00