Aidan Brady
|
81d3d53d76
|
Merge branch 'development' into 1.8
Conflicts:
src/main/java/mekanism/client/ClientTickHandler.java
src/main/java/mekanism/common/item/ItemConfigurator.java
src/main/java/mekanism/common/tile/TileEntityElectricPump.java
src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java
|
2014-08-07 12:29:43 -04:00 |
|
Aidan Brady
|
78c0cc4c7c
|
Fixed an issue where networks would be forgotten, made shift-M turn jetpack off immediately, simplified network code a bit
|
2014-08-06 18:25:33 -04:00 |
|
Aidan C. Brady
|
7e525e10c6
|
Fixed a few recipes, also started work on Digital Miner visual
|
2014-07-20 23:29:35 -04:00 |
|
Aidan C. Brady
|
377fff30ca
|
We don't really need getLocation(), instead using Coord4D.get() with the getTile() method.
|
2014-07-09 15:37:43 -04:00 |
|
Aidan C. Brady
|
ee87d8cef5
|
Transmitter code cleanup - killed the now-unused merge() method and separated data handlers from ITransmitterNetwork itself. Also added new pipe textures.
|
2014-07-09 15:31:57 -04:00 |
|
Aidan C. Brady
|
99c1f44db5
|
Fixed refs to refresh() method
|
2014-06-19 15:18:41 +02:00 |
|
Aidan C. Brady
|
27295670cc
|
Whoops - fixed crash. Also added recipe for Plenisher.
|
2014-06-19 14:42:11 +02:00 |
|
Aidan C. Brady
|
d9658a16bd
|
Transmitter network efficiency overhaul! Transmitter networks now only refresh acceptors on the transmitter that initiated the refresh instead of resetting the entire grid.
|
2014-06-19 14:34:57 +02:00 |
|
Aidan C. Brady
|
fd74ee5c92
|
Started work on Portable Tank
|
2014-06-18 03:01:23 +02:00 |
|
Aidan C. Brady
|
1a0821c727
|
Found work-around for javac issue - need to remember to submit an issue to oracle tomorrow
|
2014-06-14 01:35:25 +02:00 |
|
Aidan C. Brady
|
e5f76907ce
|
Rewrite networking code for the 100th time to fix memory leak
|
2014-06-11 11:57:49 +02:00 |
|
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
|
1933723b52
|
Major packet work, I think it's done. 34 errors to go!
|
2014-06-02 17:33:19 +02:00 |
|
Ben Spiers
|
31938e8b68
|
Under 1300 errors left now, started on packet/network stuffs.
|
2014-04-20 21:15:44 +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 |
|