Aidan C. Brady
|
7ddb8e9727
|
Merge branch 'development' into 1.8
Conflicts:
src/main/java/mekanism/client/ClientTickHandler.java
src/main/java/mekanism/common/CommonProxy.java
src/main/java/mekanism/common/Mekanism.java
|
2014-07-16 23:59:07 -04:00 |
|
Aidan C. Brady
|
cfeb08a8ee
|
Fixed Gas Mask OP-ness, added config option to let creative mode override the Electric Chest, fixed Gas Generator crash
|
2014-07-16 23:53:00 -04:00 |
|
Aidan C. Brady
|
23adf9ad24
|
Added Salt Blocks - generates similarly to clay. Added tooltips for config GUI. Added option to regenerate ores, as this is now a thing. Also...began implementing different tiers of control circuits.
|
2014-07-09 22:06:36 -04:00 |
|
Ben Spiers
|
df58560729
|
Clean up configs a lot; Fix Config GUIs. This will require people to sort out their configs on their own, as things have moved.
|
2014-07-07 21:23:04 +01:00 |
|
Aidan C. Brady
|
90da466ca1
|
Started work on Fluidic Plenisher
|
2014-06-19 12:42:59 +02:00 |
|
Aidan C. Brady
|
5fd89a7959
|
Added recipe for PRC, energy type is now controlled by server (closes #1369)
|
2014-06-16 02:09:31 +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
|
8685664d51
|
Added Electric Pump energy usage config value, also fixed a few bugs with the new Gas-Burning Generator
|
2014-06-10 12:24:44 +02:00 |
|
Aidan C. Brady
|
815944c49a
|
A major load of fixes - things should be about back to normal now.
|
2014-06-03 19:54:45 +02:00 |
|
Aidan C. Brady
|
4446e14ba3
|
Sound system work
|
2014-06-02 23:57:40 +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 |
|
Aidan C. Brady
|
659b963af6
|
Alright, almost done with network changes (63 errors!)
|
2014-06-02 16:52:13 +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 |
|