diff options
| author | Alkalus <draknyte1@hotmail.com> | 2018-04-08 16:12:44 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-08 16:12:44 +1000 |
| commit | c94c14f2fe9c7434ddc1b22a93d45e8b4aee5eb7 (patch) | |
| tree | 53bb1b97c8302abf5204d980239a1ef18af18b99 /src/Java/gtPlusPlus/core | |
| parent | 2cf95a2b3e82ceb3a8eec69e33262cf36b797ae6 (diff) | |
| parent | 31996894fd1dd04ef4850dbc470664c5766bffb8 (diff) | |
| download | GT5-Unofficial-c94c14f2fe9c7434ddc1b22a93d45e8b4aee5eb7.tar.gz GT5-Unofficial-c94c14f2fe9c7434ddc1b22a93d45e8b4aee5eb7.tar.bz2 GT5-Unofficial-c94c14f2fe9c7434ddc1b22a93d45e8b4aee5eb7.zip | |
Merge branch 'master' into power-substation-structure
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 0bc141f310..fc3e8bc5bb 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -51,9 +51,9 @@ public class COMPAT_HANDLER { to 868 --- - 899 + 910 to - 945 + 942 */ new RECIPES_LaserEngraver(); @@ -107,6 +107,7 @@ public class COMPAT_HANDLER { GregtechIndustrialMultiMachine.run(); GregtechBedrockPlatforms.run(); GregtechBufferDynamos.run(); + GregtechAmazonWarehouse.run(); //New Horizons Content NewHorizonsAccelerator.run(); |