3 files changed, 48 insertions, 15 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 9236aa53e5..eecbcec9e9 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -6,7 +6,6 @@ import java.util.LinkedList;
 import java.util.Queue;
 
 import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.MultiblockRecipeMapHandler;
 import gtPlusPlus.core.common.compat.*;
 import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler;
 import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
@@ -55,7 +54,7 @@ public class COMPAT_HANDLER {
 			to
 			868
 			---
-			886
+			890
 			to
 			950
 			*/
@@ -97,7 +96,11 @@ public class COMPAT_HANDLER {
 			GregtechIndustrialWashPlant.run();
 			GregtechSemiFluidgenerators.run();
 			GregtechAdvancedMixer.run();
-
+			GregtechWirelessChargers.run();
+			GregtechIndustrialGeneratorArray.run();
+			GregtechIndustrialCuttingFactory.run();
+			GregtechMiniRaFusion.run();
+			
 			//New Horizons Content
 			NewHorizonsAccelerator.run();
 		}
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
index b833ab023a..b534cd11cd 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
@@ -6,8 +6,7 @@ import gtPlusPlus.xmod.forestry.HANDLER_FR;
 import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.growthcraft.HANDLER_GC;
 import gtPlusPlus.xmod.ic2.HANDLER_IC2;
-import gtPlusPlus.xmod.mekanism.HANDLER_Mekanism;
-import gtPlusPlus.xmod.rftools.HANDLER_RfTools;
+import gtPlusPlus.xmod.thaumcraft.common.HANDLER_Thaumcraft;
 import gtPlusPlus.xmod.thermalfoundation.HANDLER_TF;
 
 public class COMPAT_IntermodStaging {
@@ -20,9 +19,8 @@ public class COMPAT_IntermodStaging {
 		HANDLER_IC2.preInit();
 		HANDLER_Computronics.preInit();
 		HANDLER_BiomesOPlenty.preInit();
-		HANDLER_RfTools.preInit();
-		HANDLER_Mekanism.preInit();
-
+		//HANDLER_Mekanism.preInit();
+		HANDLER_Thaumcraft.preInit();
 	}
 
 	public static void init(){
@@ -33,8 +31,8 @@ public class COMPAT_IntermodStaging {
 		HANDLER_IC2.init();
 		HANDLER_Computronics.init();
 		HANDLER_BiomesOPlenty.init();
-		HANDLER_RfTools.init();
-		HANDLER_Mekanism.init();
+		//HANDLER_Mekanism.init();
+		HANDLER_Thaumcraft.init();
 	}
 
 	public static void postInit(){
@@ -45,8 +43,8 @@ public class COMPAT_IntermodStaging {
 		HANDLER_IC2.postInit();
 		HANDLER_Computronics.postInit();
 		HANDLER_BiomesOPlenty.postInit();
-		HANDLER_RfTools.postInit();
-		HANDLER_Mekanism.postInit();
+		//HANDLER_Mekanism.postInit();
+		HANDLER_Thaumcraft.postInit();
 	}
 
 
diff --git a/src/Java/gtPlusPlus/core/handler/GuiHandler.java b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
index 70e2934349..4b7e58cf70 100644
--- a/src/Java/gtPlusPlus/core/handler/GuiHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/GuiHandler.java
@@ -3,13 +3,27 @@ package gtPlusPlus.core.handler;
 import cpw.mods.fml.common.network.IGuiHandler;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import gtPlusPlus.GTplusplus;
-import gtPlusPlus.core.container.*;
+import gtPlusPlus.core.container.Container_BackpackBase;
+import gtPlusPlus.core.container.Container_FishTrap;
+import gtPlusPlus.core.container.Container_Grindle;
+import gtPlusPlus.core.container.Container_ModularityTable;
+import gtPlusPlus.core.container.Container_ProjectTable;
+import gtPlusPlus.core.container.Container_TradeTable;
+import gtPlusPlus.core.container.Container_Workbench;
+import gtPlusPlus.core.container.Container_WorkbenchAdvanced;
 import gtPlusPlus.core.gui.beta.Gui_ID_Registry;
 import gtPlusPlus.core.gui.beta.MU_GuiId;
 import gtPlusPlus.core.gui.item.GuiBaseBackpack;
-import gtPlusPlus.core.gui.machine.*;
+import gtPlusPlus.core.gui.item.GuiScreenGrindle;
+import gtPlusPlus.core.gui.machine.GUI_FishTrap;
+import gtPlusPlus.core.gui.machine.GUI_ModularityTable;
+import gtPlusPlus.core.gui.machine.GUI_ProjectTable;
+import gtPlusPlus.core.gui.machine.GUI_TradeTable;
+import gtPlusPlus.core.gui.machine.GUI_Workbench;
+import gtPlusPlus.core.gui.machine.GUI_WorkbenchAdvanced;
 import gtPlusPlus.core.interfaces.IGuiManager;
 import gtPlusPlus.core.inventories.BaseInventoryBackpack;
+import gtPlusPlus.core.inventories.BaseInventoryGrindle;
 import gtPlusPlus.core.tileentities.base.TileEntityBase;
 import gtPlusPlus.core.tileentities.general.TileEntityFishTrap;
 import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable;
@@ -18,6 +32,9 @@ import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
 import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench;
 import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.thaumcraft.common.tile.TileFastAlchemyFurnace;
+import gtPlusPlus.xmod.thaumcraft.gui.ContainerFastAlchemyFurnace;
+import gtPlusPlus.xmod.thaumcraft.gui.GuiFastAlchemyFurnace;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChunkCoordinates;
@@ -32,7 +49,8 @@ public class GuiHandler implements IGuiHandler {
 	public static final int GUI5 = 4;      //Workbench Adv
 	public static final int GUI6 = 5;      //Fish trap
 	public static final int GUI7 = 6;      //Trade table
-	public static final int GUI8 = 7;      //
+	public static final int GUI8 = 7;      //Alchemical Furnace
+	public static final int GUI9 = 8;      //Grindle
 
 
 
@@ -79,6 +97,13 @@ public class GuiHandler implements IGuiHandler {
 			else if (ID == GUI7){
 				return new Container_TradeTable(player.inventory, (TileEntityTradeTable)te);
 			}
+			else if (ID == GUI8){
+				return new ContainerFastAlchemyFurnace(player.inventory, (TileFastAlchemyFurnace)te);
+			}
+		}
+
+		if (ID == GUI9){
+			return new Container_Grindle(player, player.inventory, new BaseInventoryGrindle(player.getHeldItem()));
 		}
 
 
@@ -124,6 +149,13 @@ public class GuiHandler implements IGuiHandler {
 			else if (ID == GUI7){
 				return new GUI_TradeTable(player.inventory, (TileEntityTradeTable)te, ((TileEntityBase) te).getOwner());
 			}
+			else if (ID == GUI8){
+				return new GuiFastAlchemyFurnace(player.inventory, (TileFastAlchemyFurnace)te);
+			}
+		}
+
+		if (ID == GUI9){
+			return new GuiScreenGrindle(new Container_Grindle(player, player.inventory, new BaseInventoryGrindle(player.getHeldItem())), player);
 		}
 
 		return null;