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 |
|
Aidan Brady
|
c3a985f273
|
Kill off wires for the last time, fix up jetpacks
|
2013-12-05 21:10:15 -05:00 |
|
Aidan Brady
|
8f4ac31871
|
Minor cleanup
|
2013-12-03 17:46:48 -05:00 |
|
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 |
|
Aidan C. Brady
|
5c2c8e15cb
|
Add in necessary models
|
2013-12-02 12:41:00 -05:00 |
|
Ben Spiers
|
132306ed76
|
Multipart and everything
|
2013-10-03 00:10:20 +01:00 |
|