Ben Spiers
ac07e54a1c
Separate the current buffer from the throughput when examining a network
2014-01-07 03:17:59 +00:00
Aidan Brady
8118e96efb
Fix weird connection issue
2014-01-03 12:13:49 -05:00
Ben Spiers
c1daf00154
Hopefully fix the weird compile problem in a smoother way (the generic gets erased at compile time anyway but apparently IDEA thinks it matters).
2013-12-27 01:21:55 +00:00
Aidan Brady
3cea13a272
Hopefully fix JZ’s compile bug
2013-12-24 16:41:01 -05:00
Aidan Brady
f25bc6f941
Fixed saving
2013-12-21 15:58:59 -05:00
Aidan Brady
198305ff39
Fixed transfer issue
2013-12-21 14:54:12 -05:00
Aidan Brady
15aa17e441
Connections complete, colors now update renderer properly
2013-12-20 21:34:16 -05:00
Aidan Brady
d3661b3cd8
Got colors working, need to fix connections
2013-12-20 21:05:44 -05:00
Aidan Brady
2cf6fdc18c
Lots more work
2013-12-20 19:12:33 -05:00
Aidan Brady
f2d202d90f
Work on transporters
2013-12-20 17:46:24 -05:00
Aidan Brady
40e2d3b7fc
Bump version, work on multipart transporters
2013-12-20 16:47:09 -05:00
Aidan C. Brady
0ab803feeb
Rename Object3D to Coord4D, work on balloons
2013-12-20 16:09:09 -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
Aidan C. Brady
1152470dd6
Hopefully fixed an issue
2013-12-17 22:25:54 -05:00
Aidan C. Brady
4f5c26b0d2
Fixed a bunch of bugs - think that Pressurized Tubes and Mechanical Pipes are done for the most part
2013-12-17 20:28:25 -05:00
Aidan C. Brady
cf0ad408dd
Work on Mechanical Pipes
2013-12-17 18:20:18 -05:00
Ben Spiers
01818d4e26
Fix up the redstone switching/cover blocking support a bit.
2013-12-16 23:55:42 +00:00
Aidan Brady
6598295e3e
Work on Universal Cable split logistics, I think I got this @unpairedbracket
2013-12-16 17:54:27 -05:00
Aidan C. Brady
5272d169c4
Fixed a few bugs in the split() method and added in some new functionality for splitting of energy/fluid/gas! Unpairedbracket, shouldn't hurt you unless you modified split()
2013-12-16 15:00:57 -05:00
Ben Spiers
79e8b36a4b
Fix a few crashes
2013-12-16 15:57:03 +00: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 Brady
11c7efd8fc
Merge branch 'api-change' into multipart-experimental-new
2013-12-12 22:36:00 -05:00
Aidan Brady
6f99805443
Fix crash
2013-12-12 22:02:34 -05:00
Ben Spiers
98c8068a0f
Get Mechanical Pipe rendering working a bit better.
2013-12-12 20:23:03 +00:00
Ben Spiers
c1318d998b
Merge, hopefully without screwing too much up.
2013-12-12 01:56:05 +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
5d949ec959
Fixed API for @micdoodle8
2013-11-30 23:19:24 -05:00
Aidan Brady
a4ab6db57b
Fixes!
2013-11-30 12:29:49 -05:00
Aidan Brady
b224a01f39
Work on localization support, move around some API classes to make better compatibility
2013-11-30 00:28:02 -05:00
Aidan Brady
00b4c6f3e3
Rendering and transmitter performance enhancements, finish Rotary Condensentrator for the most part
2013-11-28 21:43:53 -05:00
Aidan Brady
dacc68e6c6
Gas API completely overhauled. Sorry @micdoodle8 :(
...
General cleanup, pressurized tubes are 40 times more efficient, a few enhancements, Miners balanced.
2013-11-26 20:11:26 -05:00
Aidan Brady
19feb2e602
Fixes by the dozen
2013-11-25 16:34:59 -05:00
Aidan Brady
a360255f63
Greatly improve performance of transmitter networks, improved logistics of Mechanical Pipe
2013-11-25 00:00:26 -05:00
Aidan C. Brady
afae26f9b8
Rendering enhancements! Mechanical Pipes now function better and use the large Transmitter model.
2013-11-24 15:44:16 -06:00
Aidan C. Brady
8e08c9adb8
Once and for all fixed ConcurrentModificationException
2013-11-12 20:19:06 -05:00
Aidan Brady
f6704dc5ea
Added name for bins, fixed IC2 bug, hopefully fixed ConcurrentModificationException
2013-11-11 17:23:14 -05:00
Aidan C. Brady
3c0c5bef0d
Major Universal Cable improvements, started work on Bin
2013-11-11 14:37:56 -05:00
Aidan Brady
01a6174fdb
Lots of things!
2013-11-03 16:54:33 -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
Aidan Brady
b405c42e2f
Remove useless InventoryNetwork
2013-10-25 21:34:55 -04:00
Aidan C. Brady
5b44e0f409
Synchronized network code, should be thread safe.
2013-10-20 00:04:11 -04:00
Ben Spiers
132306ed76
Multipart and everything
2013-10-03 00:10:20 +01:00
Ben Spiers
53b659ca12
Merge pull request #264 from DarkGuardsman/master
...
could be a fix to concur modification error
2013-09-20 11:33:46 -07:00
micdoodle8
d70dbe431a
Fix concurrent modification exception when unloading chunks.
2013-09-12 17:28:32 -04:00
DarkGuardsman
b021cd6d3f
could be a fix to concur modification error
...
So far it looks like it is working but more research/testing needs to be
done.
2013-09-09 02:04:56 -04:00
Aidan Brady
8509eaf0ad
Fixed IC2 integration :)
2013-08-30 15:20:52 -04: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
