tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
Mekanism-tilera-Edition/common/mekanism/api
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
..
energy Many fixes! 2013-11-27 13:24:13 -05:00
gas Merge branch 'master' of https://github.com/aidancbrady/Mekanism into multipart-experimental-new 2013-12-02 21:45:40 -05:00
induction A ton of bug fixes, working on fixing teslas 2013-11-22 19:32:06 -05:00
infuse Screw it, package organization (sorry, that's an API update) 2013-08-26 18:49:32 -04:00
transmitters Merge branch 'master' of https://github.com/aidancbrady/Mekanism into multipart-experimental-new 2013-12-02 21:45:40 -05:00
EnumColor.java fixed API once again! :) 2013-12-01 00:15:52 -05:00
IClientTicker.java Rendering and transmitter performance enhancements, finish Rotary Condensentrator for the most part 2013-11-28 21:43:53 -05:00
ItemRetriever.java Moved client-sensitive info over to MekanismClient 2013-10-14 23:36:07 -04:00
Object3D.java Fixed API for @micdoodle8 2013-11-30 23:19:24 -05:00
RecipeHelper.java Screw it, package organization (sorry, that's an API update) 2013-08-26 18:49:32 -04:00
TabProxy.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00