Ben Spiers
|
6cf89af4b2
|
Generalise the EnergyMeter. The name may not be entirely accurate any more.
|
2013-08-23 19:23:08 +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 |
|
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 |
|
Ben Spiers
|
837689a061
|
Transmitter Network Interface
|
2013-08-04 01:58:56 +01:00 |
|