Add and fix

More Bugfixes, Soldering Iron and Magic Energy Absorber

main/java/gregtech/api/enums/ItemList.java

@@ -633,6 +633,10 @@ public enum ItemList implements IItemContainer {
 	MagicEnergyConverter_LV, 
 	MagicEnergyConverter_MV, 
 	MagicEnergyConverter_HV,
+	MagicEnergyAbsorber_LV,
+	MagicEnergyAbsorber_MV,
+	MagicEnergyAbsorber_HV,
+	MagicEnergyAbsorber_EV,
 	Depleted_Thorium_1,
 	Depleted_Thorium_2,
 	Depleted_Thorium_4,
@@ -640,7 +644,6 @@ public enum ItemList implements IItemContainer {
 	Distillation_Tower,
 	Energy_LapotronicOrb2, 
 	ZPM2,
-	
 	NULL;
 	
 	public static final ItemList[]

main/java/gregtech/api/enums/Materials.java

@@ -198,6 +198,8 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer {
 	Fairy				(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1|2                                   , 255, 255, 255,   0,	"Fairy"							,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
 	Ludicrite			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1|2                                   , 255, 255, 255,   0,	"Ludicrite"						,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
 	Pokefennium			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1|2                                   , 255, 255, 255,   0,	"Pokefennium"					,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
+	Draconium			(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1|2                                   , 255, 255, 255,   0,	"Draconium"					,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
+	DraconiumAwakened	(  -1, TextureSet.SET_NONE				,   1.0F,      0,  2, 1|2                                   , 255, 255, 255,   0,	"Awakened Draconium"					,    0,       0,         -1,    0, F, F,   3,   1,   1, Dyes._NULL			),
 	
 	/**
 	 * Unknown Material Components. Dead End Section.

main/java/gregtech/api/enums/TextureSet.java

@@ -101,7 +101,7 @@ public class TextureSet {
 		mTextures[ 46] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/toolHeadArrow");
 		mTextures[ 47] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/toolHeadScrewdriver");
 		mTextures[ 48] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/toolHeadBuzzSaw");
-		mTextures[ 49] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/void");
+		mTextures[ 49] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/toolHeadSoldering");
 		mTextures[ 50] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/void");
 		mTextures[ 51] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/wireFine");
 		mTextures[ 52] = new Textures.ItemIcons .CustomIcon("materialicons/"+mSetName+"/gearGtSmall");

main/java/gregtech/api/enums/Textures.java

@@ -41,7 +41,7 @@ public class Textures {
 		, MACHINE_UV_TOP, MACHINE_UV_SIDE, MACHINE_UV_BOTTOM
 		, MACHINE_MAX_TOP, MACHINE_MAX_SIDE, MACHINE_MAX_BOTTOM
 		, MACHINE_BRONZEPLATEDBRICKS, MACHINE_HEATPROOFCASING, MACHINE_BRONZEBLASTFURNACE, MACHINE_BRONZEBLASTFURNACE_ACTIVE
-		, MACHINE_CASING_ROBUST_TUNGSTENSTEEL, MACHINE_CASING_CLEAN_STAINLESSSTEEL, MACHINE_CASING_STABLE_TITANIUM, MACHINE_CASING_FIREBOX_TITANIUM, MACHINE_CASING_FUSION_COIL, MACHINE_CASING_FUSION, MACHINE_CASING_FUSION_GLASS, MACHINE_CASING_FUSION_GLASS_YELLOW, MACHINE_CASING_FUSION_2,MACHINE_CASING_MAGIC,MACHINE_CASING_MAGIC_FRONT,MACHINE_CASING_DRAGONEGG
+		, MACHINE_CASING_ROBUST_TUNGSTENSTEEL, MACHINE_CASING_CLEAN_STAINLESSSTEEL, MACHINE_CASING_STABLE_TITANIUM, MACHINE_CASING_FIREBOX_TITANIUM, MACHINE_CASING_FUSION_COIL, MACHINE_CASING_FUSION, MACHINE_CASING_FUSION_GLASS, MACHINE_CASING_FUSION_GLASS_YELLOW, MACHINE_CASING_FUSION_2,MACHINE_CASING_MAGIC,MACHINE_CASING_MAGIC_ACTIVE,MACHINE_CASING_MAGIC_FRONT,MACHINE_CASING_MAGIC_FRONT_ACTIVE,MACHINE_CASING_DRAGONEGG
 		, MACHINE_CASING_SOLID_STEEL, MACHINE_CASING_FROST_PROOF, MACHINE_CASING_PUMP, MACHINE_CASING_MOTOR, MACHINE_CASING_PIPE_BRONZE, MACHINE_CASING_PIPE_STEEL, MACHINE_CASING_PIPE_TITANIUM, MACHINE_CASING_PIPE_TUNGSTENSTEEL, MACHINE_CASING_GEARBOX_BRONZE, MACHINE_CASING_GEARBOX_STEEL, MACHINE_CASING_GEARBOX_TITANIUM, MACHINE_CASING_GEARBOX_TUNGSTENSTEEL, MACHINE_CASING_DATA_DRIVE, MACHINE_CASING_CONTAINMENT_FIELD, MACHINE_CASING_ASSEMBLER, MACHINE_CASING_PROCESSOR
 		, MACHINE_CASING_STRIPES_A, MACHINE_CASING_STRIPES_B, MACHINE_CASING_RADIOACTIVEHAZARD, MACHINE_CASING_BIOHAZARD, MACHINE_CASING_EXPLOSIONHAZARD, MACHINE_CASING_FIREHAZARD, MACHINE_CASING_ACIDHAZARD, MACHINE_CASING_MAGICHAZARD, MACHINE_CASING_FROSTHAZARD, MACHINE_CASING_NOISEHAZARD, MACHINE_CASING_GRATE, MACHINE_CASING_VENT, MACHINE_CASING_RADIATIONPROOF, MACHINE_CASING_FIREBOX_BRONZE, MACHINE_CASING_FIREBOX_STEEL, MACHINE_CASING_FIREBOX_TUNGSTENSTEEL
 		, BOILER_SOLAR, BOILER_FRONT, BOILER_FRONT_ACTIVE, BOILER_LAVA_FRONT, BOILER_LAVA_FRONT_ACTIVE
@@ -320,7 +320,7 @@ public class Textures {
 		, KNIFE, BUTCHERYKNIFE, SICKLE
 		, SCOOP, GRAFTER
 		, PLUNGER, ROLLING_PIN
-		, HANDLE_SWORD, HANDLE_FILE, HANDLE_SAW, HANDLE_SCREWDRIVER, HANDLE_BUZZSAW, HANDLE_ELECTRIC_SCREWDRIVER
+		, HANDLE_SWORD, HANDLE_FILE, HANDLE_SAW, HANDLE_SCREWDRIVER, HANDLE_BUZZSAW, HANDLE_ELECTRIC_SCREWDRIVER, HANDLE_SOLDERING
 		, POWER_UNIT_LV, POWER_UNIT_MV, POWER_UNIT_HV
 		, DURABILITY_BAR_0, DURABILITY_BAR_1, DURABILITY_BAR_2, DURABILITY_BAR_3, DURABILITY_BAR_4, DURABILITY_BAR_5, DURABILITY_BAR_6, DURABILITY_BAR_7, DURABILITY_BAR_8
 		, ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3, ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6, ENERGY_BAR_7, ENERGY_BAR_8

main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java

@@ -58,6 +58,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
 				} else {
 					GT_OreDictUnificator.registerOre(tPrefix.get(tMaterial), tStack);
 				}
+				if((tPrefix==OrePrefixes.stick||tPrefix==OrePrefixes.wireFine)&&(tMaterial==Materials.Lead||tMaterial==Materials.Tin||tMaterial==Materials.SolderingAlloy)){GregTech_API.sSolderingMetalList.add(tStack);}
 			}
 		}
 	}

main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java

@@ -1,6 +1,8 @@
 package gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.V;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.ConfigCategories;
 import gregtech.api.gui.GT_Container_MultiMachine;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -25,6 +27,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
 	public int mPollution = 0, mProgresstime = 0, mMaxProgresstime = 0, mEUt = 0, mEfficiencyIncrease = 0, mUpdate = 0, mStartUpCheck = 100, mRuntime = 0, mEfficiency = 0;
 	public ItemStack[] mOutputItems = null;
 	public FluidStack[] mOutputFluids = null;
+	public static boolean disableMaintenance;
 	
 	public ArrayList<GT_MetaTileEntity_Hatch_Input> mInputHatches = new ArrayList<GT_MetaTileEntity_Hatch_Input>();
 	public ArrayList<GT_MetaTileEntity_Hatch_Output> mOutputHatches = new ArrayList<GT_MetaTileEntity_Hatch_Output>();
@@ -37,10 +40,12 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
 	
 	public GT_MetaTileEntity_MultiBlockBase(int aID, String aName, String aNameRegional) {
 		super(aID, aName, aNameRegional, 2);
+		this.disableMaintenance = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "MultiBlockMachines.disableMaintenance", false);
 	}
 	
 	public GT_MetaTileEntity_MultiBlockBase(String aName) {
 		super(aName, 2);
+		this.disableMaintenance = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "MultiBlockMachines.disableMaintenance", false);
 	}
 	
 	@Override
@@ -145,12 +150,20 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
 				if (mMachine) {
 					for (GT_MetaTileEntity_Hatch_Maintenance tHatch : mMaintenanceHatches) {
 						if (isValidMetaTileEntity(tHatch)) {
+							if(!this.disableMaintenance){
 							if (tHatch.mWrench) mWrench = true;
 							if (tHatch.mScrewdriver) mScrewdriver = true;
 							if (tHatch.mSoftHammer) mSoftHammer = true;
 							if (tHatch.mHardHammer) mHardHammer = true;
 							if (tHatch.mSolderingTool) mSolderingTool = true;
-							if (tHatch.mCrowbar) mCrowbar = true;
+							if (tHatch.mCrowbar) mCrowbar = true;}else{
+									mWrench = true;
+									mScrewdriver = true;
+									mSoftHammer = true;
+									mHardHammer = true;
+									mSolderingTool = true;
+									mCrowbar = true;
+							}
 							
 							tHatch.mWrench = false;
 							tHatch.mScrewdriver = false;

main/java/gregtech/api/util/GT_ModHandler.java

@@ -37,6 +37,7 @@ import net.minecraft.tileentity.TileEntityFurnace;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 import cpw.mods.fml.common.event.FMLInterModComms;
@@ -1457,7 +1458,7 @@ public class GT_ModHandler {
 	 * Uses an Item. Tries to discharge in case of Electric Items
 	 */
 	public static boolean damageOrDechargeItem(ItemStack aStack, int aDamage, int aDecharge, EntityLivingBase aPlayer) {
-		if (GT_Utility.isStackInvalid(aStack) || (aStack.getMaxStackSize() <= 1 && aStack.stackSize > 1)) return F;
+		if (GT_Utility.isStackInvalid(aStack) || (aStack.getMaxStackSize() <= 1 && aStack.stackSize > 1)) return F;	
 		if (aPlayer != null && aPlayer instanceof EntityPlayer && ((EntityPlayer)aPlayer).capabilities.isCreativeMode) return T;
 		if (aStack.getItem() instanceof IDamagableItem) {
 			return ((IDamagableItem)aStack.getItem()).doDamageToItem(aStack, aDamage);
@@ -1500,13 +1501,10 @@ public class GT_ModHandler {
 				if (tPlayer.capabilities.isCreativeMode) return T;
 				for (int i = 0; i < tPlayer.inventory.mainInventory.length; i++) {
 					if (GT_Utility.isStackInList(tPlayer.inventory.mainInventory[i], GregTech_API.sSolderingMetalList)) {
-						if (damageOrDechargeItem(aStack, 1, 1000, tPlayer)) {
-							if (tPlayer.inventory.mainInventory[i].getItemDamage() >= tPlayer.inventory.mainInventory[i].getMaxDamage()) tPlayer.inventory.mainInventory[i] = null;
-						    if (damageOrDechargeItem(tPlayer.inventory.mainInventory[i], 1, 1000, tPlayer)) {
-								if (tPlayer.inventory.mainInventory[i].getItemDamage() >= tPlayer.inventory.mainInventory[i].getMaxDamage()) tPlayer.inventory.mainInventory[i] = null;
-							    if (tPlayer.inventoryContainer != null) tPlayer.inventoryContainer.detectAndSendChanges();
-								return T;
-							}
+						tPlayer.inventory.mainInventory[i].stackSize--;
+						if (tPlayer.inventoryContainer != null) tPlayer.inventoryContainer.detectAndSendChanges();
+						if (canUseElectricItem(aStack, 10000)) {
+							return GT_ModHandler.useElectricItem(aStack, 10000, (EntityPlayer)aPlayer);
 						}
 					}
 				}

main/java/gregtech/common/GT_Client.java

@@ -192,6 +192,16 @@ label0:
                 e.printStackTrace(GT_Log.err);
             }
 
+        
+//        super.onPostLoad();
+//        /*     */     
+//        /*  83 */     for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
+//        /*     */       try {
+//        /*  85 */         for (; i < GregTech_API.METATILEENTITIES.length; i++) if (GregTech_API.METATILEENTITIES[i] != null) GregTech_API.METATILEENTITIES[i].getStackForm(1L).getTooltip(null, true);
+//        /*     */       } catch (Throwable e) {
+//        /*  87 */         e.printStackTrace(GT_Log.err);
+//        /*     */       }
+//        /*     */     }
     }
 
   public void run()

main/java/gregtech/common/GT_Proxy.java

@@ -2693,11 +2693,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
 	}
 
 	public Fluid addAutogeneratedMoltenFluid(Materials aMaterial) {
-		return addFluid("molten." + aMaterial.name().toLowerCase(),
-				"molten.autogenerated",
-				"Molten " + aMaterial.mDefaultLocalName, aMaterial,
-				aMaterial.mMoltenRGBa, 4, aMaterial.mMeltingPoint <= 0 ? 1000
-						: aMaterial.mMeltingPoint, null, null, 0);
+		return addFluid("molten." + aMaterial.name().toLowerCase(),"molten.autogenerated","Molten " + aMaterial.mDefaultLocalName, aMaterial,aMaterial.mMoltenRGBa, 4, aMaterial.mMeltingPoint <= 0 ? 1000: aMaterial.mMeltingPoint, null, null, 0);
+	}
+	
+	public Fluid addAutogeneratedPlasmaFluid(Materials aMaterial) {
+		return addFluid("plasma." + aMaterial.name().toLowerCase(),"plasma.autogenerated",aMaterial.mDefaultLocalName+" Plasma", aMaterial,aMaterial.mMoltenRGBa, 3, 10000, GT_OreDictUnificator.get(OrePrefixes.cellPlasma, aMaterial, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
 	}
 
 	public Fluid addFluid(String aName, String aLocalized, Materials aMaterial,
@@ -2715,9 +2715,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
 	}
 
 	public Fluid addFluid(String aName, String aTexture, String aLocalized,
-			Materials aMaterial, short[] aRGBa, int aState, int aTemperatureK,
-			ItemStack aFullContainer, ItemStack aEmptyContainer,
-			int aFluidAmount) {
+			Materials aMaterial, short[] aRGBa, int aState, int aTemperatureK,ItemStack aFullContainer, ItemStack aEmptyContainer,int aFluidAmount) {
 		aName = aName.toLowerCase();
 		Fluid rFluid = new GT_Fluid(aName, aTexture, aRGBa != null ? aRGBa
 				: Dyes._NULL.getRGBA());
@@ -2748,7 +2746,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
 		} else {
 			rFluid = FluidRegistry.getFluid(aName);
 		}
-		if (rFluid.getTemperature() == 295) {
+		if (rFluid.getTemperature() == new Fluid("test").getTemperature()) {
 			rFluid.setTemperature(aTemperatureK);
 		}
 		if (aMaterial != null) {
@@ -2769,14 +2767,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
 				aMaterial.mStandardMoltenFluid = rFluid;
 			}
 		}
-		if ((aFullContainer != null)
-				&& (aEmptyContainer != null)
-				&& (!FluidContainerRegistry.registerFluidContainer(
-						new FluidStack(rFluid, aFluidAmount), aFullContainer,
-						aEmptyContainer))) {
-			GT_Values.RA.addFluidCannerRecipe(aFullContainer,
-					GT_Utility.getContainerItem(aFullContainer, false), null,
-					new FluidStack(rFluid, aFluidAmount));
+		if ((aFullContainer != null) && (aEmptyContainer != null) && (!FluidContainerRegistry.registerFluidContainer( new FluidStack(rFluid, aFluidAmount), aFullContainer,	aEmptyContainer))) {
+			GT_Values.RA.addFluidCannerRecipe(aFullContainer, GT_Utility.getContainerItem(aFullContainer, false), null,	new FluidStack(rFluid, aFluidAmount));
 		}
 		return rFluid;
 	}

main/java/gregtech/common/covers/GT_Cover_ControlsWork.java

@@ -12,21 +12,16 @@
 /* 12:   */ {
 /* 13:   */   public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer)
 /* 14:   */   {
-/* 15:13 */     if ((aTileEntity instanceof IMachineProgress))
-/* 16:   */     {
-/* 17:14 */       if ((aInputRedstone > 0 ? 1 : 0) == (aCoverVariable == 0 ? 1 : 0)) {
-/* 18:14 */         if (aCoverVariable != 2)
-/* 19:   */         {
-/* 20:14 */           ((IMachineProgress)aTileEntity).enableWorking();
-/* 21:   */           //break label59;
-/* 22:   */         }
-/* 23:   */       }
-/* 24:14 */       ((IMachineProgress)aTileEntity).disableWorking();
-/* 25:   */       //label59:
-/* 26:15 */       ((IMachineProgress)aTileEntity).setWorkDataValue(aInputRedstone);
-/* 27:   */     }
-/* 28:17 */     return aCoverVariable;
-/* 29:   */   }
+    if(aTileEntity instanceof IMachineProgress)
+    {
+        if((aInputRedstone > 0) == (aCoverVariable == 0) && aCoverVariable != 2)
+            ((IMachineProgress)aTileEntity).enableWorking();
+        else
+            ((IMachineProgress)aTileEntity).disableWorking();
+        ((IMachineProgress)aTileEntity).setWorkDataValue(aInputRedstone);
+    }
+    return aCoverVariable;
+}
 /* 30:   */   
 /* 31:   */   public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
 /* 32:   */   {

main/java/gregtech/common/covers/GT_Cover_Shutter.java

@@ -1,6 +1,7 @@
 /*  1:   */ package gregtech.common.covers;
 /*  2:   */ 
 /*  3:   */ import gregtech.api.interfaces.tileentity.ICoverable;
+import gregtech.api.interfaces.tileentity.IMachineProgress;
 /*  4:   */ import gregtech.api.util.GT_CoverBehavior;
 /*  5:   */ import gregtech.api.util.GT_Utility;
 /*  6:   */ import net.minecraft.entity.player.EntityPlayer;
@@ -32,45 +33,45 @@
 /* 32:23 */     return aCoverVariable;
 /* 33:   */   }
 /* 34:   */   
-/* 35:   */   public boolean letsRedstoneGoIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
-/* 36:   */   {
-/* 37:28 */     return aCoverVariable % 2 == 0;
-/* 38:   */   }
-/* 39:   */   
-/* 40:   */   public boolean letsRedstoneGoOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
-/* 41:   */   {
-/* 42:33 */     return aCoverVariable % 2 == 0;
-/* 43:   */   }
-/* 44:   */   
-/* 45:   */   public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
-/* 46:   */   {
-/* 47:38 */     return aCoverVariable % 2 == 0;
-/* 48:   */   }
-/* 49:   */   
-/* 50:   */   public boolean letsEnergyOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
-/* 51:   */   {
-/* 52:43 */     return aCoverVariable % 2 == 0;
-/* 53:   */   }
-/* 54:   */   
-/* 55:   */   public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity)
-/* 56:   */   {
-/* 57:48 */     return aCoverVariable % 2 == 0;
-/* 58:   */   }
-/* 59:   */   
-/* 60:   */   public boolean letsFluidOut(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity)
-/* 61:   */   {
-/* 62:53 */     return aCoverVariable % 2 == 0;
-/* 63:   */   }
-/* 64:   */   
-/* 65:   */   public boolean letsItemsIn(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity)
-/* 66:   */   {
-/* 67:58 */     return aCoverVariable % 2 == 0;
-/* 68:   */   }
-/* 69:   */   
-/* 70:   */   public boolean letsItemsOut(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity)
-/* 71:   */   {
-/* 72:63 */     return aCoverVariable % 2 == 0;
-/* 73:   */   }
+/* 35:   */  public boolean letsRedstoneGoIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
+{
+    return aCoverVariable >= 2 ? aCoverVariable == 3 : (aTileEntity instanceof IMachineProgress) ? ((IMachineProgress)aTileEntity).isAllowedToWork() ? aCoverVariable % 2 == 0 : aCoverVariable % 2 != 0 : true;
+}
+
+public boolean letsRedstoneGoOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
+{
+    return aCoverVariable >= 2 ? aCoverVariable == 2 : (aTileEntity instanceof IMachineProgress) ? ((IMachineProgress)aTileEntity).isAllowedToWork() ? aCoverVariable % 2 == 0 : aCoverVariable % 2 != 0 : true;
+}
+
+public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
+{
+    return aCoverVariable >= 2 ? aCoverVariable == 3 : (aTileEntity instanceof IMachineProgress) ? ((IMachineProgress)aTileEntity).isAllowedToWork() ? aCoverVariable % 2 == 0 : aCoverVariable % 2 != 0 : true;
+}
+
+public boolean letsEnergyOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
+{
+    return aCoverVariable >= 2 ? aCoverVariable == 2 : (aTileEntity instanceof IMachineProgress) ? ((IMachineProgress)aTileEntity).isAllowedToWork() ? aCoverVariable % 2 == 0 : aCoverVariable % 2 != 0 : true;
+}
+
+public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity)
+{
+    return aCoverVariable >= 2 ? aCoverVariable == 3 : (aTileEntity instanceof IMachineProgress) ? ((IMachineProgress)aTileEntity).isAllowedToWork() ? aCoverVariable % 2 == 0 : aCoverVariable % 2 != 0 : true;
+}
+
+public boolean letsFluidOut(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity)
+{
+    return aCoverVariable >= 2 ? aCoverVariable == 2 : (aTileEntity instanceof IMachineProgress) ? ((IMachineProgress)aTileEntity).isAllowedToWork() ? aCoverVariable % 2 == 0 : aCoverVariable % 2 != 0 : true;
+}
+
+public boolean letsItemsIn(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity)
+{
+    return aCoverVariable >= 2 ? aCoverVariable == 3 : (aTileEntity instanceof IMachineProgress) ? ((IMachineProgress)aTileEntity).isAllowedToWork() ? aCoverVariable % 2 == 0 : aCoverVariable % 2 != 0 : true;
+}
+
+public boolean letsItemsOut(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity)
+{
+    return aCoverVariable >= 2 ? aCoverVariable == 2 : (aTileEntity instanceof IMachineProgress) ? ((IMachineProgress)aTileEntity).isAllowedToWork() ? aCoverVariable % 2 == 0 : aCoverVariable % 2 != 0 : true;
+}
 /* 74:   */   
 /* 75:   */   public boolean alwaysLookConnected(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity)
 /* 76:   */   {

main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java

@@ -41,6 +41,7 @@ import gregtech.api.enums.ConfigCategories;
 /* 40:   */ import gregtech.common.tools.GT_Tool_Sense;
 /* 41:   */ import gregtech.common.tools.GT_Tool_Shovel;
 /* 42:   */ import gregtech.common.tools.GT_Tool_SoftHammer;
+import gregtech.common.tools.GT_Tool_Soldering_Iron;
 /* 43:   */ import gregtech.common.tools.GT_Tool_Sword;
 /* 44:   */ import gregtech.common.tools.GT_Tool_UniversalSpade;
 /* 45:   */ import gregtech.common.tools.GT_Tool_WireCutter;
@@ -92,6 +93,7 @@ import gregtech.api.enums.ConfigCategories;
 /* 91:   */   public static final short JACKHAMMER = 130;
 /* 92:   */   public static final short BUZZSAW = 140;
 /* 93:   */   public static final short SCREWDRIVER_LV = 150;
+			  public static final short SOLDERING_IRON_LV = 160;
 /* 94:   */   
 /* 95:   */   public GT_MetaGenerated_Tool_01()
 /* 96:   */   {
@@ -134,7 +136,8 @@ import gregtech.api.enums.ConfigCategories;
 /* =3:56 */     addTool(130, "JackHammer (HV)", "Breaks Rocks into pieces", new GT_Tool_JackHammer(), new Object[] { ToolDictNames.craftingToolJackHammer, new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 2L) });
 /* =4:57 */     addTool(140, "Buzzsaw (LV)", "Not suitable for harvesting Blocks", new GT_Tool_BuzzSaw(), new Object[] { ToolDictNames.craftingToolSaw, new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L) });
 /* =5:58 */     GregTech_API.registerTool(addTool(150, "Screwdriver (LV)", "Adjusts Covers and Machines", new GT_Tool_Screwdriver_LV(), new Object[] { ToolDictNames.craftingToolScrewdriver, new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }), GregTech_API.sScrewdriverList);
-/* =6:   */     
+/* =6:   */     GregTech_API.registerTool(addTool(SOLDERING_IRON_LV, "Soldering Iron (LV)", "Fixes burned out Circuits. Needs soldering materials in inventory", new GT_Tool_Soldering_Iron(), new Object[] { ToolDictNames.craftingToolSolderingIron, new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }),  GregTech_API.sSolderingToolList);
+
 /* =7:60 */     GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(24, 1, Materials.Flint, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", Character.valueOf('I'), new ItemStack(Items.flint, 1), Character.valueOf('S'), OrePrefixes.stone });
 /* =8:61 */     GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(24, 1, Materials.Bronze, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", Character.valueOf('I'), OrePrefixes.ingot.get(Materials.Bronze), Character.valueOf('S'), OrePrefixes.stone });
 /* =9:62 */     GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(24, 1, Materials.Iron, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", Character.valueOf('I'), OrePrefixes.ingot.get(Materials.Iron), Character.valueOf('S'), OrePrefixes.stone });

main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java

@@ -35,14 +35,8 @@
 /* 35:   */   
 /* 36:   */   public void onTick(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock)
 /* 37:   */   {
-///* 38:28 */     if (getStrongestRedstone(aRedstoneCircuitBlock) == aCircuitData[0]) {
-///* 39:28 */       if (getStrongestRedstone(aRedstoneCircuitBlock) != (aCircuitData[1] == 0 ? aRedstoneCircuitBlock : aCircuitData[0]))
-///* 40:   */       {
-///* 41:28 */         tmpTernaryOp = 15;
-///* 42:   */         break label36;
-///* 43:   */       }
-///* 44:   */     }
-/* 45:   */   }
+    aRedstoneCircuitBlock.setRedstone(((byte)((aCircuitData[1] != 0 ? getStrongestRedstone(aRedstoneCircuitBlock) == aCircuitData[0] : getStrongestRedstone(aRedstoneCircuitBlock) != aCircuitData[0]) ? 0 : 15)), aRedstoneCircuitBlock.getOutputFacing());
+}
 /* 46:   */   
 /* 47:   */   public String getName()
 /* 48:   */   {

main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java

@@ -42,7 +42,8 @@ public abstract class GT_MetaTileEntity_Boiler
   
   public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone)
   {
-	  ITexture[] tmp = mTextures[(aSide==aFacing?(aActive?4:3):aSide==GT_Utility.getOppositeSide(aFacing)?2:aSide==0?0:aSide==1?1:2)][aColorIndex+1];
+	  ITexture[] tmp = mTextures[aSide >= 2 ? aSide != aFacing ? 2 : ((byte)(aActive ? 4 : 3)) : aSide][aColorIndex + 1];
+			  //mTextures[(aSide==aFacing?(aActive?4:3):aSide==GT_Utility.getOppositeSide(aFacing)?2:aSide==0?0:aSide==1?1:2)][aColorIndex+1];
 	  if(aSide!=aFacing&&tmp.length==2){
 			  tmp = new ITexture[]{tmp[0]};
 	  }

main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java

@@ -8,6 +8,7 @@ import gregtech.api.enums.Textures;
 /*   7:    */ import gregtech.api.metatileentity.MetaTileEntity;
 /*   8:    */ import gregtech.api.objects.GT_RenderedTexture;
 /*   9:    */ import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
 /*  10:    */ import gregtech.common.gui.GT_Container_Boiler;
 /*  11:    */ import gregtech.common.gui.GT_GUIContainer_Boiler;
 /*  12:    */ import net.minecraft.entity.player.InventoryPlayer;
@@ -37,18 +38,18 @@ import gregtech.api.enums.Textures;
 /*  36:    */     {ITexture[] tmp0 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
 /*  37: 30 */       rTextures[0][(i + 1)] = tmp0;
 /*  38: 31 */       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;
+					rTextures[1][(i + 1)] = tmp1;
 /*  39: 32 */       ITexture[] tmp2 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
-rTextures[2][(i + 1)] = tmp2;
+					rTextures[2][(i + 1)] = tmp2;
 /*  40: 33 */       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;
+					rTextures[3][(i + 1)] = tmp3;
 /*  41:    */     }
 /*  42: 35 */     return rTextures;
 /*  43:    */   }
 /*  44:    */   
 /*  45:    */   public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone)
 /*  46:    */   {
-/*  47: 40 */     return this.mTextures[2][(aColorIndex + 1)];
+					return mTextures[aSide >= 2 ? ((byte)(aSide != aFacing ? 2 : 3)) : aSide][aColorIndex + 1];
 /*  48:    */   }
 /*  49:    */   
 /*  50:    */   public int maxProgresstime()

main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java

@@ -87,26 +87,26 @@ public void onConfigLoad()
 /* 73:   */   
 /* 74:   */   public ITexture[] getFrontActive(byte aColor)
 /* 75:   */   {
-/* 76:47 */     return new ITexture[] { super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };
+/* 76:47 */     return new ITexture[] { super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };
 /* 77:   */   }
 /* 78:   */   
 /* 79:   */   public ITexture[] getBackActive(byte aColor)
 /* 80:   */   {
-/* 81:48 */     return new ITexture[] { super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT) };
+/* 81:48 */     return new ITexture[] { super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT_ACTIVE) };
 /* 82:   */   }
 /* 83:   */   
 /* 84:   */   public ITexture[] getBottomActive(byte aColor)
 /* 85:   */   {
-/* 86:49 */     return new ITexture[] { super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) };
+/* 86:49 */     return new ITexture[] { super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) };
 /* 87:   */   }
 /* 88:   */   
 /* 89:   */   public ITexture[] getTopActive(byte aColor)
 /* 90:   */   {
-/* 91:50 */     return new ITexture[] { super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) };
+/* 91:50 */     return new ITexture[] { super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) };
 /* 92:   */   }
 /* 93:   */   
 /* 94:   */   public ITexture[] getSidesActive(byte aColor)
 /* 95:   */   {
-/* 96:51 */     return new ITexture[] { super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) };
+/* 96:51 */     return new ITexture[] { super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) };
 /* 97:   */   }
 /* 98:   */ }

main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java

@@ -0,0 +1,181 @@
+package gregtech.common.tileentities.generators;
+
+/*  3:   */ import java.util.ArrayList;
+
+import thaumcraft.api.aspects.Aspect;
+import thaumcraft.api.visnet.VisNetHandler;
+import cpw.mods.fml.common.Loader;
+import net.minecraft.block.Block;
+import net.minecraft.entity.item.EntityEnderCrystal;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.ConfigCategories;
+import gregtech.api.enums.Textures;
+import gregtech.api.enums.Textures.BlockIcons;
+/*  4:   */ import gregtech.api.interfaces.ITexture;
+/*  5:   */ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+/*  6:   */ import gregtech.api.metatileentity.MetaTileEntity;
+/*  7:   */ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
+/*  8:   */ import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+/*  9:   */ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+/* 10:   */ 
+/* 11:   */ public class GT_MetaTileEntity_MagicalEnergyAbsorber
+/* 12:   */   extends GT_MetaTileEntity_BasicGenerator
+/* 13:   */ {
+
+				  public int mEfficiency;
+				  public static boolean sAllowMultipleEggs = true;
+				  public static GT_MetaTileEntity_MagicalEnergyAbsorber mActiveSiphon = null;
+				  public static int sEnergyPerEnderCrystal = 32;
+				  public static int sEnergyFromVis = 12800;
+				  public static final ArrayList<EntityEnderCrystal> sUsedDragonCrystalList = new ArrayList();
+				  public EntityEnderCrystal mTargetedCrystal;
+				  public static int sDragonEggEnergyPerTick = 128;
+				  public static boolean isThaumcraftLoaded;
+				  
+/* 14:   */   public boolean isOutputFacing(byte aSide)
+/* 15:   */   {
+/* 16:12 */     return aSide == getBaseMetaTileEntity().getFrontFacing();
+/* 17:   */   }
+/* 18:   */   
+/* 19:   */   public GT_MetaTileEntity_MagicalEnergyAbsorber(int aID, String aName, String aNameRegional, int aTier)
+/* 20:   */   {
+/* 21:15 */     super(aID, aName, aNameRegional, aTier, "Feasts on magic close to it", new ITexture[0]);
+				onConfigLoad();
+/* 22:   */   }
+/* 23:   */   
+/* 24:   */   public GT_MetaTileEntity_MagicalEnergyAbsorber(String aName, int aTier, String aDescription, ITexture[][][] aTextures)
+/* 25:   */   {
+/* 26:19 */     super(aName, aTier, aDescription, aTextures);
+				onConfigLoad();
+/* 27:   */   }
+/* 28:   */   
+/* 29:   */   public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
+/* 30:   */   {
+/* 31:24 */     return new GT_MetaTileEntity_MagicalEnergyAbsorber(this.mName, this.mTier, this.mDescription, this.mTextures);
+/* 32:   */   }
+/* 33:   */   
+/* 34:   */   public GT_Recipe.GT_Recipe_Map getRecipes()
+/* 35:   */   {
+/* 36:29 */     return GT_Recipe.GT_Recipe_Map.sMagicFuels;
+/* 37:   */   }
+/* 38:   */   
+/* 39:   */   public int getCapacity()
+/* 40:   */   {
+/* 41:34 */     return 16000;
+/* 42:   */   }
+
+				public void onConfigLoad()
+/* 39:   */   {
+				this.mEfficiency =GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "MagicEnergyAbsorber.efficiency.tier."+this.mTier, 100-this.mTier*10);
+			    this.sAllowMultipleEggs = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "MagicEnergyAbsorber.AllowMultipleEggs", false);
+			    this.sEnergyPerEnderCrystal = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "MagicEnergyAbsorber.EnergyPerTick.EnderCrystal", 32);
+			    this.sEnergyFromVis = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "MagicEnergyAbsorber.EnergyPerVisDivisor", 2500);
+			    this.sDragonEggEnergyPerTick = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "MagicEnergyAbsorber.EnergyPerTick", 2048);
+			    this.isThaumcraftLoaded = Loader.isModLoaded("Thaumcraft");
+				}
+				
+			    @Override
+			    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+			    	if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && aBaseMetaTileEntity.getUniversalEnergyStored() < maxEUOutput() + aBaseMetaTileEntity.getEUCapacity()) {
+			    		//Dragon Egg
+			    		if(hasEgg()&&aTick%10==0){
+			    			getBaseMetaTileEntity().increaseStoredEnergyUnits(sDragonEggEnergyPerTick*getEfficiency()/10, false);
+			    			if ((mActiveSiphon != this) && (!sAllowMultipleEggs)) {
+			    		          if ((mActiveSiphon == null) || (mActiveSiphon.getBaseMetaTileEntity() == null) || (mActiveSiphon.getBaseMetaTileEntity().isInvalidTileEntity()) || (!mActiveSiphon.hasEgg())) {
+			    		            mActiveSiphon = this;
+			    		          } else {
+			    		            getBaseMetaTileEntity().doExplosion(Integer.MAX_VALUE);
+			    		          }
+			    		     }
+			    		}
+			    		//Energyzed node
+			    		if(isThaumcraftLoaded){
+			    			try{
+			    				int fire = VisNetHandler.drainVis(this.getBaseMetaTileEntity().getWorld(), this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), Aspect.FIRE, 1000);
+			    				int earth = VisNetHandler.drainVis(this.getBaseMetaTileEntity().getWorld(), this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), Aspect.EARTH, 1000);
+			    				int air = VisNetHandler.drainVis(this.getBaseMetaTileEntity().getWorld(), this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), Aspect.AIR, 1000);
+			    				int destruction =  VisNetHandler.drainVis(this.getBaseMetaTileEntity().getWorld(), this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), Aspect.ENTROPY, 1000);
+			    				int order = VisNetHandler.drainVis(this.getBaseMetaTileEntity().getWorld(), this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), Aspect.ORDER, 1000);
+			    				int water =  VisNetHandler.drainVis(this.getBaseMetaTileEntity().getWorld(), this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), Aspect.WATER, 1000);
+			    				int visEU = (int) (Math.pow(fire, 4)+Math.pow(earth, 4)+Math.pow(air, 4)+Math.pow(destruction, 4)+Math.pow(order, 4)+Math.pow(water, 4));
+			    				getBaseMetaTileEntity().increaseStoredEnergyUnits(Math.min(maxEUOutput(), visEU*getEfficiency()/this.sEnergyFromVis), false);
+			    			}catch (Throwable e){}
+			    		}
+			    		//EnderCrystal
+			    		
+			    		//GC Creeper Egg
+			    		
+					}
+			    }
+			    
+			    public void inValidate()
+			    {
+			      if (mActiveSiphon == this) {
+			        mActiveSiphon = null;
+			      }
+			    }
+			    
+			    public boolean hasEgg()
+			    {
+			      return Blocks.dragon_egg == getBaseMetaTileEntity().getBlockOffset(0, 1, 0);
+			    }
+/* 43:   */   
+/* 44:   */   public int getEfficiency()
+/* 45:   */   {
+/* 46:39 */     return this.mEfficiency;
+/* 47:   */   }
+/* 48:   */   
+/* 49:   */   public ITexture[] getFront(byte aColor)
+/* 50:   */   {
+/* 51:42 */     return new ITexture[] { super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };
+/* 52:   */   }
+/* 53:   */   
+/* 54:   */   public ITexture[] getBack(byte aColor)
+/* 55:   */   {
+/* 56:43 */     return new ITexture[] { super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT) };
+/* 57:   */   }
+/* 58:   */   
+/* 59:   */   public ITexture[] getBottom(byte aColor)
+/* 60:   */   {
+/* 61:44 */     return new ITexture[] { super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) };
+/* 62:   */   }
+/* 63:   */   
+/* 64:   */   public ITexture[] getTop(byte aColor)
+/* 65:   */   {
+/* 66:45 */     return new ITexture[] { super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG) };
+/* 67:   */   }
+/* 68:   */   
+/* 69:   */   public ITexture[] getSides(byte aColor)
+/* 70:   */   {
+/* 71:46 */     return new ITexture[] { super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC) };
+/* 72:   */   }
+/* 73:   */   
+/* 74:   */   public ITexture[] getFrontActive(byte aColor)
+/* 75:   */   {
+/* 76:47 */     return new ITexture[] { super.getFrontActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE), Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] };
+/* 77:   */   }
+/* 78:   */   
+/* 79:   */   public ITexture[] getBackActive(byte aColor)
+/* 80:   */   {
+/* 81:48 */     return new ITexture[] { super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT_ACTIVE) };
+/* 82:   */   }
+/* 83:   */   
+/* 84:   */   public ITexture[] getBottomActive(byte aColor)
+/* 85:   */   {
+/* 86:49 */     return new ITexture[] { super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) };
+/* 87:   */   }
+/* 88:   */   
+/* 89:   */   public ITexture[] getTopActive(byte aColor)
+/* 90:   */   {
+/* 91:50 */     return new ITexture[] { super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG) };
+/* 92:   */   }
+/* 93:   */   
+/* 94:   */   public ITexture[] getSidesActive(byte aColor)
+/* 95:   */   {
+/* 96:51 */     return new ITexture[] { super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE) };
+/* 97:   */   }
+/* 98:   */ }

main/java/gregtech/common/tools/GT_Tool_Crowbar.java

@@ -111,8 +111,7 @@ import gregtech.api.enums.Textures;
 /* 108:    */     {
 /* 109: 99 */       for (Iterator i$ = GT_MetaGenerated_Tool_01.INSTANCE.mToolStats.values().iterator(); i$.hasNext(); i$.next())
 /* 110:    */       {
-/* 111: 99 */         IToolStats tStat = (IToolStats)i$;
-/* 112: 99 */         if (((tStat instanceof GT_Tool_Crowbar)) || (!tStat.isMinableBlock(aBlock, aMetaData))) {}
+/* 112: 99 */         if (((i$ instanceof GT_Tool_Crowbar)) || (!((IToolStats)i$).isMinableBlock(aBlock, aMetaData))) {return false;}
 /* 113:    */       }
 /* 114:100 */       return true;
 /* 115:    */     }

main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java

@@ -0,0 +1,138 @@
+package gregtech.common.tools;
+
+import java.util.Arrays;
+import java.util.List;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.common.items.behaviors.Behaviour_Screwdriver;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.monster.EntityCaveSpider;
+import net.minecraft.entity.monster.EntitySpider;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+
+public class GT_Tool_Soldering_Iron extends GT_Tool{
+	/*  27: 26 */   public static final List<String> mEffectiveList = Arrays.asList(new String[] { EntityCaveSpider.class.getName(), EntitySpider.class.getName(), "EntityTFHedgeSpider", "EntityTFKingSpider", "EntityTFSwarmSpider", "EntityTFTowerBroodling" });
+	/*  28:    */   
+	/*  29:    */   public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer)
+	/*  30:    */   {
+	/*  31: 37 */     String tName = aEntity.getClass().getName();
+	/*  32: 38 */     tName = tName.substring(tName.lastIndexOf(".") + 1);
+	/*  33: 39 */     return mEffectiveList.contains(tName) ? aOriginalDamage * 2.0F : aOriginalDamage;
+	/*  34:    */   }
+	/*  35:    */   
+	/*  36:    */   public int getToolDamagePerBlockBreak()
+	/*  37:    */   {
+	/*  38: 44 */     return 1000;
+	/*  39:    */   }
+	/*  40:    */   
+	/*  41:    */   public int getToolDamagePerDropConversion()
+	/*  42:    */   {
+	/*  43: 49 */     return 500;
+	/*  44:    */   }
+	/*  45:    */   
+	/*  46:    */   public int getToolDamagePerContainerCraft()
+	/*  47:    */   {
+	/*  48: 54 */     return 1000;
+	/*  49:    */   }
+	/*  50:    */   
+	/*  51:    */   public int getToolDamagePerEntityAttack()
+	/*  52:    */   {
+	/*  53: 59 */     return 500;
+	/*  54:    */   }
+	/*  55:    */   
+	/*  56:    */   public int getBaseQuality()
+	/*  57:    */   {
+	/*  58: 64 */     return 0;
+	/*  59:    */   }
+	/*  60:    */   
+	/*  61:    */   public float getBaseDamage()
+	/*  62:    */   {
+	/*  63: 69 */     return 1.5F;
+	/*  64:    */   }
+	/*  65:    */   
+	/*  66:    */   public float getSpeedMultiplier()
+	/*  67:    */   {
+	/*  68: 74 */     return 1.0F;
+	/*  69:    */   }
+	/*  70:    */   
+	/*  71:    */   public float getMaxDurabilityMultiplier()
+	/*  72:    */   {
+	/*  73: 79 */     return 1.0F;
+	/*  74:    */   }
+	/*  75:    */   
+	/*  76:    */   public String getCraftingSound()
+	/*  77:    */   {
+	/*  78: 84 */     return (String)GregTech_API.sSoundList.get(Integer.valueOf(100));
+	/*  79:    */   }
+	/*  80:    */   
+	/*  81:    */   public String getEntityHitSound()
+	/*  82:    */   {
+	/*  83: 89 */     return null;
+	/*  84:    */   }
+	/*  85:    */   
+	/*  86:    */   public String getBreakingSound()
+	/*  87:    */   {
+	/*  88: 94 */     return (String)GregTech_API.sSoundList.get(Integer.valueOf(0));
+	/*  89:    */   }
+	/*  90:    */   
+	/*  91:    */   public String getMiningSound()
+	/*  92:    */   {
+	/*  93: 99 */     return null;
+	/*  94:    */   }
+	/*  95:    */   
+	/*  96:    */   public boolean canBlock()
+	/*  97:    */   {
+	/*  98:104 */     return true;
+	/*  99:    */   }
+	/* 100:    */   
+	/* 101:    */   public boolean isCrowbar()
+	/* 102:    */   {
+	/* 103:109 */     return false;
+	/* 104:    */   }
+	/* 105:    */   
+	/* 106:    */   public boolean isMiningTool()
+	/* 107:    */   {
+	/* 108:114 */     return false;
+	/* 109:    */   }
+	/* 110:    */   
+	/* 111:    */   public boolean isMinableBlock(Block aBlock, byte aMetaData)
+	/* 112:    */   {
+	/* 113:119 */     String tTool = aBlock.getHarvestTool(aMetaData);
+	/* 114:120 */     return ((tTool != null) && (tTool.equals("soldering_iron"))) || (aBlock.getMaterial() == Material.circuits);
+	/* 115:    */   }
+	/* 116:    */   
+	/* 117:    */   public ItemStack getBrokenItem(ItemStack aStack)
+	/* 118:    */   {
+	/* 119:125 */     return null;
+	/* 120:    */   }
+	/* 121:    */   
+	/* 122:    */   public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack)
+	/* 123:    */   {
+	/* 124:130 */     return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[49] : Textures.ItemIcons.HANDLE_SOLDERING;
+	/* 125:    */   }
+	/* 126:    */   
+	/* 127:    */   public short[] getRGBa(boolean aIsToolHead, ItemStack aStack)
+	/* 128:    */   {
+	/* 129:135 */     return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+	/* 130:    */   }
+	/* 131:    */   
+	/* 132:    */   public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID)
+	/* 133:    */   {
+	/* 134:140 */     aItem.addItemBehavior(aID, new Behaviour_Screwdriver(1, 200));
+	/* 135:    */   }
+	/* 136:    */   
+	/* 137:    */   public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity)
+	/* 138:    */   {
+	/* 139:145 */     return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got soldert! (by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + ")");
+	/* 140:    */   }
+	/* 141:    */ }

main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java

@@ -1,11 +1,15 @@
 /*    */ package gregtech.loaders.oreprocessing;
 /*    */ 
 /*    */ import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
 /*    */ import gregtech.api.enums.Materials;
 /*    */ import gregtech.api.enums.OrePrefixes;
 /*    */ import gregtech.api.enums.SubTag;
+import gregtech.api.util.GT_ModHandler;
 /*    */ import gregtech.api.util.GT_OreDictUnificator;
 /*    */ import gregtech.api.util.GT_Utility;
+import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import net.minecraft.block.material.Material;
 /*    */ import net.minecraft.item.ItemStack;
 /*    */ 
 /*    */ public class ProcessingBolt implements gregtech.api.interfaces.IOreRecipeRegistrator
@@ -17,8 +21,8 @@
 /*    */   
 /*    */   public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack)
 /*    */   {
-/* 20 */     if (!aMaterial.contains(SubTag.NO_WORKING)) GT_Values.RA.addLatheRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), null, (int)Math.max(aMaterial.getMass() / 8L, 1L), 4);
-/*    */   }
+/* 20 */    if (!aMaterial.contains(SubTag.NO_WORKING)) GT_Values.RA.addLatheRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), null, (int)Math.max(aMaterial.getMass() / 8L, 1L), 4);
+/*    */  	 }
 /*    */ }
 
 

main/java/gregtech/loaders/oreprocessing/ProcessingDust.java

@@ -36,25 +36,31 @@
 /*     */     }
 /*     */     
 /*     */     ItemStack tStack;
-/*  39 */     if ((null != (tStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L))) && (!aMaterial.contains(SubTag.NO_SMELTING))) {
-/*  40 */       if (aMaterial.mBlastFurnaceRequired) {
-/*  41 */         GT_ModHandler.removeFurnaceSmelting(aStack);
-/*  42 */         GT_Values.RA.addBlastRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), null, null, null, aMaterial.mBlastFurnaceTemp > 1750 ? GT_OreDictUnificator.get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tStack, 1L) : GT_Utility.copyAmount(1L, new Object[] { tStack }), null, (int)Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, 120, aMaterial.mBlastFurnaceTemp);
-/*  43 */         if (aMaterial.mBlastFurnaceTemp <= 1000) GT_ModHandler.addRCBlastFurnaceRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_Utility.copyAmount(1L, new Object[] { tStack }), aMaterial.mBlastFurnaceTemp);
-/*     */       } else {
-/*  45 */         GT_ModHandler.addSmeltingRecipe(aStack, tStack);
-/*     */       }
-/*     */     }
-/*  48 */     else if (!aMaterial.contains(SubTag.NO_WORKING)) {
-/*  49 */       if (OrePrefixes.block.isIgnored(aMaterial)) {
-/*  50 */         if ((null == GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) && (aMaterial != Materials.GraniteRed) && (aMaterial != Materials.GraniteBlack) && (aMaterial != Materials.Glass) && (aMaterial != Materials.Obsidian) && (aMaterial != Materials.Glowstone) && (aMaterial != Materials.Paper) && (aMaterial != Materials.Wood)) {
-/*  51 */           GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L));
-/*     */         }
-/*     */       }
-/*  54 */       else if (null == GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) {
-/*  55 */         GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(9L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L));
-/*     */       }
-/*     */     }
+if ((null != (tStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L))) && (!aMaterial.contains(SubTag.NO_SMELTING)))
+{
+  if (aMaterial.mBlastFurnaceRequired)
+  {
+    GT_ModHandler.removeFurnaceSmelting(aStack);
+    GT_Values.RA.addBlastRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), null, null, null, aMaterial.mBlastFurnaceTemp > 1750 ? GT_OreDictUnificator.get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tStack, 1L) : GT_Utility.copyAmount(1L, new Object[] { tStack }), null, (int)Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, 120, aMaterial.mBlastFurnaceTemp);
+    if (aMaterial.mBlastFurnaceTemp <= 1000) {
+      GT_ModHandler.addRCBlastFurnaceRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_Utility.copyAmount(1L, new Object[] { tStack }), aMaterial.mBlastFurnaceTemp);
+    }
+  }
+  else
+  {
+    GT_ModHandler.addSmeltingRecipe(aStack, tStack);
+  }
+}
+else if (!aMaterial.contains(SubTag.NO_WORKING))
+{
+  if ((!OrePrefixes.block.isIgnored(aMaterial)) && 
+    (null == GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))) {
+    GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(9L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L));
+  }
+  if (((OrePrefixes.block.isIgnored(aMaterial)) || (null == GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))) && (aMaterial != Materials.GraniteRed) && (aMaterial != Materials.GraniteBlack) && (aMaterial != Materials.Glass) && (aMaterial != Materials.Obsidian) && (aMaterial != Materials.Glowstone) && (aMaterial != Materials.Paper)) {
+    GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L));
+  }
+}
 /*     */     
 /*     */ 
 /*     */ 

main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java

@@ -1,6 +1,7 @@
 /*    */ package gregtech.loaders.oreprocessing;
 /*    */ 
 /*    */ import gregtech.api.enums.Dyes;
+import gregtech.api.enums.ItemList;
 /*    */ import gregtech.api.enums.Materials;
 /*    */ import gregtech.api.enums.OrePrefixes;
 /*    */ import gregtech.api.enums.SubTag;
@@ -34,6 +35,7 @@
 /* 34 */         GT_ModHandler.addCraftingRecipe(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(30, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PfP", "PdP", "STS", Character.valueOf('S'), OrePrefixes.stick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('T'), OrePrefixes.screw.get(aMaterial) });
 /* 35 */         GT_ModHandler.addCraftingRecipe(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(34, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "fPh", " S ", Character.valueOf('S'), OrePrefixes.stick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(aMaterial) });
 /* 36 */         GT_ModHandler.addCraftingRecipe(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(36, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PPf", "PP ", "Sh ", Character.valueOf('S'), OrePrefixes.stick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(aMaterial) });
+/*    */         GT_ModHandler.addCraftingRecipe(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(160, 1, aMaterial, Materials.Rubber, new long[] { 100000L, 32L, 1L, -1L }), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "LBf", "Sd ", "P  ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', OrePrefixes.plate.get(Materials.Rubber),'S',OrePrefixes.stick.get(Materials.Iron),'L',ItemList.Battery_RE_LV_Lithium.get(1L, new Object[0]) });
 /*    */       }
 /*    */     }
 /*    */   }

main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java

@@ -509,6 +509,8 @@ public class GT_CraftingRecipeLoader
     GT_ModHandler.removeRecipe(new ItemStack[] { tStack = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L), tStack, tStack, tStack, new ItemStack(Items.coal, 1, 1), tStack, tStack, tStack, tStack });
     GT_ModHandler.removeRecipe(new ItemStack[] { null, tStack = new ItemStack(Items.coal, 1), null, tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), tStack, null, tStack, null });
     
+    GT_ModHandler.removeFurnaceSmelting(new ItemStack(Blocks.hopper));
+    
     GT_Log.out.println("GT_Mod: Applying harder Recipes for several Blocks.");
     if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "blockbreaker", false)) {
       GT_ModHandler.addCraftingRecipe(GT_ModHandler.removeRecipe(new ItemStack[] { new ItemStack(Blocks.cobblestone, 1), new ItemStack(Items.iron_pickaxe, 1), new ItemStack(Blocks.cobblestone, 1), new ItemStack(Blocks.cobblestone, 1), new ItemStack(Blocks.piston, 1), new ItemStack(Blocks.cobblestone, 1), new ItemStack(Blocks.cobblestone, 1), new ItemStack(Items.redstone, 1), new ItemStack(Blocks.cobblestone, 1) }), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "RGR", "RPR", "RCR", Character.valueOf('G'), OreDictNames.craftingGrinder, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('R'), OrePrefixes.plate.get(Materials.Steel), Character.valueOf('P'), OreDictNames.craftingPiston });

main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java

@@ -669,9 +669,11 @@ public class GT_MachineRecipeLoader
     GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L), GT_Values.NI, Materials.Oxygen.getGas(1000L), GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.AnnealedCopper, 1L), GT_Values.NI, 500, 120, 1200);
     GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), GT_Values.NI, Materials.Oxygen.getGas(1000L), GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.AnnealedCopper, 1L), GT_Values.NI, 500, 120, 1200);
     
-    GT_Values.RA.addFusionReactorRecipe(Materials.Deuterium.getGas(125), Materials.Tritium.getGas(125), FluidRegistry.getFluidStack("heliumplasma", 125), 16, 4096, 40000000);
-    GT_Values.RA.addFusionReactorRecipe(Materials.Deuterium.getGas(125), Materials.Helium_3.getGas(125), FluidRegistry.getFluidStack("heliumplasma", 125), 16, 2048, 60000000);
-    //GT_Values.RA.addFusionReactorRecipe(Materials.Lithium.getMolten(9), Materials.Tungsten.getMolten(9), Materials.Iridium.getMolten(9), 32, 32768, 150000000);
+//    GT_Values.RA.addFusionReactorRecipe(Materials.Deuterium.getGas(125), Materials.Tritium.getGas(125), FluidRegistry.getFluidStack("heliumplasma", 125), 16, 4096, 40000000);
+//    GT_Values.RA.addFusionReactorRecipe(Materials.Deuterium.getGas(125), Materials.Helium_3.getGas(125), FluidRegistry.getFluidStack("heliumplasma", 125), 16, 2048, 60000000);
+//    GT_Values.RA.addFusionReactorRecipe(Materials.Lithium.getMolten(9), Materials.Tungsten.getMolten(9), Materials.Iridium.getMolten(9), 32, 32768, 150000000);
+    GT_Values.RA.addFusionReactorRecipe(Materials.Deuterium.getGas(125), Materials.Tritium.getGas(125), Materials.Helium.getPlasma(125), 16, 4096, 40000000);
+    GT_Values.RA.addFusionReactorRecipe(Materials.Deuterium.getGas(125), Materials.Helium_3.getGas(125), Materials.Helium.getPlasma(125), 16, 2048, 60000000);
     GT_Values.RA.addFusionReactorRecipe(Materials.Beryllium.getMolten(9), Materials.Tungsten.getMolten(9), Materials.Platinum.getMolten(9), 32, 32768, 300000000);
     GT_Values.RA.addFusionReactorRecipe(Materials.Neodymium.getMolten(9), Materials.Hydrogen.getGas(27), Materials.Europium.getMolten(9), 64, 24576, 150000000);
     GT_Values.RA.addFusionReactorRecipe(Materials.Lutetium.getMolten(9), Materials.Chrome.getMolten(9), Materials.Americium.getMolten(9), 96, 49152, 200000000);

main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java

@@ -190,8 +190,8 @@ import ic2.core.item.ItemRadioactive;
 /* 143:144 */     Materials.ConstructionFoam.mFluid = GT_Utility.getFluidForFilledItem(GT_ModHandler.getIC2Item("CFCell", 1L), true).getFluid();
 /* 144:145 */     Materials.UUMatter.mFluid = GT_Utility.getFluidForFilledItem(GT_ModHandler.getIC2Item("uuMatterCell", 1L), true).getFluid();
 /* 145:    */     
-/* 146:147 */     GT_Mod.gregtechproxy.addFluid("HeliumPlasma", "Helium Plasma", Materials.Helium, 3, 10000, GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Helium, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
-/* 147:148 */     GT_Mod.gregtechproxy.addFluid("NitrogenPlasma", "Nitrogen Plasma", Materials.Nitrogen, 3, 10000, GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Nitrogen, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
+///* 146:147 */     GT_Mod.gregtechproxy.addFluid("HeliumPlasma", "Helium Plasma", Materials.Helium, 3, 10000, GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Helium, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
+///* 147:148 */     GT_Mod.gregtechproxy.addFluid("NitrogenPlasma", "Nitrogen Plasma", Materials.Nitrogen, 3, 10000, GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Nitrogen, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
 /* 148:    */     
 /* 149:    */ 
 /* 150:    */ 
@@ -278,6 +278,9 @@ import ic2.core.item.ItemRadioactive;
 /* 231:235 */           GT_Mod.gregtechproxy.addAutogeneratedMoltenFluid(tMaterial.mSmeltInto);
 /* 232:    */         }
 /* 233:    */       }
+					if(tMaterial.mElement!=null){
+						GT_Mod.gregtechproxy.addAutogeneratedPlasmaFluid(tMaterial);
+					}
 /* 234:    */     }
 /* 235:242 */     GT_Mod.gregtechproxy.addFluid("potion.awkward", "Awkward Brew", null, 1, 295, new ItemStack(Items.potionitem, 1, 16), ItemList.Bottle_Empty.get(1L, new Object[0]), 250);
 /* 236:243 */     GT_Mod.gregtechproxy.addFluid("potion.thick", "Thick Brew", null, 1, 295, new ItemStack(Items.potionitem, 1, 32), ItemList.Bottle_Empty.get(1L, new Object[0]), 250);

main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java

@@ -47,6 +47,7 @@ import gregtech.api.util.GT_Recipe;
 /*   45:     */ import gregtech.common.tileentities.generators.GT_MetaTileEntity_FluidNaquadahReactor;
 /*   46:     */ import gregtech.common.tileentities.generators.GT_MetaTileEntity_GasTurbine;
 import gregtech.common.tileentities.generators.GT_MetaTileEntity_MagicEnergyConverter;
+import gregtech.common.tileentities.generators.GT_MetaTileEntity_MagicalEnergyAbsorber;
 import gregtech.common.tileentities.generators.GT_MetaTileEntity_PlasmaGenerator;
 /*   47:     */ import gregtech.common.tileentities.generators.GT_MetaTileEntity_SolidNaquadahReactor;
 /*   48:     */ import gregtech.common.tileentities.generators.GT_MetaTileEntity_SteamTurbine;
@@ -910,10 +911,19 @@ import net.minecraft.item.Item;
 						ItemList.MagicEnergyConverter_MV.set(new GT_MetaTileEntity_MagicEnergyConverter(1124, "basicgenerator.magicenergyconverter.tier.02", "Adept Magic Energy Converter",2).getStackForm(1L));
 						ItemList.MagicEnergyConverter_HV.set(new GT_MetaTileEntity_MagicEnergyConverter(1125, "basicgenerator.magicenergyconverter.tier.03", "Master Magic Energy Converter",3).getStackForm(1L));						
 						
-						GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_LV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CTC", "FMF", "CBC", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('B'), new ItemStack(Blocks.beacon), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('T'), ItemList.Field_Generator_HV, Character.valueOf('F'), OrePrefixes.plate.get(Materials.Platinum) });
-						GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_MV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CTC", "FMF", "CBC", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('B'), new ItemStack(Blocks.beacon), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Data), Character.valueOf('T'), ItemList.Field_Generator_EV, Character.valueOf('F'), OrePrefixes.plate.get(Materials.Osmium) });
-						GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_HV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CTC", "FMF", "CBC", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('B'), new ItemStack(Blocks.beacon), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('T'), ItemList.Field_Generator_IV, Character.valueOf('F'), OrePrefixes.plate.get(Materials.Neutronium) });
-						  
+						GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_LV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CTC", "FMF", "CBC", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('B'), new ItemStack(Blocks.beacon), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('T'), ItemList.Field_Generator_LV, Character.valueOf('F'), OrePrefixes.plate.get(Materials.Platinum) });
+						GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_MV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CTC", "FMF", "CBC", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('B'), new ItemStack(Blocks.beacon), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Data), Character.valueOf('T'), ItemList.Field_Generator_MV, Character.valueOf('F'), OrePrefixes.plate.get(Materials.Iridium) });
+						GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_HV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CTC", "FMF", "CBC", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('B'), new ItemStack(Blocks.beacon), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('T'), ItemList.Field_Generator_HV, Character.valueOf('F'), OrePrefixes.plate.get(Materials.Neutronium) });
+						
+						ItemList.MagicEnergyAbsorber_LV.set(new GT_MetaTileEntity_MagicalEnergyAbsorber(1127, "basicgenerator.magicenergyabsorber.tier.01", "Novice Magic Energy Absorber",1).getStackForm(1L));
+						ItemList.MagicEnergyAbsorber_MV.set(new GT_MetaTileEntity_MagicalEnergyAbsorber(1128, "basicgenerator.magicenergyabsorber.tier.02", "Adept Magic Energy Absorber",2).getStackForm(1L));
+						ItemList.MagicEnergyAbsorber_HV.set(new GT_MetaTileEntity_MagicalEnergyAbsorber(1129, "basicgenerator.magicenergyabsorber.tier.03", "Master Magic Energy Absorber",3).getStackForm(1L));						
+						ItemList.MagicEnergyAbsorber_EV.set(new GT_MetaTileEntity_MagicalEnergyAbsorber(1130, "basicgenerator.magicenergyabsorber.tier.04", "Grandmaster Magic Energy Absorber",4).getStackForm(1L));						
+						
+						GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyAbsorber_LV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CTC", "FMF", "CBC", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('B'), ItemList.MagicEnergyConverter_LV.get(1L, new Object[0]), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('T'), ItemList.Field_Generator_LV, Character.valueOf('F'), OrePrefixes.plate.get(Materials.Platinum) });
+						GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyAbsorber_MV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CTC", "FMF", "CBC", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('B'), ItemList.MagicEnergyConverter_MV.get(1L, new Object[0]), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Data), Character.valueOf('T'), ItemList.Field_Generator_MV, Character.valueOf('F'), OrePrefixes.plate.get(Materials.Iridium) });
+						GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyAbsorber_HV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CTC", "FMF", "CBC", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('B'), ItemList.MagicEnergyConverter_MV.get(1L, new Object[0]), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('T'), ItemList.Field_Generator_HV, Character.valueOf('F'), OrePrefixes.plate.get(Materials.Europium) });
+						GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyAbsorber_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CTC", "FMF", "CBC", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('B'), ItemList.MagicEnergyConverter_HV.get(1L, new Object[0]), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('T'), ItemList.Field_Generator_EV, Character.valueOf('F'), OrePrefixes.plate.get(Materials.Neutronium) });
 						
 						ItemList.FusionComputer_LuV.set(new GT_MetaTileEntity_FusionComputer1(1193, "fusioncomputer.tier.06", "Fusion Control Computer Mark I").getStackForm(1L));
 						ItemList.FusionComputer_ZPMV.set(new GT_MetaTileEntity_FusionComputer2(1194, "fusioncomputer.tier.07", "Fusion Control Computer Mark II").getStackForm(1L));

main/resources/assets/gregtech/textures/blocks/fluids/fluid.plasma.autogenerated.png.mcmeta

@@ -0,0 +1,5 @@
+{ 
+   "animation":{
+      "frametime":1
+   }
+}