Aidan C. Brady
|
d436c70421
|
Merge branch 'master' into development
Conflicts:
build.gradle
build.properties
common/mekanism/common/network/PacketPortableTeleport.java
common/mekanism/tools/common/MekanismTools.java
etc/core/mcmod.info
etc/generators/mcmod.info
etc/tools/mcmod.info
src/main/java/mekanism/common/EnergyNetwork.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/PacketHandler.java
src/main/java/mekanism/common/network/PacketTransmitterUpdate.java
src/main/java/mekanism/common/tile/TileEntityChargepad.java
src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
|
2014-06-08 12:01:08 +02:00 |
|
Aidan C. Brady
|
b365494f2e
|
Fixed up logger, added needed overlays
|
2014-06-03 08:46:03 +02:00 |
|
Aidan C. Brady
|
659b963af6
|
Alright, almost done with network changes (63 errors!)
|
2014-06-02 16:52:13 +02:00 |
|
Ben Spiers
|
3d8c5c8696
|
More fixes. Around 1000 errors now, going to have to leave it to you from here on in @aidancbrady.
|
2014-04-20 22:34:45 +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 |
|