diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java
index 96f3bbe1d..26fff89ec 100644
--- a/src/main/java/mekanism/client/ClientProxy.java
+++ b/src/main/java/mekanism/client/ClientProxy.java
@@ -2,6 +2,8 @@ package mekanism.client;
 
 import java.io.File;
 
+import com.jadarstudios.developercapes.DevCapes;
+import cpw.mods.fml.common.Loader;
 import mekanism.api.Coord4D;
 import mekanism.api.MekanismConfig.client;
 import mekanism.api.MekanismConfig.general;
@@ -211,6 +213,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 @SideOnly(Side.CLIENT)
 public class ClientProxy extends CommonProxy
 {
+	public static boolean isThorfusionLoaded;
 	@Override
 	public void loadConfiguration()
 	{
@@ -592,6 +595,18 @@ public class ClientProxy extends CommonProxy
 	public void preInit()
 	{
 		MekanismRenderer.init();
+		isThorfusionLoaded = Loader.isModLoaded("thorfusion");
+	}
+
+	@Override
+	public void Cape()
+	{
+		if(!isThorfusionLoaded) {
+			//proxy, tilentity
+			if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
+				DevCapes.getInstance().registerConfig("http://eu-central-1.linodeobjects.com/files.thorfusion.xyz/capes/scape.json");
+			}
+		}
 	}
 
 	@Override
diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java
index 2c423e5fd..d1ed245a6 100644
--- a/src/main/java/mekanism/common/CommonProxy.java
+++ b/src/main/java/mekanism/common/CommonProxy.java
@@ -716,4 +716,7 @@ public class CommonProxy implements IGuiProvider
 	{
 		return null;
 	}
+
+	public void Cape() {
+	}
 }
diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java
index ce0e5802e..b8c49f744 100644
--- a/src/main/java/mekanism/common/Mekanism.java
+++ b/src/main/java/mekanism/common/Mekanism.java
@@ -10,8 +10,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import com.jadarstudios.developercapes.DevCapes;
-import cpw.mods.fml.relauncher.Side;
 import mekanism.api.Coord4D;
 import mekanism.api.EnumColor;
 import mekanism.api.MekanismAPI;
@@ -149,7 +147,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
 				"after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore")
 public class Mekanism
 {
-	public static boolean isThorfusionLoaded;
 	/** Mekanism Packet Pipeline */
 	public static PacketHandler packetHandler = new PacketHandler();
 
@@ -1216,8 +1213,6 @@ public class Mekanism
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent event)
 	{
-		isThorfusionLoaded = Loader.isModLoaded("thorfusion");
-
 		File config = event.getSuggestedConfigurationFile();
 		
 		//Set the mod's configuration
@@ -1283,12 +1278,8 @@ public class Mekanism
 	@EventHandler
 	public void init(FMLInitializationEvent event) 
 	{
-		if(!isThorfusionLoaded) {
-			//proxy, tilentity
-			if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
-				DevCapes.getInstance().registerConfig("http://files.thorfusion.xyz.eu-central-1.linodeobjects.com/cape.json");
-			}
-		}
+		Mekanism.proxy.Cape();
+
 		//Register the mod's world generators
 		GameRegistry.registerWorldGenerator(genHandler, 1);
 		
diff --git a/src/main/java/mekanism/common/ThreadGetData.java b/src/main/java/mekanism/common/ThreadGetData.java
index d4c1e40e4..5bb2f150f 100644
--- a/src/main/java/mekanism/common/ThreadGetData.java
+++ b/src/main/java/mekanism/common/ThreadGetData.java
@@ -21,7 +21,7 @@ public class ThreadGetData extends Thread
 	@Override
 	public void run()
 	{
-		List<String> ret = MekanismUtils.getHTML("http://files.thorfusion.xyz.eu-central-1.linodeobjects.com/mekanism/Mekanism.txt");
+		List<String> ret = MekanismUtils.getHTML("http://eu-central-1.linodeobjects.com/files.thorfusion.xyz/mekanism/Mekanism.txt");
 		
 		Mekanism.latestVersionNumber = "null";
 		Mekanism.recentNews = "null";