3 files changed, 5 insertions, 80 deletions
diff --git a/gradle.properties b/gradle.properties
index 36c8099a4b..4f6a1bf63d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -65,3 +65,8 @@ usesShadowedDependencies = false
 
 # Optional parameter to prevent the source code from being published
 # noPublishedSources = 
+
+systemProp.http.proxyHost=127.0.0.1
+systemProp.http.proxyPort=7890
+systemProp.https.proxyHost=127.0.0.1
+systemProp.https.proxyPort=7890
+\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties.bak b/gradle/wrapper/gradle-wrapper.properties.bak
deleted file mode 100644
index 2d80b69a76..0000000000
--- a/gradle/wrapper/gradle-wrapper.properties.bak
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/src/main/java/goodgenerator/main/GoodGenerator.java.bak b/src/main/java/goodgenerator/main/GoodGenerator.java.bak
deleted file mode 100644
index b072ba04db..0000000000
--- a/src/main/java/goodgenerator/main/GoodGenerator.java.bak
+++ /dev/null
@@ -1,75 +0,0 @@
-package goodgenerator.main;
-
-import goodgenerator.common.CommonProxy;
-import goodgenerator.crossmod.thaumcraft.Research;
-import goodgenerator.items.MyMaterial;
-import goodgenerator.loader.*;
-import goodgenerator.network.MessageOpenNeutronSensorGUI;
-import goodgenerator.network.MessageSetNeutronSensorData;
-import goodgenerator.tabs.MyTabs;
-import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.*;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
-import cpw.mods.fml.relauncher.Side;
-import net.minecraft.creativetab.CreativeTabs;
-import cpw.mods.fml.common.Mod;
-
-@SuppressWarnings("ALL")
-@Mod(modid = GoodGenerator.MOD_ID, version = GoodGenerator.VERSION,
-        dependencies = "required-after:IC2; "
-        + "required-after:gregtech; "
-        + "required-after:bartworks; "
-        + "required-after:tectech; ")
-public final class GoodGenerator {
-    public static final String MOD_ID = "GoodGenerator";
-    public static final String MOD_NAME = "GRADLETOKEN_MODNAME";
-    public static final String VERSION = "GRADLETOKEN_VERSION";
-
-    public static final CreativeTabs GG = new MyTabs("Good Generator");
-
-    @SidedProxy(clientSide = "goodgenerator.client.ClientProxy",serverSide = "goodgenerator.common.CommonProxy")
-    public static CommonProxy proxy;
-    public static SimpleNetworkWrapper CHANNEL = NetworkRegistry.INSTANCE.newSimpleChannel(MOD_ID);
-
-    static {
-        CHANNEL.registerMessage(MessageSetNeutronSensorData.ServerHandler.class, MessageSetNeutronSensorData.class, 0, Side.SERVER);
-        CHANNEL.registerMessage(MessageOpenNeutronSensorGUI.ClientHandler.class, MessageOpenNeutronSensorGUI.class, 1, Side.CLIENT);
-    }
-
-    @Mod.Instance(GoodGenerator.MOD_ID)
-    public static GoodGenerator instance;
-
-    @Mod.EventHandler
-    public static void preInit(FMLPreInitializationEvent event) {
-        GG_Config_Loader.run();
-        WerkstoffAdderRegistry.addWerkstoffAdder(new MyMaterial());
-        //WerkstoffAdderRegistry.addWerkstoffAdder(new IsotopeMaterialLoader());
-        Loaders.preInitLoad();
-        proxy.preInit(event);
-    }
-    @Mod.EventHandler
-    public static void init(FMLInitializationEvent event) {
-        Loaders.initLoad();
-        proxy.init(event);
-    }
-    @Mod.EventHandler
-    public static void postInit(FMLPostInitializationEvent event) {
-        Loaders.postInitLoad();
-        crossMod();
-        proxy.postInit(event);
-    }
-    @Mod.EventHandler
-    public void onLoadComplete(FMLLoadCompleteEvent event) {
-        //NaquadahReworkRecipeLoader.SmallRecipeChange();
-        NaquadahReworkRecipeLoader.Remover();
-    }
-
-    public static void crossMod() {
-        if (Loader.isModLoaded("Thaumcraft")) {
-            Research.addResearch();
-        }
-    }
-}
-\ No newline at end of file