+ Updated Tooltips on all GT5u related blocks.

+ Added Config options for TC Shard OreDicting, IC2 Recipe Removal and Alternative battery Alloy.
$ Fixed the Industrial Centrifuge not handling recipes properly.
$ Fixed the Industrial Centrifuge stopping when it's recipe time was < 1.
% Moved Config related variables to their own inner class within CORE.java

2 files changed, 33 insertions, 23 deletions

diff --git a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java
index cff1e58c27..abea1c87f1 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java
+++ b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java
@@ -2,6 +2,7 @@ package miscutil.core.common.compat;
 
 
 import static miscutil.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
+import miscutil.core.lib.CORE.configSwitches;
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.recipe.ShapedRecipeObject;
 import miscutil.core.util.item.UtilsItems;
@@ -12,7 +13,7 @@ public class COMPAT_IC2 {
 
 	private static ItemStack itemCropnalyzer = UtilsItems.simpleMetaStack("IC2:itemCropnalyzer", 0, 1);
 	private static ItemStack itemSolarHelmet = UtilsItems.simpleMetaStack("IC2:itemSolarHelmet", 0, 1);
-	
+
 	public static ShapedRecipeObject Cropnalyzer = new ShapedRecipeObject(
 			"ore:cableGt02Copper", "ore:cableGt02Copper", null, 
 			"minecraft:redstone", "ore:blockGlass", "minecraft:redstone", 
@@ -23,33 +24,39 @@ public class COMPAT_IC2 {
 			"ore:plateIron", "gregtech:gt.metaitem.01:32750", "ore:plateIron", 
 			"ore:craftingWireCopper", "ore:craftingWireCopper", "ore:craftingWireCopper",
 			itemSolarHelmet);
-	
-	
-	
+
+
+
 	public static void OreDict(){
 		//Get ItemStacks for results
 		/*itemCropnalyzer = UtilsItems.getItemStack("IC2:itemCropnalyzer", 1);	
 		itemSolarHelmet = UtilsItems.getItemStack("IC2:itemSolarHelmet", 1);	*/
 		run();
 	}
-	
+
 	private static final void run(){
-		if (LoadedMods.Gregtech){
-		//Fuck these right off.
-		RemoveRecipeQueue.add("IC2:itemCable");
-		RemoveRecipeQueue.add("IC2:itemCable:1");
-		RemoveRecipeQueue.add("IC2:itemCable:2");
-		RemoveRecipeQueue.add("IC2:itemCable:3");
-		RemoveRecipeQueue.add("IC2:itemCable:5");
-		RemoveRecipeQueue.add("IC2:itemCable:6");
-		RemoveRecipeQueue.add("IC2:itemCable:10");
-		RemoveRecipeQueue.add("IC2:itemCable:13");
-		//RemoveRecipeQueue.add(itemCropnalyzer);		
-		//RemoveRecipeQueue.add(itemSolarHelmet);
-		
-		//AddRecipeQueue.add(Cropnalyzer);
-		//AddRecipeQueue.add(SolarHelmet);
+
+		if (configSwitches.disableIC2Recipes){
+
+
+
+			if (LoadedMods.Gregtech){
+				//Fuck these right off.
+				RemoveRecipeQueue.add("IC2:itemCable");
+				RemoveRecipeQueue.add("IC2:itemCable:1");
+				RemoveRecipeQueue.add("IC2:itemCable:2");
+				RemoveRecipeQueue.add("IC2:itemCable:3");
+				RemoveRecipeQueue.add("IC2:itemCable:5");
+				RemoveRecipeQueue.add("IC2:itemCable:6");
+				RemoveRecipeQueue.add("IC2:itemCable:10");
+				RemoveRecipeQueue.add("IC2:itemCable:13");
+				//RemoveRecipeQueue.add(itemCropnalyzer);		
+				//RemoveRecipeQueue.add(itemSolarHelmet);
+
+				//AddRecipeQueue.add(Cropnalyzer);
+				//AddRecipeQueue.add(SolarHelmet);
+			}
 		}
 	}
-	
+
 }
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java
index 3fbf3e409e..5e63ac5604 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java
+++ b/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java
@@ -2,6 +2,7 @@ package miscutil.core.common.compat;
 
 import gregtech.api.util.GT_OreDictUnificator;
 import miscutil.core.item.ModItems;
+import miscutil.core.lib.CORE.configSwitches;
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.item.UtilsItems;
 import net.minecraft.item.ItemStack;
@@ -9,7 +10,9 @@ import net.minecraft.item.ItemStack;
 public class COMPAT_Thaumcraft {
 
 	public static void OreDict(){
-		run();
+		if (configSwitches.enableThaumcraftShardUnification){
+			run();
+		}
 	}
 
 	private static final void run(){
@@ -24,7 +27,7 @@ public class COMPAT_Thaumcraft {
 			GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("Thaumcraft:ItemShard:"+i, 1));
 			//System.out.println("TC Shard registration count is: "+i);        
 		}
-		
+
 		if (LoadedMods.ForbiddenMagic){
 			for(int i=0; i<=6; i++){
 				//Utils.LOG_INFO(""+i);