Victor Robertson
e5a6eadc45
Fix indentation and remove trailing whitespace
...
This patch provides common/mekanism/*.java with standardized
indentation (tabs) and also removes trailing whitespace.
2014-03-07 19:20:35 -06:00
Aidan Brady
2cf6fdc18c
Lots more work
2013-12-20 19:12:33 -05:00
Aidan Brady
abaef2fd6d
Work on connections
2013-12-19 16:32:00 -05:00
Aidan Brady
8f24e5c18f
Got connection types to save/load, NONE sides will now not connect or emit to acceptors
2013-12-18 16:23:07 -05:00
Ben Spiers
32f113ad77
First steps towards more dynamic capacity system to allow for differing capacity of universal cables in the future. Will optimise later.
2013-12-14 20:32:32 +00:00
Aidan C. Brady
f982eb851c
Remove now-unused generics
2013-12-06 07:57:26 -05:00
Aidan Brady
50b7870388
A few attempts to get multipart working. @unpairedbracket, I don’t know what the hell I’m doing, you’re gonna need to go over this.
2013-12-02 22:14:21 -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 Brady
c281fcb14b
Fix up a bunch of issues. This should fix epicbastion's problem honestly.
2013-11-01 19:14:02 -04:00
Ben Spiers
132306ed76
Multipart and everything
2013-10-03 00:10:20 +01:00
Ben Spiers
9755b47833
Universal cable support for accepting from UE machines. change *Network* to *TransmitterNetwork* in ITransmitter to avoid method name conflicts.
...
Not all IConductor methods are properly implemented, doesn't seem to cause problems in my testing. Could probably implement IElectricityNetwork in EnergyNetwork but this seems to work.
2013-08-27 00:18:12 +01:00
Aidan C. Brady
6af0b1abd7
Screw it, package organization (sorry, that's an API update)
2013-08-26 18:49:32 -04:00
