Aidan C. Brady
|
6f69c6d7b4
|
Major 1.7 work, down to a little more than 500 errors
|
2014-05-29 17:55:47 +01:00 |
|
Aidan C. Brady
|
1d22ddadc3
|
Merge branch 'master' into development
Conflicts:
build.gradle
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/tools/common/MekanismTools.java
|
2014-05-17 11:47:18 -04:00 |
|
Aidan Brady
|
6025572f15
|
Merge branch '1.7' into development (We're back to two branches)
Conflicts:
build.properties
|
2014-05-08 17:40:27 -04:00 |
|
Aidan Brady
|
7496ac7648
|
Some 1.7 work. Just about 800 errors!
|
2014-05-07 16:37:58 -04:00 |
|
tterrag1098
|
6ac750520c
|
Blocks and Entities
|
2014-05-06 03:14:44 -04:00 |
|
tterrag1098
|
321fa4ed50
|
Some work on GUIs, mostly sfx
|
2014-05-06 02:57:39 -04:00 |
|
Aidan Brady
|
935be33fdf
|
Hey guys, I'm back. Starting some work on the 1.7 port, thanks to @unpairedbracket for getting the brunt of the work done.
|
2014-05-04 12:19:43 -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 |
|