+ Added replacement rotors to replace the Energetic/Vibrant types if EnderIO is not installed.

+ Added support for ImmersiveEngineering's Coke Oven Block to be used in recipes & overall mod support now.
+ More work on the Solar Generators. (disabled for now though, for public builds)
$ Fixed the ExtraBees Checking.

9 files changed, 316 insertions, 232 deletions

diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java
index 0bfac0dcd2..09e27a80d7 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java
@@ -1,6 +1,5 @@
 package miscutil.core.handler.registration.gregtech;
 
-import miscutil.core.util.Utils;
 import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
 import miscutil.core.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator;
 
@@ -9,8 +8,8 @@ public class GregtechSolarGenerators
 	public static void run()
 	{
 		if (miscutil.core.lib.LoadedMods.Gregtech){
-			Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Solar Generator Blocks.");
-			run1();
+			//Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Solar Generator Blocks.");
+			//run1();
 		}
 		
 	}
diff --git a/src/Java/miscutil/core/lib/LoadedMods.java b/src/Java/miscutil/core/lib/LoadedMods.java
index 40862648a8..9ea04cfa1a 100644
--- a/src/Java/miscutil/core/lib/LoadedMods.java
+++ b/src/Java/miscutil/core/lib/LoadedMods.java
@@ -22,10 +22,12 @@ public class LoadedMods {
 	public static boolean ForbiddenMagic = false;
 	public static boolean CompactWindmills = false;
 	public static boolean Railcraft = false;
+	public static boolean ImmersiveEngineering = false;
 	public static boolean Growthcraft = false;
 	public static boolean CoFHCore = false;
 	public static boolean Forestry = false;
 	public static boolean MagicBees = false;
+	public static boolean ExtraBees = false;
 	public static boolean Psychedelicraft = false;
 	public static boolean MiscUtils = true; //Dummy For MetaData Lookups in MT Wrapper
 
@@ -136,6 +138,16 @@ public class LoadedMods {
 			Utils.LOG_INFO("Components enabled for: Psychedelicraft");
 			totalMods++;
 		}
+		if (Loader.isModLoaded("ImmersiveEngineering") == true){
+			ImmersiveEngineering  = true;
+			Utils.LOG_INFO("Components enabled for: ImmersiveEngineering");
+			totalMods++;
+		}
+		if (Loader.isModLoaded("ExtraBees") == true){
+			ExtraBees  = true;
+			Utils.LOG_INFO("Components enabled for: ExtraBees");
+			totalMods++;
+		}
 		
 	
 		Utils.LOG_INFO("Content found for "+totalMods+" mods");
diff --git a/src/Java/miscutil/core/recipe/RECIPES_Machines.java b/src/Java/miscutil/core/recipe/RECIPES_Machines.java
index 626f0fdfb3..0fdb78b455 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_Machines.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_Machines.java
@@ -203,6 +203,7 @@ public class RECIPES_Machines {
 
 	//Misc
 	static ItemStack INPUT_RCCokeOvenBlock;
+	static ItemStack INPUT_IECokeOvenBlock;
 
 
 
@@ -213,79 +214,83 @@ public class RECIPES_Machines {
 		run();
 		Utils.LOG_INFO("Loading Recipes for the Various machine blocks.");
 	}
-	
+
 	private static void run(){
 		initModItems();
 	}	
 
 	private static void initModItems(){
 		if (LoadedMods.Gregtech){
-		RECIPES_Shapeless.dustStaballoy = UtilsItems.getItemStackWithMeta(LoadedMods.Gregtech, "gregtech:gt.metaitem.01", "Staballoy Dust", 2319, 2);
-		machineCasing_ULV = ItemList.Casing_ULV.get(1);
-		machineCasing_LV = ItemList.Casing_LV.get(1);
-		machineCasing_MV = ItemList.Casing_MV.get(1);
-		machineCasing_HV = ItemList.Casing_HV.get(1);
-		machineCasing_EV = ItemList.Casing_EV.get(1);
-		machineCasing_IV = ItemList.Casing_IV.get(1);
-		machineCasing_LuV = ItemList.Casing_LuV.get(1);
-		machineCasing_ZPM = ItemList.Casing_ZPM.get(1);
-		machineCasing_UV = ItemList.Casing_UV.get(1);
-		machineCasing_MAX = ItemList.Casing_MAX.get(1);
-
-		//Gearbox Casings
-		gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1);
-		gearboxCasing_Tier_2 = ItemList.Casing_Gearbox_Steel.get(1);
-		gearboxCasing_Tier_3 = ItemList.Casing_Gearbox_Titanium.get(1);
-		gearboxCasing_Tier_4 = ItemList.Casing_Gearbox_TungstenSteel.get(1);
-
-		//Lava Boiler
-		boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1);
-
-		//Machine Components
-		electricMotor_LV = ItemList.Electric_Motor_LV.get(1);
-		electricMotor_MV = ItemList.Electric_Motor_MV.get(1);
-		electricMotor_HV = ItemList.Electric_Motor_HV.get(1);
-		electricMotor_EV = ItemList.Electric_Motor_EV.get(1);
-		electricMotor_IV = ItemList.Electric_Motor_IV.get(1);
-		electricPump_LV = ItemList.Electric_Pump_LV.get(1);
-		electricPump_MV = ItemList.Electric_Pump_MV.get(1);
-		electricPump_HV = ItemList.Electric_Pump_HV.get(1);
-		electricPump_EV = ItemList.Electric_Pump_EV.get(1);
-		electricPump_IV = ItemList.Electric_Pump_IV.get(1);
-		electricPiston_LV = ItemList.Electric_Piston_LV.get(1);
-		electricPiston_MV = ItemList.Electric_Piston_MV.get(1);
-		electricPiston_HV = ItemList.Electric_Piston_HV.get(1);
-		electricPiston_EV = ItemList.Electric_Piston_EV.get(1);
-		electricPiston_IV = ItemList.Electric_Piston_IV.get(1);
-		robotArm_LV = ItemList.Robot_Arm_LV.get(1);
-		robotArm_MV = ItemList.Robot_Arm_MV.get(1);
-		robotArm_HV = ItemList.Robot_Arm_HV.get(1);
-		robotArm_EV = ItemList.Robot_Arm_EV.get(1);
-		robotArm_IV = ItemList.Robot_Arm_IV.get(1);
-		conveyorModule_LV = ItemList.Conveyor_Module_LV.get(1);
-		conveyorModule_MV = ItemList.Conveyor_Module_MV.get(1);
-		conveyorModule_HV = ItemList.Conveyor_Module_HV.get(1);
-		conveyorModule_EV = ItemList.Conveyor_Module_EV.get(1);
-		conveyorModule_IV = ItemList.Conveyor_Module_IV.get(1);
-		emitter_LV = ItemList.Emitter_LV.get(1);
-		emitter_MV = ItemList.Emitter_MV.get(1);
-		emitter_HV = ItemList.Emitter_HV.get(1);
-		emitter_EV = ItemList.Emitter_EV.get(1);
-		emitter_IV = ItemList.Emitter_IV.get(1);
-		fieldGenerator_LV = ItemList.Field_Generator_LV.get(1);
-		fieldGenerator_MV = ItemList.Field_Generator_MV.get(1);
-		fieldGenerator_HV = ItemList.Field_Generator_HV.get(1);
-		fieldGenerator_EV = ItemList.Field_Generator_EV.get(1);
-		fieldGenerator_IV = ItemList.Field_Generator_IV.get(1);
-		sensor_LV = ItemList.Sensor_LV.get(1);
-		sensor_MV = ItemList.Sensor_MV.get(1);
-		sensor_HV = ItemList.Sensor_HV.get(1);
-		sensor_EV = ItemList.Sensor_EV.get(1);
-		sensor_IV = ItemList.Sensor_IV.get(1);}
+			RECIPES_Shapeless.dustStaballoy = UtilsItems.getItemStackWithMeta(LoadedMods.Gregtech, "gregtech:gt.metaitem.01", "Staballoy Dust", 2319, 2);
+			machineCasing_ULV = ItemList.Casing_ULV.get(1);
+			machineCasing_LV = ItemList.Casing_LV.get(1);
+			machineCasing_MV = ItemList.Casing_MV.get(1);
+			machineCasing_HV = ItemList.Casing_HV.get(1);
+			machineCasing_EV = ItemList.Casing_EV.get(1);
+			machineCasing_IV = ItemList.Casing_IV.get(1);
+			machineCasing_LuV = ItemList.Casing_LuV.get(1);
+			machineCasing_ZPM = ItemList.Casing_ZPM.get(1);
+			machineCasing_UV = ItemList.Casing_UV.get(1);
+			machineCasing_MAX = ItemList.Casing_MAX.get(1);
+
+			//Gearbox Casings
+			gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1);
+			gearboxCasing_Tier_2 = ItemList.Casing_Gearbox_Steel.get(1);
+			gearboxCasing_Tier_3 = ItemList.Casing_Gearbox_Titanium.get(1);
+			gearboxCasing_Tier_4 = ItemList.Casing_Gearbox_TungstenSteel.get(1);
+
+			//Lava Boiler
+			boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1);
+
+			//Machine Components
+			electricMotor_LV = ItemList.Electric_Motor_LV.get(1);
+			electricMotor_MV = ItemList.Electric_Motor_MV.get(1);
+			electricMotor_HV = ItemList.Electric_Motor_HV.get(1);
+			electricMotor_EV = ItemList.Electric_Motor_EV.get(1);
+			electricMotor_IV = ItemList.Electric_Motor_IV.get(1);
+			electricPump_LV = ItemList.Electric_Pump_LV.get(1);
+			electricPump_MV = ItemList.Electric_Pump_MV.get(1);
+			electricPump_HV = ItemList.Electric_Pump_HV.get(1);
+			electricPump_EV = ItemList.Electric_Pump_EV.get(1);
+			electricPump_IV = ItemList.Electric_Pump_IV.get(1);
+			electricPiston_LV = ItemList.Electric_Piston_LV.get(1);
+			electricPiston_MV = ItemList.Electric_Piston_MV.get(1);
+			electricPiston_HV = ItemList.Electric_Piston_HV.get(1);
+			electricPiston_EV = ItemList.Electric_Piston_EV.get(1);
+			electricPiston_IV = ItemList.Electric_Piston_IV.get(1);
+			robotArm_LV = ItemList.Robot_Arm_LV.get(1);
+			robotArm_MV = ItemList.Robot_Arm_MV.get(1);
+			robotArm_HV = ItemList.Robot_Arm_HV.get(1);
+			robotArm_EV = ItemList.Robot_Arm_EV.get(1);
+			robotArm_IV = ItemList.Robot_Arm_IV.get(1);
+			conveyorModule_LV = ItemList.Conveyor_Module_LV.get(1);
+			conveyorModule_MV = ItemList.Conveyor_Module_MV.get(1);
+			conveyorModule_HV = ItemList.Conveyor_Module_HV.get(1);
+			conveyorModule_EV = ItemList.Conveyor_Module_EV.get(1);
+			conveyorModule_IV = ItemList.Conveyor_Module_IV.get(1);
+			emitter_LV = ItemList.Emitter_LV.get(1);
+			emitter_MV = ItemList.Emitter_MV.get(1);
+			emitter_HV = ItemList.Emitter_HV.get(1);
+			emitter_EV = ItemList.Emitter_EV.get(1);
+			emitter_IV = ItemList.Emitter_IV.get(1);
+			fieldGenerator_LV = ItemList.Field_Generator_LV.get(1);
+			fieldGenerator_MV = ItemList.Field_Generator_MV.get(1);
+			fieldGenerator_HV = ItemList.Field_Generator_HV.get(1);
+			fieldGenerator_EV = ItemList.Field_Generator_EV.get(1);
+			fieldGenerator_IV = ItemList.Field_Generator_IV.get(1);
+			sensor_LV = ItemList.Sensor_LV.get(1);
+			sensor_MV = ItemList.Sensor_MV.get(1);
+			sensor_HV = ItemList.Sensor_HV.get(1);
+			sensor_EV = ItemList.Sensor_EV.get(1);
+			sensor_IV = ItemList.Sensor_IV.get(1);}
 
 		if(LoadedMods.Railcraft){
-		//Misc
-		INPUT_RCCokeOvenBlock = UtilsItems.getItemStackWithMeta(LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1);
+			//Misc
+			INPUT_RCCokeOvenBlock = UtilsItems.getItemStackWithMeta(LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1);
+		}
+		if(LoadedMods.ImmersiveEngineering){
+			//Misc
+			INPUT_IECokeOvenBlock = UtilsItems.getItemStackWithMeta(LoadedMods.ImmersiveEngineering, "ImmersiveEngineering:stoneDecoration", "Coke_Oven_IE", 1, 1);
 		}
 		runModRecipes();
 	}	
@@ -297,7 +302,7 @@ public class RECIPES_Machines {
 					"dustUranium", "dustUranium", "dustUranium",
 					"dustUranium", "dustUranium", "dustUranium",
 					RECIPES_Shapeless.dustStaballoy);
-			
+
 			//Buffer Core
 			UtilsRecipe.recipeBuilder(
 					plateTier1, cableTier1, plateTier1,
@@ -350,7 +355,7 @@ public class RECIPES_Machines {
 					plateTier10, cableTier10, plateTier10,
 					RECIPE_BufferCore_MAX);
 
-			
+
 			UtilsRecipe.recipeBuilder(
 					wireTier1, RECIPE_BufferCore_ULV, wireTier1,
 					wireTier1, machineCasing_ULV, wireTier1,
@@ -438,13 +443,24 @@ public class RECIPES_Machines {
 					plateTier6, "stickElectrum", plateTier6,
 					RECIPE_IndustrialCentrifugeCasing);
 
+			if (LoadedMods.Railcraft){
 			//Industrial Coke Oven
 			UtilsRecipe.recipeBuilder(
 					plateCobalt, circuitTier4, plateCobalt,
 					machineCasing_HV, INPUT_RCCokeOvenBlock, machineCasing_HV,
 					plateCobalt, circuitTier5, plateCobalt,
 					RECIPE_IndustrialCokeOvenController);
-
+			}
+			
+			if (LoadedMods.ImmersiveEngineering){
+			//Industrial Coke Oven
+			UtilsRecipe.recipeBuilder(
+					plateCobalt, circuitTier4, plateCobalt,
+					machineCasing_HV, INPUT_IECokeOvenBlock, machineCasing_HV,
+					plateCobalt, circuitTier5, plateCobalt,
+					RECIPE_IndustrialCokeOvenController);
+			}
+			
 			//Coke Oven Frame Casing
 			UtilsRecipe.recipeBuilder(
 					plateTier8, rodTier8, plateTier8,
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java
index 79636fc9be..305fb44dfb 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java
+++ b/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java
@@ -9,6 +9,7 @@
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
 package miscutil.core.xmod.forestry.bees.items;
+import miscutil.core.lib.LoadedMods;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -46,21 +47,23 @@ public class FR_ItemRegistry {
 		//frameProven = registerItem(new FR_ItemHiveFrame(720, 0.3f), "frameProven");
 
 		//Magic Bee like Frames
-		hiveFrameAccelerated = new MB_ItemFrame(MB_FrameType.ACCELERATED);
-		hiveFrameVoid = new MB_ItemFrame(MB_FrameType.VOID, EnumRarity.rare);
-		hiveFrameMutagenic = new MB_ItemFrame(MB_FrameType.MUTAGENIC, EnumRarity.epic);
-		haveFrameBusy = new MB_ItemFrame(MB_FrameType.BUSY);
+		hiveFrameAccelerated = new MB_ItemFrame(MB_FrameType.ACCELERATED, "Longevity for bees isn't very common.");
+		hiveFrameVoid = new MB_ItemFrame(MB_FrameType.VOID, EnumRarity.rare, "??? (Dungeon Loot)");
+		hiveFrameMutagenic = new MB_ItemFrame(MB_FrameType.MUTAGENIC, EnumRarity.epic, "Evolution of the fitest, finest and fastest.");
+		haveFrameBusy = new MB_ItemFrame(MB_FrameType.BUSY, "Busy bee, Busy Bee, make more honey please for me.");
 		ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_CORRIDOR, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 18));
 		ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_LIBRARY, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 3, 23));
 		ChestGenHooks.addItem(ChestGenHooks.PYRAMID_DESERT_CHEST, new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 1, 18));
 		ChestGenHooks.addItem(ChestGenHooks.PYRAMID_JUNGLE_CHEST, new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 23));
 		
 		//Extra Bee like Frames
-		hiveFrameCocoa = new MB_ItemFrame(MB_FrameType.COCOA, EnumRarity.common);
-		hiveFrameCaged = new MB_ItemFrame(MB_FrameType.CAGE, EnumRarity.common);
-		hiveFrameSoul = new MB_ItemFrame(MB_FrameType.SOUL, EnumRarity.common);
-		hiveFrameClay = new MB_ItemFrame(MB_FrameType.CLAY, EnumRarity.common);
-		hiveFrameNova = new MB_ItemFrame(MB_FrameType.NOVA, EnumRarity.epic);
+		if (!LoadedMods.ExtraBees){
+		hiveFrameCocoa = new MB_ItemFrame(MB_FrameType.COCOA, EnumRarity.common, "");
+		hiveFrameCaged = new MB_ItemFrame(MB_FrameType.CAGE, EnumRarity.common, "");
+		hiveFrameSoul = new MB_ItemFrame(MB_FrameType.SOUL, EnumRarity.common, "");
+		hiveFrameClay = new MB_ItemFrame(MB_FrameType.CLAY, EnumRarity.common, "");
+		hiveFrameNova = new MB_ItemFrame(MB_FrameType.NOVA, EnumRarity.epic, "A Creative Only Frame.");
+		}
 
 
 
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java b/src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java
index ea4e93177b..00aac532fd 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java
+++ b/src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java
@@ -1,11 +1,15 @@
 package miscutil.core.xmod.forestry.bees.items;
 
+import java.util.List;
+
 import miscutil.core.creative.AddToCreativeTab;
 import miscutil.core.lib.CORE;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -19,13 +23,14 @@ public class MB_ItemFrame extends Item implements IHiveFrame
 {
 	private MB_FrameType type;
 	private EnumRarity rarity_value = EnumRarity.uncommon;
+	private final String toolTip;
 
-	public MB_ItemFrame(MB_FrameType frameType)
+	public MB_ItemFrame(MB_FrameType frameType, String description)
 	{
-		this(frameType, EnumRarity.uncommon);
+		this(frameType, EnumRarity.uncommon, description);
 	}
 	
-	public MB_ItemFrame(MB_FrameType frameType, EnumRarity rarity)
+	public MB_ItemFrame(MB_FrameType frameType, EnumRarity rarity, String description)
 	{
 		super();
 		this.type = frameType;
@@ -34,10 +39,19 @@ public class MB_ItemFrame extends Item implements IHiveFrame
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
 		this.setUnlocalizedName("frame" + frameType.getName());
 		this.rarity_value = rarity;
+		this.toolTip = description;
 		GameRegistry.registerItem(this, "frame" + frameType.getName());
 	}
 	
 	@Override
+	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
+		if (toolTip != "" || !toolTip.equals("")){			
+		list.add(EnumChatFormatting.GRAY+toolTip);
+		}
+		super.addInformation(stack, aPlayer, list, bool);
+	}	
+	
+	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerIcons(IIconRegister par1IconRegister)
 	{
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
index a034121cf5..36a541c7eb 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
@@ -4,7 +4,6 @@ import gregtech.api.enums.Textures;
 import gregtech.api.objects.GT_CopiedBlockTexture;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Material_Casings;
-import miscutil.core.lib.CORE;
 import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
 import miscutil.core.xmod.gregtech.common.blocks.textures.CasingTextureHandler;
 import net.minecraft.item.ItemStack;
@@ -18,89 +17,7 @@ extends GregtechMetaCasingBlocksAbstract {
 
 	public final static int GTID = 57;
 	
-	CasingTextureHandler TextureHandler = new CasingTextureHandler();
-	
-	private static Textures.BlockIcons.CustomIcon frontFace_0;
-	private static Textures.BlockIcons.CustomIcon frontFace_1;
-	private static Textures.BlockIcons.CustomIcon frontFace_2;
-	private static Textures.BlockIcons.CustomIcon frontFace_3;
-	private static Textures.BlockIcons.CustomIcon frontFace_4;
-	private static Textures.BlockIcons.CustomIcon frontFace_5;
-	private static Textures.BlockIcons.CustomIcon frontFace_6;
-	private static Textures.BlockIcons.CustomIcon frontFace_7;
-	private static Textures.BlockIcons.CustomIcon frontFace_8;
-	private static Textures.BlockIcons.CustomIcon frontFaceActive_0;
-	private static Textures.BlockIcons.CustomIcon frontFaceActive_1;
-	private static Textures.BlockIcons.CustomIcon frontFaceActive_2;
-	private static Textures.BlockIcons.CustomIcon frontFaceActive_3;
-	private static Textures.BlockIcons.CustomIcon frontFaceActive_4;
-	private static Textures.BlockIcons.CustomIcon frontFaceActive_5;
-	private static Textures.BlockIcons.CustomIcon frontFaceActive_6;
-	private static Textures.BlockIcons.CustomIcon frontFaceActive_7;
-	private static Textures.BlockIcons.CustomIcon frontFaceActive_8;
-	
-	Textures.BlockIcons.CustomIcon[] TURBINE = new Textures.BlockIcons.CustomIcon[]{
-			frontFace_0,
-			frontFace_1,
-			frontFace_2,
-			frontFace_3,
-			frontFace_4,
-			frontFace_5,
-			frontFace_6,
-			frontFace_7,
-			frontFace_8
-    };
-	Textures.BlockIcons.CustomIcon[] TURBINE_ACTIVE = new Textures.BlockIcons.CustomIcon[]{
-    		frontFaceActive_0,
-    		frontFaceActive_1,
-    		frontFaceActive_2,
-    		frontFaceActive_3,
-    		frontFaceActive_4,
-    		frontFaceActive_5,
-    		frontFaceActive_6,
-            frontFaceActive_7,
-            frontFaceActive_8
-    };
-
-	private static Textures.BlockIcons.CustomIcon GT9_1_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE1");
-	private static Textures.BlockIcons.CustomIcon GT9_1 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST1");
-	private static Textures.BlockIcons.CustomIcon GT9_2_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE2");
-	private static Textures.BlockIcons.CustomIcon GT9_2 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST2");
-	private static Textures.BlockIcons.CustomIcon GT9_3_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE3");
-	private static Textures.BlockIcons.CustomIcon GT9_3 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST3");
-	private static Textures.BlockIcons.CustomIcon GT9_4_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE4");
-	private static Textures.BlockIcons.CustomIcon GT9_4 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST4");
-	private static Textures.BlockIcons.CustomIcon GT9_5_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE5");
-	private static Textures.BlockIcons.CustomIcon GT9_5 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST5");
-	private static Textures.BlockIcons.CustomIcon GT9_6_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE6");
-	private static Textures.BlockIcons.CustomIcon GT9_6 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST6");
-	private static Textures.BlockIcons.CustomIcon GT9_7_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE7");
-	private static Textures.BlockIcons.CustomIcon GT9_7 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST7");
-	private static Textures.BlockIcons.CustomIcon GT9_8_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE8");
-	private static Textures.BlockIcons.CustomIcon GT9_8 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST8");
-	private static Textures.BlockIcons.CustomIcon GT9_9_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE9");
-	private static Textures.BlockIcons.CustomIcon GT9_9 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST9");
-	
-	private static Textures.BlockIcons.CustomIcon GT8_1_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE1");
-	private static Textures.BlockIcons.CustomIcon GT8_1 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE1");
-	private static Textures.BlockIcons.CustomIcon GT8_2_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE2");
-	private static Textures.BlockIcons.CustomIcon GT8_2 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE2");
-	private static Textures.BlockIcons.CustomIcon GT8_3_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE3");
-	private static Textures.BlockIcons.CustomIcon GT8_3 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE3");
-	private static Textures.BlockIcons.CustomIcon GT8_4_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE4");
-	private static Textures.BlockIcons.CustomIcon GT8_4 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE4.png");
-	private static Textures.BlockIcons.CustomIcon GT8_5_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE5");
-	private static Textures.BlockIcons.CustomIcon GT8_5 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE5");
-	private static Textures.BlockIcons.CustomIcon GT8_6_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE6");
-	private static Textures.BlockIcons.CustomIcon GT8_6 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE6");
-	private static Textures.BlockIcons.CustomIcon GT8_7_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE7");
-	private static Textures.BlockIcons.CustomIcon GT8_7 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE7");
-	private static Textures.BlockIcons.CustomIcon GT8_8_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE8");
-	private static Textures.BlockIcons.CustomIcon GT8_8 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE8");
-	private static Textures.BlockIcons.CustomIcon GT8_9_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ACTIVE9");
-	private static Textures.BlockIcons.CustomIcon GT8_9 = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE9");
-	
-	
+	CasingTextureHandler TextureHandler = new CasingTextureHandler();	
 
 	public GregtechMetaCasingBlocks() {
 		super(GregtechMetaCasingItems.class, "miscutils.blockcasings", GT_Material_Casings.INSTANCE);
@@ -138,50 +55,7 @@ extends GregtechMetaCasingBlocksAbstract {
 		GregtechItemList.Casing_Coil_U1.set(new ItemStack(this, 1, 12));
 		GregtechItemList.Casing_Coil_U2.set(new ItemStack(this, 1, 13));
 		GregtechItemList.Casing_Coil_U3.set(new ItemStack(this, 1, 14));
-		GregtechItemList.Casing_Coil_U4.set(new ItemStack(this, 1, 15));
-		
-		if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
-			frontFace_0 = GT9_1;
-			frontFaceActive_0 = (GT9_1_Active);
-			frontFace_1 = (GT9_2);
-			frontFaceActive_1 = (GT9_2_Active);
-			frontFace_2 = (GT9_3);
-			frontFaceActive_2 = (GT9_3_Active);
-			frontFace_3 = (GT9_4);
-			frontFaceActive_3 = (GT9_4_Active);
-			frontFace_4 = (GT9_5);
-			frontFaceActive_4 = (GT9_5_Active);
-			frontFace_5 = (GT9_6);
-			frontFaceActive_5 = (GT9_6_Active);
-			frontFace_6 = (GT9_7);
-			frontFaceActive_6 = (GT9_7_Active);
-			frontFace_7 = (GT9_8);
-			frontFaceActive_7 = (GT9_8_Active);
-			frontFace_8 = (GT9_9);
-			frontFaceActive_8 = (GT9_9_Active);
-		}
-		else{
-			frontFace_0 = (GT8_1);
-			frontFaceActive_0 = (GT8_1_Active);
-			frontFace_1 = (GT8_2);
-			frontFaceActive_1 = (GT8_2_Active);
-			frontFace_2 = (GT8_3);
-			frontFaceActive_2 = (GT8_3_Active);
-			frontFace_3 = (GT8_4);
-			frontFaceActive_3 = (GT8_4_Active);
-			frontFace_4 = (GT8_5);
-			frontFaceActive_4 = (GT8_5_Active);
-			frontFace_5 = (GT8_6);
-			frontFaceActive_5 = (GT8_6_Active);
-			frontFace_6 = (GT8_7);
-			frontFaceActive_6 = (GT8_7_Active);
-			frontFace_7 = (GT8_8);
-			frontFaceActive_7 = (GT8_8_Active);
-			frontFace_8 = (GT8_9);
-			frontFaceActive_8 = (GT8_9_Active);
-		}
-		
-		
+		GregtechItemList.Casing_Coil_U4.set(new ItemStack(this, 1, 15));		
 	}
 
 	@Override
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
new file mode 100644
index 0000000000..4af96ec97e
--- /dev/null
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
@@ -0,0 +1,144 @@
+package miscutil.core.xmod.gregtech.common.tileentities.generators;
+
+import gregtech.api.enums.Dyes;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.common.gui.GT_Container_Boiler;
+import gregtech.common.gui.GT_GUIContainer_Boiler;
+import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidHandler;
+
+public class GT_MetaTileEntity_Boiler_Solar
+        extends GT_MetaTileEntity_Boiler {
+    public GT_MetaTileEntity_Boiler_Solar(int aID, String aName, String aNameRegional) {
+        super(aID, aName, aNameRegional, "Steam Power by the Sun", new ITexture[0]);
+    }
+
+    public GT_MetaTileEntity_Boiler_Solar(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, aDescription, aTextures);
+    }
+
+    public ITexture[][][] getTextureSet(ITexture[] aTextures) {
+        ITexture[][][] rTextures = new ITexture[4][17][];
+        for (byte i = -1; i < 16; i = (byte) (i + 1)) {
+            ITexture[] tmp0 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa))};
+            rTextures[0][(i + 1)] = tmp0;
+            ITexture[] tmp1 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR)};
+            rTextures[1][(i + 1)] = tmp1;
+            ITexture[] tmp2 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa))};
+            rTextures[2][(i + 1)] = tmp2;
+            ITexture[] tmp3 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)};
+            rTextures[3][(i + 1)] = tmp3;
+        }
+        return rTextures;
+    }
+
+    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+        return mTextures[aSide >= 2 ? ((byte) (aSide != aFacing ? 2 : 3)) : aSide][aColorIndex + 1];
+    }
+
+    public int maxProgresstime() {
+        return 500;
+    }
+
+    public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+        return new GT_Container_Boiler(aPlayerInventory, aBaseMetaTileEntity, 16000);
+    }
+
+    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+        return new GT_GUIContainer_Boiler(aPlayerInventory, aBaseMetaTileEntity, "SolarBoiler.png", 16000);
+    }
+
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_Boiler_Solar(this.mName, this.mTier, this.mDescription, this.mTextures);
+    }
+    
+    private int mRunTime = 0;
+    
+    @Override
+    public void saveNBTData(NBTTagCompound aNBT) {
+        super.saveNBTData(aNBT);
+        aNBT.setInteger("mRunTime", this.mRunTime);
+    }
+
+    @Override
+    public void loadNBTData(NBTTagCompound aNBT) {
+        super.loadNBTData(aNBT);
+        this.mRunTime = aNBT.getInteger("mRunTime");
+    }
+
+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) {
+            if (this.mTemperature <= 20) {
+                this.mTemperature = 20;
+                this.mLossTimer = 0;
+            }
+            if (++this.mLossTimer > 45) {
+                this.mTemperature -= 1;
+                this.mLossTimer = 0;
+            }
+            if (this.mSteam != null) {
+                byte i = aBaseMetaTileEntity.getFrontFacing();
+                IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);
+                if (tTileEntity != null) {
+                    FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);
+                    if (tDrained != null) {
+                        int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);
+                        if (tFilledAmount > 0) {
+                            tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true), true);
+                        }
+                    }
+                }
+            }
+            if (aTick % 25L == 0L) {
+                if (this.mTemperature > 100) {
+                    if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) {
+                        this.mHadNoWater = true;
+                    } else {
+                        if (this.mHadNoWater) {
+                            aBaseMetaTileEntity.doExplosion(2048L);
+                            return;
+                        }
+                        this.mFluid.amount -= 1;
+                        mRunTime += 1;
+                        int tOutput = 150;
+                        if(mRunTime > 10000){
+                        	tOutput = Math.max(50, 150 - ((mRunTime-10000)/100));
+                        }
+                        if (this.mSteam == null) {
+                            this.mSteam = GT_ModHandler.getSteam(tOutput);
+                        } else if (GT_ModHandler.isSteam(this.mSteam)) {
+                            this.mSteam.amount += tOutput;
+                        } else {
+                            this.mSteam = GT_ModHandler.getSteam(tOutput);
+                        }
+                    }
+                } else {
+                    this.mHadNoWater = false;
+                }
+            }
+            if ((this.mSteam != null) &&
+                    (this.mSteam.amount > 16000)) {
+                sendSound((byte) 1);
+                this.mSteam.amount = 12000;
+            }
+            if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && (aTick % 256L == 0L) && (!aBaseMetaTileEntity.getWorld().isThundering())) {
+                boolean bRain = aBaseMetaTileEntity.getWorld().isRaining() && aBaseMetaTileEntity.getBiome().rainfall > 0.0F;
+                mProcessingEnergy += bRain && aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4 || !aBaseMetaTileEntity.getSkyAtSide((byte) 1) ? 0 : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1;
+            }
+            if ((this.mTemperature < 500) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L)) {
+                this.mProcessingEnergy -= 1;
+                this.mTemperature += 1;
+            }
+            aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
index 1296d2c87e..cbdbf56d85 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
@@ -40,17 +40,17 @@ public class GregtechMetaTileEntityIndustrialCokeOven
 
     @Override
 	public String[] getDescription() {
-        return new String[]{"Smelts up to 6-18 Items at once",
-        		"Controller Block for the Multi Smelter",
+        return new String[]{"Processes Logs and Coal into Charcoal and Coal Coke.",
+        		"Controller Block for the Industrial Coke Oven",
         		"Size: 3x3x3 (Hollow)",
         		"Controller (front middle at bottom)",
-        		"8x Heating Coils (middle Layer, hollow)",
+        		"8x Heat Resistant/Proof Coils (middle Layer, hollow)",
         		"1x Input (one of bottom)",
         		"1x Output (one of bottom)", 
         		"1x Energy Hatch (one of bottom)",
         		"1x Maintenance Hatch (one of bottom)",
         		"1x Muffler Hatch (top middle)",
-        		"Heat Proof Machine Casings for the rest"};
+        		"Structural Coke Oven Casings for the rest"};
     }
 
     @Override
diff --git a/src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java b/src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java
index 334119252b..5aa2b6181b 100644
--- a/src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java
+++ b/src/Java/miscutil/core/xmod/ic2/item/IC2_Items.java
@@ -4,6 +4,7 @@ import ic2.core.IC2;
 import ic2.core.init.InternalName;
 import miscutil.core.creative.AddToCreativeTab;
 import miscutil.core.item.base.CoreItem;
+import miscutil.core.lib.LoadedMods;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
@@ -26,22 +27,43 @@ public class IC2_Items {
 
 	public static void register(){
 
-		//Tier 1
-		rotor_Blade_Material_1 = new ItemStack (new CoreItem("itemEnergeticRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-		shaft_Material_1 = new ItemStack (new CoreItem("itemEnergeticShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-		rotor_Material_1 = new ItemStack (new RotorBase(InternalName.itemwoodrotor, 9, 512000, 0.9F, 12, 80, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorEnergeticModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemEnergeticRotor"));
-		//Tier 2
-		rotor_Blade_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-		shaft_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-		rotor_Material_2 = new ItemStack (new RotorBase(InternalName.itemironrotor, 11, 809600, 1.0F, 14, 120, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemTungstenSteelRotor"));
-		//Tier 3
-		rotor_Blade_Material_3 = new ItemStack (new CoreItem("itemVibrantRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-		shaft_Material_3 = new ItemStack (new CoreItem("itemVibrantShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-		rotor_Material_3 = new ItemStack (new RotorBase(InternalName.itemsteelrotor, 13, 1600000, 1.2F, 16, 160, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorVibrantModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemVibrantRotor"));
-		//Tier 4
-		rotor_Blade_Material_4 = new ItemStack (new CoreItem("itemIridiumRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-		shaft_Material_4 = new ItemStack (new CoreItem("itemIridiumShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
-		rotor_Material_4 = new ItemStack (new RotorIridium(InternalName.itemwcarbonrotor, 15, 3200000, 1.5F, 18, 320, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemIridiumRotor"));
-	}
+		if(LoadedMods.EnderIO){
+			//Tier 1
+			rotor_Blade_Material_1 = new ItemStack (new CoreItem("itemEnergeticRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			shaft_Material_1 = new ItemStack (new CoreItem("itemEnergeticShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			rotor_Material_1 = new ItemStack (new RotorBase(InternalName.itemwoodrotor, 9, 512000, 0.9F, 12, 80, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorEnergeticModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemEnergeticRotor"));
+			//Tier 2
+			rotor_Blade_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			shaft_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			rotor_Material_2 = new ItemStack (new RotorBase(InternalName.itemironrotor, 11, 809600, 1.0F, 14, 120, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemTungstenSteelRotor"));
+			//Tier 3
+			rotor_Blade_Material_3 = new ItemStack (new CoreItem("itemVibrantRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			shaft_Material_3 = new ItemStack (new CoreItem("itemVibrantShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			rotor_Material_3 = new ItemStack (new RotorBase(InternalName.itemsteelrotor, 13, 1600000, 1.2F, 16, 160, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorVibrantModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemVibrantRotor"));
+			//Tier 4
+			rotor_Blade_Material_4 = new ItemStack (new CoreItem("itemIridiumRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			shaft_Material_4 = new ItemStack (new CoreItem("itemIridiumShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			rotor_Material_4 = new ItemStack (new RotorIridium(InternalName.itemwcarbonrotor, 15, 3200000, 1.5F, 18, 320, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemIridiumRotor"));
+
+		}
+		else {
+			//Tier 1 - Magnalium
+			rotor_Blade_Material_1 = new ItemStack (new CoreItem("itemMagnaliumRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			shaft_Material_1 = new ItemStack (new CoreItem("itemMagnaliumShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			rotor_Material_1 = new ItemStack (new RotorBase(InternalName.itemwoodrotor, 9, 512000, 0.9F, 12, 80, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorMagnaliumModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemMagnaliumRotor"));
+			//Tier 2
+			rotor_Blade_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			shaft_Material_2 = new ItemStack (new CoreItem("itemTungstenSteelShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			rotor_Material_2 = new ItemStack (new RotorBase(InternalName.itemironrotor, 11, 809600, 1.0F, 14, 120, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorTungstenSteelModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemTungstenSteelRotor"));
+			//Tier 3 - Ultimet
+			rotor_Blade_Material_3 = new ItemStack (new CoreItem("itemUltimetRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			shaft_Material_3 = new ItemStack (new CoreItem("itemUltimetShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			rotor_Material_3 = new ItemStack (new RotorBase(InternalName.itemsteelrotor, 13, 1600000, 1.2F, 16, 160, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorUltimetModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemUltimetRotor"));
+			//Tier 4
+			rotor_Blade_Material_4 = new ItemStack (new CoreItem("itemIridiumRotorBlade", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			shaft_Material_4 = new ItemStack (new CoreItem("itemIridiumShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor"));
+			rotor_Material_4 = new ItemStack (new RotorIridium(InternalName.itemwcarbonrotor, 15, 3200000, 1.5F, 18, 320, new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorIridiumModel.png")).setCreativeTab(AddToCreativeTab.tabMachines).setUnlocalizedName("itemIridiumRotor"));
+		}
 
+	}
 }