106 files changed, 4586 insertions, 3666 deletions

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 68c52c44d1..2d0b7257d0 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -11,7 +11,6 @@ import gregtech.api.enchants.Enchantment_Radioactivity;
 import gregtech.api.enums.*;
 import gregtech.api.interfaces.internal.IGT_Mod;
 import gregtech.api.objects.ItemData;
-import gregtech.api.objects.MaterialStack;
 import gregtech.api.objects.XSTR;
 import gregtech.api.util.*;
 import gregtech.common.GT_DummyWorld;
@@ -23,7 +22,9 @@ import gregtech.common.entities.GT_Entity_Arrow_Potion;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import gregtech.common.items.armor.components.LoadArmorComponents;
 import gregtech.common.items.behaviors.Behaviour_DataOrb;
+import gregtech.common.misc.GT_Command;
 import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Massfabricator;
+import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalChestBase;
 import gregtech.loaders.load.GT_CoverBehaviorLoader;
 import gregtech.loaders.load.GT_FuelLoader;
 import gregtech.loaders.load.GT_ItemIterator;
@@ -61,7 +62,9 @@ import java.io.*;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
+import static gregtech.api.enums.GT_Values.MOD_ID_AE;
 import static gregtech.api.enums.GT_Values.MOD_ID_FR;
 
 @Mod(modid = "gregtech", name = "GregTech", version = "MC1710", useMetadata = false,
@@ -101,7 +104,7 @@ import static gregtech.api.enums.GT_Values.MOD_ID_FR;
                         " after:TConstruct;" +
                         " after:Translocator;")
 public class GT_Mod implements IGT_Mod {
-    public static final int VERSION = 509, SUBVERSION = 31;
+    public static final int VERSION = 509, SUBVERSION = 33;
     public static final int TOTAL_VERSION = calculateTotalGTVersion(VERSION, SUBVERSION);
     public static final int REQUIRED_IC2 = 624;
     @Mod.Instance("gregtech")
@@ -189,18 +192,18 @@ public class GT_Mod implements IGT_Mod {
         if (!GT_Log.mLogFile.exists()) {
             try {
                 GT_Log.mLogFile.createNewFile();
-            } catch (Throwable e) {
+            } catch (Throwable ignored) {
             }
         }
         try {
             GT_Log.out = GT_Log.err = new PrintStream(GT_Log.mLogFile);
-        } catch (FileNotFoundException e) {
+        } catch (FileNotFoundException ignored) {
         }
         GT_Log.mOreDictLogFile = new File(aEvent.getModConfigurationDirectory().getParentFile(), "logs/OreDict.log");
         if (!GT_Log.mOreDictLogFile.exists()) {
             try {
                 GT_Log.mOreDictLogFile.createNewFile();
-            } catch (Throwable e) {
+            } catch (Throwable ignored) {
             }
         }
         if (tMainConfig.get(aTextGeneral, "LoggingExplosions", true).getBoolean(true)) {
@@ -208,12 +211,12 @@ public class GT_Mod implements IGT_Mod {
             if (!GT_Log.mExplosionLog.exists()) {
                 try {
                     GT_Log.mExplosionLog.createNewFile();
-                } catch (Throwable e) {
+                } catch (Throwable ignored) {
                 }
             }
             try {
                 GT_Log.exp = new PrintStream(GT_Log.mExplosionLog);
-            } catch (Throwable e) {
+            } catch (Throwable ignored) {
             }
         }
 
@@ -222,12 +225,12 @@ public class GT_Mod implements IGT_Mod {
             if (!GT_Log.mPlayerActivityLogFile.exists()) {
                 try {
                     GT_Log.mPlayerActivityLogFile.createNewFile();
-                } catch (Throwable e) {
+                } catch (Throwable ignored) {
                 }
             }
             try {
                 GT_Log.pal = new PrintStream(GT_Log.mPlayerActivityLogFile);
-            } catch (Throwable e) {
+            } catch (Throwable ignored) {
             }
         }
         try {
@@ -242,7 +245,7 @@ public class GT_Mod implements IGT_Mod {
             for (Iterator i$ = tList.iterator(); i$.hasNext(); GT_Log.ore.println(tString)) {
                 tString = (String) i$.next();
             }
-        } catch (Throwable e) {
+        } catch (Throwable ignored) {
         }
         gregtechproxy.onPreLoad();
 
@@ -265,6 +268,9 @@ public class GT_Mod implements IGT_Mod {
         //GT_Values.oreveinMaxSize = tMainConfig.get(aTextGeneral, "oreveinMaxSize_64",64).getInt(64);
         GT_Values.ticksBetweenSounds = tMainConfig.get("machines", "TicksBetweenSounds", 30).getInt(30);
         GT_Values.cleanroomGlass= (float) tMainConfig.get("machines","ReinforcedGlassPercentageForCleanroom",5D).getDouble(5D);
+        GT_Values.enableChunkloaders = tMainConfig.get("machines",  "enableChunkloaders", true).getBoolean(true);
+        GT_Values.alwaysReloadChunkloaders = tMainConfig.get("machines",  "alwaysReloadChunkloaders", false).getBoolean(false);
+        GT_Values.debugChunkloaders = tMainConfig.get("machines",  "debugChunkloaders", false).getBoolean(false);
 
         GregTech_API.TICKS_FOR_LAG_AVERAGING = tMainConfig.get(aTextGeneral, "TicksForLagAveragingWithScanner", 25).getInt(25);
         GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = tMainConfig.get(aTextGeneral, "MillisecondsPassedInGTTileEntityUntilLagWarning", 100).getInt(100);
@@ -347,6 +353,7 @@ public class GT_Mod implements IGT_Mod {
         gregtechproxy.mUndergroundOil.getConfig(tMainConfig, "undergroundfluid");
         gregtechproxy.mEnableCleanroom = tMainConfig.get("general", "EnableCleanroom", true).getBoolean(true);
         gregtechproxy.mLowGravProcessing = Loader.isModLoaded(GT_Values.MOD_ID_GC_CORE) && tMainConfig.get("general", "LowGravProcessing", true).getBoolean(true);
+        gregtechproxy.mUseGreatlyShrukenReplacementList = tMainConfig.get("general", "GTNH Optimised Material Loading", true).getBoolean(true);</