aidancbrady
|
668643e663
|
Entangloporters work perfectly!
|
2016-03-04 21:58:13 -05:00 |
|
aidancbrady
|
87438dcc7f
|
Boiler work, added heat info tab, worked on polishing heat interactions among machines
|
2016-02-27 13:32:48 -05:00 |
|
Ben Spiers
|
d29d1580bb
|
Fix some stuff I missed in the merge, and server-client communication.
|
2015-04-04 02:44:14 +01:00 |
|
Ben Spiers
|
7a2461540f
|
Merge branch 'development' into networkRefactor.
Hopefully I didn't miss anything
Conflicts:
src/main/java/mekanism/api/gas/GasNetwork.java
src/main/java/mekanism/client/render/RenderPartTransmitter.java
src/main/java/mekanism/common/EnergyNetwork.java
src/main/java/mekanism/common/FluidNetwork.java
src/main/java/mekanism/common/InventoryNetwork.java
src/main/java/mekanism/common/content/transporter/TransporterStack.java
src/main/java/mekanism/common/multipart/PartHeatTransmitter.java
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/common/multipart/PartMechanicalPipe.java
src/main/java/mekanism/common/multipart/PartPressurizedTube.java
src/main/java/mekanism/common/multipart/PartSidedPipe.java
src/main/java/mekanism/common/multipart/PartUniversalCable.java
src/main/java/mekanism/common/util/MekanismUtils.java
src/main/java/mekanism/common/util/PipeUtils.java
|
2015-04-03 19:45:25 +01:00 |
|
Ben Spiers
|
d14686ea2e
|
Work on clientsiding, acceptors and things like redstone and multipart blocking.
|
2015-04-02 03:22:53 +01:00 |
|
Aidan C. Brady
|
e4d624d8ab
|
Fancy new eject algorithms, should fix issues with PRC
|
2015-03-30 19:27:54 -04:00 |
|
Ben Spiers
|
fd0bdd4da8
|
Efficiency of isValidAcceptor methods.
|
2014-12-18 22:52:45 +00:00 |
|
Ben Spiers
|
5b4f154040
|
Giant optimise imports.
|
2014-11-10 21:53:29 +00:00 |
|
Ben Spiers
|
e7f3204ed7
|
Fix a tesseract fluid issue.
|
2014-09-30 20:24:04 +01:00 |
|
Ben Spiers
|
db7121454a
|
Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things.
1792 errors. A good night's work, I think.
|
2014-04-20 04:34:19 +01:00 |
|
Ben Spiers
|
ab47724473
|
Move the directory structure around to a more conventional one and start out on the 1.7 update.
3797 errors. We have a long way to go.
|
2014-04-20 03:44:06 +01:00 |
|