26 files changed, 130 insertions, 44 deletions
diff --git a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java
index 162a05b369..188b5ec3aa 100644
--- a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java
@@ -16,23 +16,8 @@ import miscutil.core.common.compat.COMPAT_PneumaticCraft;
 import miscutil.core.common.compat.COMPAT_RFTools;
 import miscutil.core.common.compat.COMPAT_SimplyJetpacks;
 import miscutil.core.common.compat.COMPAT_Thaumcraft;
-import miscutil.core.handler.registration.LateRegistrationHandler;
-import miscutil.core.handler.registration.RegistrationHandler;
-import miscutil.core.handler.registration.gregtech.GregtechEnergyBuffer;
-import miscutil.core.handler.registration.gregtech.GregtechIndustrialCentrifuge;
-import miscutil.core.handler.registration.gregtech.GregtechIndustrialCokeOven;
-import miscutil.core.handler.registration.gregtech.GregtechIndustrialElectrolyzer;
-import miscutil.core.handler.registration.gregtech.GregtechIndustrialMacerator;
-import miscutil.core.handler.registration.gregtech.GregtechIndustrialMassFabricator;
-import miscutil.core.handler.registration.gregtech.GregtechIndustrialPlatePress;
-import miscutil.core.handler.registration.gregtech.GregtechIndustrialWiremill;
-import miscutil.core.handler.registration.gregtech.GregtechIronBlastFurnace;
-import miscutil.core.handler.registration.gregtech.GregtechPowerSubStation;
-import miscutil.core.handler.registration.gregtech.GregtechRocketFuelGenerator;
-import miscutil.core.handler.registration.gregtech.GregtechSafeBlock;
-import miscutil.core.handler.registration.gregtech.GregtechSolarGenerators;
-import miscutil.core.handler.registration.gregtech.GregtechSteamCondenser;
-import miscutil.core.handler.registration.gregtech.GregtechSuperConductionPoint;
+import miscutil.core.handler.Recipes.LateRegistrationHandler;
+import miscutil.core.handler.Recipes.RegistrationHandler;
 import miscutil.core.item.ModItems;
 import miscutil.core.lib.CORE;
 import miscutil.core.lib.LoadedMods;
@@ -42,6 +27,22 @@ import miscutil.core.recipe.ShapedRecipeObject;
 import miscutil.core.util.Utils;
 import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.recipe.UtilsRecipe;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechDehydrator;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechEnergyBuffer;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialCentrifuge;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialCokeOven;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialElectrolyzer;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialMacerator;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialMassFabricator;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialPlatePress;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechIndustrialWiremill;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechIronBlastFurnace;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechPowerSubStation;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechRocketFuelGenerator;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechSafeBlock;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechSolarGenerators;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechSteamCondenser;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechSuperConductionPoint;
 import net.minecraft.item.ItemStack;
 
 public class COMPAT_HANDLER {
@@ -94,6 +95,7 @@ public class COMPAT_HANDLER {
 		//GregtechIndustrialSinter.run();
 		GregtechSolarGenerators.run();
 		GregtechPowerSubStation.run();
+		GregtechDehydrator.run();
 		}
 
 	}
diff --git a/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java b/src/Java/miscutil/core/handler/Recipes/LateRegistrationHandler.java
index 9fc339f512..84af30a748 100644
--- a/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java
+++ b/src/Java/miscutil/core/handler/Recipes/LateRegistrationHandler.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration;
+package miscutil.core.handler.Recipes;
 
 import miscutil.core.handler.COMPAT_HANDLER;
 import miscutil.core.recipe.ShapedRecipeObject;
diff --git a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java b/src/Java/miscutil/core/handler/Recipes/RegistrationHandler.java
index 5b9058e2de..be48d27752 100644
--- a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java
+++ b/src/Java/miscutil/core/handler/Recipes/RegistrationHandler.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration;
+package miscutil.core.handler.Recipes;
 
 import miscutil.core.handler.COMPAT_HANDLER;
 import miscutil.core.recipe.RECIPES_MachineComponents;
diff --git a/src/Java/miscutil/core/util/recipe/UtilsRecipe.java b/src/Java/miscutil/core/util/recipe/UtilsRecipe.java
index 9e36652b10..3c5617a7c6 100644
--- a/src/Java/miscutil/core/util/recipe/UtilsRecipe.java
+++ b/src/Java/miscutil/core/util/recipe/UtilsRecipe.java
@@ -7,8 +7,8 @@ import java.util.Iterator;
 import java.util.List;
 
 import miscutil.core.handler.COMPAT_HANDLER;
-import miscutil.core.handler.registration.LateRegistrationHandler;
-import miscutil.core.handler.registration.RegistrationHandler;
+import miscutil.core.handler.Recipes.LateRegistrationHandler;
+import miscutil.core.handler.Recipes.RegistrationHandler;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
 import miscutil.core.util.item.UtilsItems;
diff --git a/src/Java/miscutil/xmod/gregtech/HANDLER_GT.java b/src/Java/miscutil/xmod/gregtech/HANDLER_GT.java
index c2bb4a5a8f..ae8200a320 100644
--- a/src/Java/miscutil/xmod/gregtech/HANDLER_GT.java
+++ b/src/Java/miscutil/xmod/gregtech/HANDLER_GT.java
@@ -1,10 +1,10 @@
 package miscutil.xmod.gregtech;
 
 import gregtech.api.util.GT_Config;
-import miscutil.core.handler.registration.gregtech.GregtechConduits;
 import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import miscutil.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler;
 import miscutil.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
+import miscutil.xmod.gregtech.registration.gregtech.GregtechConduits;
 
 public class HANDLER_GT {
 	
diff --git a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechItemList.java
index 09f70028e9..20f1ff9516 100644
--- a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechItemList.java
@@ -97,13 +97,17 @@ public enum GregtechItemList implements GregtechItemContainer {
 	
 	
 	Food_Baked_Raisin_Bread, 
+	
+	
 	Industrial_SinterFurnace, 
 	
 	SuperConductorInputNode, 
 	
 	Casing_Reactor_I, Casing_Reactor_II, 
 	
-	PowerSubStation;
+	PowerSubStation, 
+	
+	GT_Dehydrator_EV, GT_Dehydrator_IV, GT_Dehydrator_LuV, GT_Dehydrator_ZPM;
 
 	public static final GregtechItemList[]
 			DYE_ONLY_ITEMS = {
diff --git a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechOrePrefixes.java
index 9eb85aa5c8..7079c40ed3 100644
--- a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechOrePrefixes.java
+++ b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechOrePrefixes.java
@@ -346,7 +346,12 @@ public enum GregtechOrePrefixes {
 		SulfurousAcid(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 110, 220, 30, 0, "Sulfurous Acid", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))),
 		SulfurDioxide(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 150, 200, 50, 0, "Sulfur Dioxide", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))),
 		HydrogenChloride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 150, 240, 90, 0, "Hydrogen Chloride", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))),
-		SulfuricApatite(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 0, 105, 105, 0, "Sulfuric Apatite Solution", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1)));
+		SulfuricApatite(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 0, 105, 105, 0, "Sulfuric Apatite Solution", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), 
+		
+		SulfuricLithium(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 0, 105, 105, 0, "Sulfuric Lithium Solution", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), 
+		LithiumHydroxide(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 0, 105, 105, 0, "Lithium Hydroxide", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), 
+		 
+		;
 		
 		
 		
diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index 36a61f84e3..caa1994f2e 100644
--- a/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -83,6 +83,22 @@ public class GregtechFluidHandler {
 				}
 			}
 			
+
+			Meta_GT_Proxy.addFluid("sulfuricLithium", "Sulfuric Lithium", GT_Materials.SulfuricLithium, 4, 280, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricLithium, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
+			generateIC2FluidCell("SulfuricLithium");
+
+			Meta_GT_Proxy.addFluid("lithiumHydroxide", "Lithium Hydroxide", GT_Materials.LithiumHydroxide, 4, 500, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.LithiumHydroxide, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
+			generateIC2FluidCell("SulfuricApatite");
+
+			Meta_GT_Proxy.addFluid("sulfuricApatite", "Sulfuric Apatite", GT_Materials.SulfuricApatite, 4, 500, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricApatite, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
+			generateIC2FluidCell("SulfuricApatite");
+
+			Meta_GT_Proxy.addFluid("sulfuricApatite", "Sulfuric Apatite", GT_Materials.SulfuricApatite, 4, 500, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricApatite, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
+			generateIC2FluidCell("SulfuricApatite");
+
+			Meta_GT_Proxy.addFluid("sulfuricApatite", "Sulfuric Apatite", GT_Materials.SulfuricApatite, 4, 500, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricApatite, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
+			generateIC2FluidCell("SulfuricApatite");
+
 			
 			//Chemical Bath Recipes
 			GT_Values.RA.addChemicalRecipe(
@@ -92,6 +108,22 @@ public class GregtechFluidHandler {
 					FluidUtils.getFluidStack("sulfuricapatite", 133*4),
 					UtilsItems.getItemStackOfAmountFromOreDict("dustSmallSulfur", 1), 
 					20*20);
+			
+			GT_Values.RA.addChemicalRecipe(
+					UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 8),
+					null,
+					FluidUtils.getFluidStack("sulfuricacid", 133*32), 
+					FluidUtils.getFluidStack("sulfuriclithium", 133*4),
+					UtilsItems.getItemStackOfAmountFromOreDict("dustSmallLithium", 2), 
+					20*20);
+			
+			GT_Values.RA.addChemicalRecipe(
+					UtilsItems.getItemStackOfAmountFromOreDict("cellOxygen", 1),
+					UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 16),
+					FluidUtils.getFluidStack("water", 1000), 
+					FluidUtils.getFluidStack("lithiumhydroxide", 133*4),
+					null, 
+					300*20);
 
 			
 			
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechConduits.java
index f3cc14e889..4c3258b069 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import static miscutil.core.lib.LoadedMods.Gregtech;
 import gregtech.api.enums.GT_Values;
diff --git a/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
new file mode 100644
index 0000000000..503ce9e9e8
--- /dev/null
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -0,0 +1,43 @@
+package miscutil.xmod.gregtech.registration.gregtech;
+
+import gregtech.api.enums.OreDictNames;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe;
+import gregtech.api.util.GT_Recipe;
+import miscutil.core.lib.CORE.configSwitches;
+import miscutil.core.lib.LoadedMods;
+import miscutil.core.util.Utils;
+import miscutil.xmod.gregtech.api.enums.GregtechItemList;
+import miscutil.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator;
+
+public class GregtechDehydrator
+{
+	public static void run()
+	{
+		if (LoadedMods.Gregtech && configSwitches.enableSolarGenerators){
+			Utils.LOG_INFO("Gregtech5u Content | Registering Chemical Dehydrators.");
+			run1();
+		}
+		
+	}
+
+	private static void run1()
+	{
+		
+		GregtechItemList.GT_Dehydrator_EV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(813, "advancedmachine.dehydrator.tier.01", "Advanced Chemical Dehydrator I", 4, "Stay calm and keep sifting",
+        		GT_Recipe.GT_Recipe_Map.sSifterRecipes, 1, 9, 0, 2, 5, "Sifter.png", "", false, false, 0, "SIFTER",
+        		new Object[]{"WFW", "PMP", "CFC", Character.valueOf('M'), GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL,
+        		Character.valueOf('P'), GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER,
+        		Character.valueOf('F'), OreDictNames.craftingFilter,
+        		Character.valueOf('C'), GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC,
+        		Character.valueOf('W'), GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE}).getStackForm(1L));
+		
+        //GregtechItemList.GT_Dehydrator_EV.set(new GregtechMetaTileEntitySolarGenerator(813, "dehydrator.tier.01", "Extreme Voltage Chemical Dehydrator", 4).getStackForm(1L));
+        GregtechItemList.GT_Dehydrator_IV.set(new GregtechMetaTileEntitySolarGenerator(814, "dehydrator.tier.02", "Insane Voltage Chemical Dehydrator", 5).getStackForm(1L));
+        GregtechItemList.GT_Dehydrator_LuV.set(new GregtechMetaTileEntitySolarGenerator(815, "dehydrator.tier.03", "Ludicrous Voltage Chemical Dehydrator", 6).getStackForm(1L));
+        GregtechItemList.GT_Dehydrator_ZPM.set(new GregtechMetaTileEntitySolarGenerator(816, "dehydrator.tier.04", "ZPM Voltage Chemical Dehydrator", 7).getStackForm(1L));
+		
+        
+        
+        
+	}
+}
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
index 21e74c1614..b882950be1 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
index 6e0324966f..54840ca463 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import miscutil.core.util.Utils;
 import miscutil.xmod.gregtech.api.enums.GregtechItemList;
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java
index bd3d9f4d89..ab551cc88a 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import miscutil.core.util.Utils;
 import miscutil.xmod.gregtech.api.enums.GregtechItemList;
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java
index c4ad9c122b..30c199193e 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialElectrolyzer.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import miscutil.core.util.Utils;
 import miscutil.xmod.gregtech.api.enums.GregtechItemList;
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java
index fa3663fb81..b00175b29c 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMacerator.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import miscutil.core.util.Utils;
 import miscutil.xmod.gregtech.api.enums.GregtechItemList;
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
index cbb4be3115..8de2b1c211 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialMassFabricator.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import miscutil.core.util.Utils;
 import miscutil.xmod.gregtech.api.enums.GregtechItemList;
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java
index 4e25ff3475..627ac158b3 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import miscutil.core.util.Utils;
 import miscutil.xmod.gregtech.api.enums.GregtechItemList;
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialSinter.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialSinter.java
index 03ad7cce7f..e4f54edc83 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialSinter.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialSinter.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import miscutil.core.util.Utils;
 import miscutil.xmod.gregtech.api.enums.GregtechItemList;
@@ -18,7 +18,7 @@ public class GregtechIndustrialSinter{
 	private static void run1()
 	{
 		//Industrial Electrolyzer Multiblock
-		GregtechItemList.Industrial_SinterFurnace.set(new GregtechMetaTileEntityIndustrialSinter(800, "industrialsinterfurnace.controller.tier.single", "Sinter Furnace").getStackForm(1L));
+		GregtechItemList.Industrial_SinterFurnace.set(new GregtechMetaTileEntityIndustrialSinter(810, "industrialsinterfurnace.controller.tier.single", "Sinter Furnace").getStackForm(1L));
 		
 	}
 }
 \ No newline at end of file
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java
index 5672775a56..50ffd83851 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialWiremill.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import miscutil.core.util.Utils;
 import miscutil.xmod.gregtech.api.enums.GregtechItemList;
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java
index d5271181f9..7c5479259e 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechIronBlastFurnace.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import miscutil.core.util.Utils;
 import miscutil.xmod.gregtech.api.enums.GregtechItemList;
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechPowerSubStation.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java
index 58319ab4b4..3c555d5cf1 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechPowerSubStation.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import miscutil.core.util.Utils;
 import miscutil.xmod.gregtech.api.enums.GregtechItemList;
@@ -21,7 +21,7 @@ public class GregtechPowerSubStation
 	private static void run1()
 	{
 		//Steam Condensors
-		GregtechItemList.PowerSubStation.set(new GregtechMetaTileEntityPowerSubStationController(802, "substation.01.input.single", "Power Substation Node").getStackForm(1L));
+		GregtechItemList.PowerSubStation.set(new GregtechMetaTileEntityPowerSubStationController(812, "substation.01.input.single", "Power Substation Node").getStackForm(1L));
 		
 	}
 }
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
index 3a61884782..cc40d0d753 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.Utils;
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
index 5def5e1a92..ff4dd7d223 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java
index 3c58d69209..f9c6bbc625 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import miscutil.core.lib.CORE.configSwitches;
 import miscutil.core.lib.LoadedMods;
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java
index 7cd222205d..f0c9f741d0 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import miscutil.core.util.Utils;
 import miscutil.xmod.gregtech.api.enums.GregtechItemList;
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSuperConductionPoint.java b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java
index d18a9ed3c3..9b62af15d3 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSuperConductionPoint.java
+++ b/src/Java/miscutil/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler.registration.gregtech;
+package miscutil.xmod.gregtech.registration.gregtech;
 
 import miscutil.core.util.Utils;
 import miscutil.xmod.gregtech.api.enums.GregtechItemList;
@@ -21,7 +21,7 @@ public class GregtechSuperConductionPoint
 	private static void run1()
 	{
 		//Steam Condensors
-		GregtechItemList.SuperConductorInputNode.set(new GregtechMetaTileEntitySuperCondensor(801, "superconductor.01.input.single", "Power Phase Shifting Station", 8).getStackForm(1L));
+		GregtechItemList.SuperConductorInputNode.set(new GregtechMetaTileEntitySuperCondensor(811, "superconductor.01.input.single", "Power Phase Shifting Station", 8).getStackForm(1L));
 		
 	}
 }