tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity
Mekanism-tilera-Edition/common/mekanism/client
History
Aidan Brady 5d8e21b776 Merge branch 'master' of https://github.com/aidancbrady/Mekanism into multipart-experimental-new 
Conflicts:
	common/mekanism/api/gas/GasNetwork.java
	common/mekanism/api/gas/GasTransmission.java
	common/mekanism/api/transmitters/DynamicNetwork.java
	common/mekanism/client/EnergyClientUpdate.java
	common/mekanism/client/FluidClientUpdate.java
	common/mekanism/client/GasClientUpdate.java
	common/mekanism/client/render/tileentity/RenderUniversalCable.java
	common/mekanism/common/EnergyNetwork.java
	common/mekanism/common/FluidNetwork.java
	common/mekanism/common/InventoryNetwork.java
	common/mekanism/common/Mekanism.java
	common/mekanism/common/item/ItemConfigurator.java
	common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java
	common/mekanism/common/tileentity/TileEntityMechanicalPipe.java
	common/mekanism/common/tileentity/TileEntityPressurizedTube.java
	common/mekanism/common/tileentity/TileEntityTransmitter.java
	common/mekanism/common/tileentity/TileEntityUniversalCable.java
	common/mekanism/common/util/CableUtils.java
	resources/assets/mekanism/textures/blocks/LiquidEnergy.png.mcmeta
2013-12-02 21:45:40 -05:00
..
gui Added Factory input slot distribution, configurable voice ports, fixed several bugs 2013-12-01 12:38:34 -05:00
model
nei A few fixes and enhancements 2013-11-29 21:31:39 -05:00
render Merge branch 'master' of https://github.com/aidancbrady/Mekanism into multipart-experimental-new 2013-12-02 21:45:40 -05:00
sound Fixed API for @micdoodle8 2013-11-30 23:19:24 -05:00
voice
CapeBufferDownload.java
ClientConnectionHandler.java Fix a few issues 2013-12-02 21:37:11 -05:00
ClientPlayerTickHandler.java Fixed teslas, merged Electrostatic Linker into Configurator 2013-12-01 14:03:00 -05:00
ClientProxy.java Merge branch 'master' of https://github.com/aidancbrady/Mekanism into multipart-experimental-new 2013-12-02 21:45:40 -05:00
ClientTickHandler.java Slightly speed up Digital Miner 2013-12-02 18:54:21 -05:00
EnergyClientUpdate.java
FluidClientUpdate.java
GasClientUpdate.java
MekanismClient.java
MekanismKeyHandler.java
ThreadClientUpdate.java
ThreadTankSparkle.java Fixed API for @micdoodle8 2013-11-30 23:19:24 -05:00