Aidan Brady
faad9762df
Merge branch 'development' into 1.8
...
Conflicts:
build.properties
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/tile/TileEntityBin.java
src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
src/main/java/mekanism/tools/common/MekanismTools.java
2014-08-06 12:56:37 -04:00
Aidan C. Brady
12215490f0
Fixed a Digital Miner oversight, fixed Bins losing NBT data and allow Bins to accept items with varying item damage
2014-08-05 20:58:22 -04:00
Aidan Brady
33970b6bf7
Updated Multiblock Controller textures, added multi-meta capability to Connected Texture Renderer
2014-08-02 11:16:14 -04:00
Ben Spiers
725b7463f0
Make the mod classes significantly less godlike.
...
Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:35:06 +01:00
Aidan Brady
1ad7fe81b9
Salination Plant now auto-forms
2014-07-28 09:27:08 -04:00
Aidan C. Brady
f67be01658
Tank-based fluid container interaction fixes. Can't figure out the data request issue.
2014-07-07 15:54:26 -04: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
4446e14ba3
Sound system work
2014-06-02 23:57:40 +02:00
tterrag1098
6ac750520c
Blocks and Entities
2014-05-06 03:14:44 -04: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
31938e8b68
Under 1300 errors left now, started on packet/network stuffs.
2014-04-20 21:15:44 +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