tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
Mekanism-tilera-Edition/resources/assets/mekanism
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
..
armor Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
gui Remove Maganese Alloy in hopes for better balance, fixed several GUI color issues as well as Osmium Ore darkness 2013-12-01 17:45:19 -05:00
infuse Remove Maganese Alloy in hopes for better balance, fixed several GUI color issues as well as Osmium Ore darkness 2013-12-01 17:45:19 -05:00
lang Delete old textures, add Copper and Tin blocks 2013-12-02 20:52:44 -05:00
models Merge branch 'master' of https://github.com/aidancbrady/Mekanism into multipart-experimental-new 2013-12-02 21:45:40 -05:00
render Fixed wire texture not loading 2013-12-01 14:33:30 +08:00
sound MekanismInduction module - done! 2013-11-16 10:21:37 -05:00
textures Merge branch 'master' of https://github.com/aidancbrady/Mekanism into multipart-experimental-new 2013-12-02 21:45:40 -05:00