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
Aidan C. Brady
6af0b1abd7
Screw it, package organization (sorry, that's an API update)
2013-08-26 18:49:32 -04:00
Aidan Brady
13901f60b0
Bit of modularization
2013-08-25 12:17:56 -04:00
Aidan Brady
9a6f4d6a0e
Fix the crashes people are having with checkTransmissionType()
2013-08-25 11:24:07 -04:00
micdoodle8
8e667efd7b
Fix canTransferGas()
...
Tested and working.
2013-08-25 01:34:45 -04:00
Ben Spiers
32c32fb106
Move checkTransmissionType to TransmissionType.
2013-08-25 02:41:03 +01:00
Ben Spiers
8f4b19f87c
A slightly surprisingly large number of unused imports
2013-08-23 19:25:26 +01:00
Ben Spiers
6cf89af4b2
Generalise the EnergyMeter. The name may not be entirely accurate any more.
2013-08-23 19:23:08 +01:00
Ben Spiers
65776e3516
Fix a bit of wonkiness with pipes, etc.
2013-08-23 04:19:01 +01:00
Ben Spiers
f39e3a528d
Fix chunk-load handler; make it refresh adjacent loaded chunks as well, to
...
solve an edge case.
2013-08-22 21:16:28 +01:00
Ben Spiers
67687cd579
I'm an idiot.
2013-08-22 21:16:27 +01:00
Aidan C. Brady
5e379f052a
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
...
Conflicts:
common/mekanism/api/GasNetwork.java
common/mekanism/common/EnergyNetwork.java
common/mekanism/common/FluidNetwork.java
common/mekanism/common/InventoryNetwork.java
common/mekanism/common/TileEntityEnergyCube.java
common/mekanism/generators/common/TileEntityGenerator.java
2013-08-22 14:07:28 -04:00
Aidan C. Brady
5072b20673
Updated IC2 API, modularized energy management
2013-08-22 11:36:31 -04:00
Ben Spiers
e598527656
Fix StackOverflowException on getNetwork.
2013-08-21 20:26:47 +01:00
Ben Spiers
18868398b4
Stop Object3D.getTileEntity() from loading unloaded chunks.
2013-08-19 18:37:36 +01:00
Aidan C. Brady
de10fa2d58
Finished new changes, canTransferGas() functionality temporarily severed
2013-08-19 07:55:47 -04:00
Aidan Brady
30f7bfa126
Loads of work on modularization, BROKEN BUILD
2013-08-18 21:32:47 -04:00
Aidan Brady
f64ea42e43
Even more modularization
2013-08-18 16:51:47 -04:00
Aidan Brady
b2f20185e4
Further modularized transmitter networks
2013-08-17 13:32:05 -04:00
Aidan C. Brady
20728eff4f
Began work on a more modular approach to networks
2013-08-16 11:56:42 -04:00
Aidan Brady
7e167b753a
Logistical Transporters now have complete network functionality. Actual item transport is the next step!
...
Also fixed various network bugs. :)
2013-08-06 01:40:41 -04:00
Ben Spiers
8ee17b2a03
Bring other network types up to speed with EnergyNetwork
2013-08-04 01:58:56 +01:00
Ben Spiers
837689a061
Transmitter Network Interface
2013-08-04 01:58:56 +01:00
Aidan Brady
cfc5dff445
First 1.6 push, still work to be done
2013-07-20 12:10:14 -04:00
Aidan Brady
8f6ad2688e
General cleanup
2013-06-28 19:43:45 -04:00
Aidan Brady
b255a98a74
Rebase for new workspace (sorry)
2013-06-28 18:01:00 -04:00
