Merge branch 'experimental'

15 files changed, 1395 insertions, 755 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
index a869ad8d3a..f354e12122 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
@@ -1,99 +1,99 @@
-package gregtech.common.tileentities.machines.basic;

-

-import gregtech.api.enums.ItemList;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.ITexture;

-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

-import gregtech.api.metatileentity.MetaTileEntity;

-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

-import gregtech.api.objects.GT_RenderedTexture;

-import gregtech.api.util.GT_ModHandler;

-import gregtech.api.util.GT_Recipe;

-import gregtech.api.util.GT_Utility;

-import net.minecraft.item.ItemStack;

-

-public class GT_MetaTileEntity_Boxinator

-        extends GT_MetaTileEntity_BasicMachine {

-    public GT_MetaTileEntity_Boxinator(int aID, String aName, String aNameRegional, int aTier) {

-        super(aID, aName, aNameRegional, aTier, 1, "Puts things into Boxes", 2, 1, "Packager.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR)});

-    }

-

-    public GT_MetaTileEntity_Boxinator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {

-        super(aName, aTier, 1, aDescription, aTextures, 2, 1, aGUIName, aNEIName);

-    }

-

-    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

-        return new GT_MetaTileEntity_Boxinator(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

-    }

-

-    public GT_Recipe.GT_Recipe_Map getRecipeList() {

-        return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes;

-    }

-

-    public int checkRecipe() {

-        int tCheck = super.checkRecipe();

-        if (tCheck != 0) {

-            return tCheck;

-        }

-        if ((GT_Utility.isStackValid(getInputAt(0))) && (GT_Utility.isStackValid(getInputAt(1))) && (GT_Utility.getContainerItem(getInputAt(0), true) == null)) {

-            if ((ItemList.Schematic_1by1.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 1)) {

-                this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[]{getInputAt(0)});

-                if (this.mOutputItems[0] != null) {

-                    if (canOutput(new ItemStack[]{this.mOutputItems[0]})) {

-                        getInputAt(0).stackSize -= 1;

-                        this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-                        this.mMaxProgresstime = (16 / (1 << this.mTier - 1));

-                        return 2;

-                    }

-                }

-                return 0;

-            }

-            if ((ItemList.Schematic_2by2.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 4)) {

-                this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[]{getInputAt(0), getInputAt(0), null, getInputAt(0), getInputAt(0)});

-                if (this.mOutputItems[0] != null) {

-                    if (canOutput(new ItemStack[]{this.mOutputItems[0]})) {

-                        getInputAt(0).stackSize -= 4;

-                        this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-                        this.mMaxProgresstime = (32 / (1 << this.mTier - 1));

-                        return 2;

-                    }

-                }

-                return 0;

-            }

-            if ((ItemList.Schematic_3by3.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 9)) {

-                this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[]{getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0)});

-                if (this.mOutputItems[0] != null) {

-                    if (canOutput(new ItemStack[]{this.mOutputItems[0]})) {

-                        getInputAt(0).stackSize -= 9;

-                        this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-                        this.mMaxProgresstime = (64 / (1 << this.mTier - 1));

-                        return 2;

-                    }

-                }

-                return 0;

-            }

-        }

-        return 0;

-    }

-

-    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {

-        if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {

-            if ((ItemList.Schematic_1by1.isStackEqual(getInputAt(1))) || (ItemList.Schematic_2by2.isStackEqual(getInputAt(1))) || (ItemList.Schematic_3by3.isStackEqual(getInputAt(1)))) {

-                if (GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.findRecipe(getBaseMetaTileEntity(), true, gregtech.api.enums.GT_Values.V[this.mTier], null, new ItemStack[]{GT_Utility.copyAmount(64L, new Object[]{aStack}), getInputAt(1)}) != null) {

-                    return true;

-                }

-                if (ItemList.Schematic_1by1.isStackEqual(getInputAt(1)) && GT_ModHandler.getRecipeOutput(new ItemStack[]{aStack}) != null)

-                    return true;

-                if (ItemList.Schematic_2by2.isStackEqual(getInputAt(1)) && GT_ModHandler.getRecipeOutput(new ItemStack[]{aStack, aStack, null, aStack, aStack}) != null) {

-                    return true;

-                }

-                if (ItemList.Schematic_3by3.isStackEqual(getInputAt(1)) && (GT_ModHandler.getRecipeOutput(new ItemStack[]{aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack}) != null)) {

-                    return true;

-                }

-            } else {

-                return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.containsInput(aStack);

-            }

-        }

-        return false;

-    }

-}

+package gregtech.common.tileentities.machines.basic;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.item.ItemStack;
+
+public class GT_MetaTileEntity_Boxinator
+        extends GT_MetaTileEntity_BasicMachine {
+    public GT_MetaTileEntity_Boxinator(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, 1, "Puts things into Boxes", 2, 1, "Packager.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR)});
+    }
+
+    public GT_MetaTileEntity_Boxinator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+        super(aName, aTier, 1, aDescription, aTextures, 2, 1, aGUIName, aNEIName);
+    }
+
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_Boxinator(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+    }
+
+    public GT_Recipe.GT_Recipe_Map getRecipeList() {
+        return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes;
+    }
+
+    public int checkRecipe() {
+        int tCheck = super.checkRecipe();
+        if (tCheck != 0) {
+            return tCheck;
+        }
+        if ((GT_Utility.isStackValid(getInputAt(0))) && (GT_Utility.isStackValid(getInputAt(1))) && (GT_Utility.getContainerItem(getInputAt(0), true) == null)) {
+            if ((ItemList.Schematic_1by1.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 1)) {
+                this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[]{getInputAt(0)});
+                if (this.mOutputItems[0] != null) {
+                    if (canOutput(new ItemStack[]{this.mOutputItems[0]})) {
+                        getInputAt(0).stackSize -= 1;
+                        this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+                        this.mMaxProgresstime = (16 / (1 << this.mTier - 1));
+                        return 2;
+                    }
+                }
+                return 0;
+            }
+            if ((ItemList.Schematic_2by2.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 4)) {
+                this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[]{getInputAt(0), getInputAt(0), null, getInputAt(0), getInputAt(0)});
+                if (this.mOutputItems[0] != null) {
+                    if (canOutput(new ItemStack[]{this.mOutputItems[0]})) {
+                        getInputAt(0).stackSize -= 4;
+                        this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+                        this.mMaxProgresstime = (32 / (1 << this.mTier - 1));
+                        return 2;
+                    }
+                }
+                return 0;
+            }
+            if ((ItemList.Schematic_3by3.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 9)) {
+                this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[]{getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0)});
+                if (this.mOutputItems[0] != null) {
+                    if (canOutput(new ItemStack[]{this.mOutputItems[0]})) {
+                        getInputAt(0).stackSize -= 9;
+                        this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+                        this.mMaxProgresstime = (64 / (1 << this.mTier - 1));
+                        return 2;
+                    }
+                }
+                return 0;
+            }
+        }
+        return 0;
+    }
+
+    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+        if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {
+            if ((ItemList.Schematic_1by1.isStackEqual(getInputAt(1))) || (ItemList.Schematic_2by2.isStackEqual(getInputAt(1))) || (ItemList.Schematic_3by3.isStackEqual(getInputAt(1)))) {
+                if (GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.findRecipe(getBaseMetaTileEntity(), true, gregtech.api.enums.GT_Values.V[this.mTier], null, new ItemStack[]{GT_Utility.copyAmount(64L, new Object[]{aStack}), getInputAt(1)}) != null) {
+                    return true;
+                }
+                if (ItemList.Schematic_1by1.isStackEqual(getInputAt(1)) && GT_ModHandler.getRecipeOutput(new ItemStack[]{aStack}) != null)
+                    return true;
+                if (ItemList.Schematic_2by2.isStackEqual(getInputAt(1)) && GT_ModHandler.getRecipeOutput(new ItemStack[]{aStack, aStack, null, aStack, aStack}) != null) {
+                    return true;
+                }
+                if (ItemList.Schematic_3by3.isStackEqual(getInputAt(1)) && (GT_ModHandler.getRecipeOutput(new ItemStack[]{aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack}) != null)) {
+                    return true;
+                }
+            } else {
+                return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.containsInput(aStack);
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
new file mode 100644
index 0000000000..8937dfbcf5
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
@@ -0,0 +1,80 @@
+package gregtech.common.tileentities.machines.basic;
+
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.BaseMetaTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer;
+import gregtech.api.util.GT_ModHandler;
+
+import static gregtech.api.enums.GT_Values.V;
+
+public class GT_MetaTileEntity_Charger extends GT_MetaTileEntity_BasicBatteryBuffer {
+
+    public GT_MetaTileEntity_Charger(int aID, String aName, String aNameRegional, int aTier, String aDescription, int aSlotCount) {
+        super(aID, aName, aNameRegional, aTier, aDescription, aSlotCount);
+    }
+
+    public GT_MetaTileEntity_Charger(String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) {
+        super(aName, aTier, aDescription, aTextures, aSlotCount);
+    }
+
+    @Override
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_Charger(mName, mTier, mDescription, mTextures, mInventory.length);
+    }
+
+    @Override
+    public long getMinimumStoredEU() {
+        return V[mTier] * 64 * mInventory.length;
+    }
+
+    @Override
+    public long maxEUStore() {
+        return V[mTier] * 256 * mInventory.length;
+    }
+
+    @Override
+    public long maxAmperesIn() {
+        return mChargeableCount * 8;
+    }
+
+    @Override
+    public long maxAmperesOut() {
+        return mBatteryCount * 4;
+    }
+
+    @Override
+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        if (aBaseMetaTileEntity.isServerSide()) {
+            super.onPostTick(aBaseMetaTileEntity, aTick);
+            if (this.getBaseMetaTileEntity() instanceof BaseMetaTileEntity) {
+                BaseMetaTileEntity mBaseMetaTileEntity = (BaseMetaTileEntity) getBaseMetaTileEntity();
+                if (mBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) {
+                    MetaTileEntity mMetaTileEntity = (MetaTileEntity) mBaseMetaTileEntity.getMetaTileEntity();
+                    //for (int t = 0; t < 6; t++) {
+                    if (mMetaTileEntity.dechargerSlotCount() > 0 && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) {
+                        for (int i = mMetaTileEntity.dechargerSlotStartIndex(), k = mMetaTileEntity.dechargerSlotCount() + i; i < k; i++) {
+                            if (mMetaTileEntity.mInventory[i] != null && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) {
+                                mBaseMetaTileEntity.increaseStoredEnergyUnits(GT_ModHandler.dischargeElectricItem(mMetaTileEntity.mInventory[i], (int) Math.min(V[mTier] * 15, mBaseMetaTileEntity.getEUCapacity() - mBaseMetaTileEntity.getStoredEU()), (int) Math.min(Integer.MAX_VALUE, mMetaTileEntity.getInputTier()), true, false, false), true);
+                                if (mMetaTileEntity.mInventory[i].stackSize <= 0)
+                                    mMetaTileEntity.mInventory[i] = null;
+                            }
+                        }
+                    }
+                    if (mMetaTileEntity.rechargerSlotCount() > 0 && mBaseMetaTileEntity.getStoredEU() > 0) {
+                        for (int i = mMetaTileEntity.rechargerSlotStartIndex(), k = mMetaTileEntity.rechargerSlotCount() + i; i < k; i++) {
+                            if (mBaseMetaTileEntity.getStoredEU() > 0 && mMetaTileEntity.mInventory[i] != null) {
+                                mBaseMetaTileEntity.decreaseStoredEU(GT_ModHandler.chargeElectricItem(mMetaTileEntity.mInventory[i], (int) Math.min(V[this.mTier] * 15, mBaseMetaTileEntity.getStoredEU()), (int) Math.min(Integer.MAX_VALUE, mMetaTileEntity.getOutputTier()), true, false), true);
+                                if (mMetaTileEntity.mInventory[i].stackSize <= 0)
+                                    mMetaTileEntity.mInventory[i] = null;
+                            }
+                        }
+                        //}
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CuringOven.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CuringOven.java
new file mode 100644
index 0000000000..7d0de3fcc2
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CuringOven.java
@@ -0,0 +1,85 @@
+package gregtech.common.tileentities.machines.basic;
+
+
+import java.util.Iterator;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Textures;
+import gregtech.api.gui.GT_Container_1by1;
+import gregtech.api.gui.GT_GUIContainer_1by1;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
+public class GT_MetaTileEntity_CuringOven
+        extends GT_MetaTileEntity_BasicMachine {
+
+    public GT_MetaTileEntity_CuringOven(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, 1, "Heats tools for hardening", 1, 1, "E_Oven.png", "", new ITexture[]{new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_SIDE_ACTIVE")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_SIDE")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_FRONT_ACTIVE")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_FRONT")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_TOP_ACTIVE")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_TOP")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_BOTTOM_ACTIVE")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_BOTTOM"))});
+    }
+
+    public GT_MetaTileEntity_CuringOven(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+        super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
+    }
+
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_CuringOven(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+    }
+
+    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+        return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (ItemList.Cell_Empty.isStackEqual(aStack));
+    }
+
+    public boolean isFluidInputAllowed(FluidStack aFluid) {
+        return false;
+    }
+    
+    @Override
+    public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+        return new GT_Container_1by1(aPlayerInventory, aBaseMetaTileEntity);
+    }
+
+    @Override
+    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+        return new GT_GUIContainer_1by1(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
+    }
+
+    @Override
+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        if (aBaseMetaTileEntity.isServerSide()) {
+            for (ItemStack tStack : mInventory)
+                if (tStack!=null&&tStack.getItem() instanceof GT_MetaGenerated_Tool &&getBaseMetaTileEntity().getStoredEU()>0) {
+                	getBaseMetaTileEntity().decreaseStoredEnergyUnits(24, true);
+                    NBTTagCompound aNBT = tStack.getTagCompound();
+                    if (aNBT != null) {
+                	int tHeat = 300;
+                	long tWorldTime = getBaseMetaTileEntity().getWorld().getTotalWorldTime();
+                        aNBT = aNBT.getCompoundTag("GT.ToolStats");
+                        if (aNBT != null&&aNBT.hasKey("Heat")) {
+                        	tHeat = aNBT.getInteger("Heat");
+                        	if(aNBT.hasKey("HeatTime")){
+                        		long tHeatTime = aNBT.getLong("HeatTime");
+                        		if(tWorldTime>(tHeatTime+10)){
+                        			tHeat = (int) (tHeat - ((tWorldTime-tHeatTime)/10));
+                        			if(tHeat<300)tHeat=300;
+                        		}
+                        	}
+                        }
+                        tHeat++;
+                        if(aNBT!=null){
+                        	aNBT.setInteger("Heat", tHeat);
+                        	aNBT.setLong("HeatTime", tWorldTime);}
+                        if(tHeat>GT_MetaGenerated_Tool.getPrimaryMaterial(tStack).mMeltingPoint){mInventory[0]=null;}
+                    }
+                	
+                }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
index a9c4299edd..315207d601 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
@@ -1,54 +1,57 @@
-package gregtech.common.tileentities.machines.basic;

-

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.ITexture;

-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

-import gregtech.api.metatileentity.MetaTileEntity;

-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

-import gregtech.api.objects.GT_RenderedTexture;

-import gregtech.api.util.GT_Utility;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-

-public class GT_MetaTileEntity_Disassembler

-        extends GT_MetaTileEntity_BasicMachine {

-    public GT_MetaTileEntity_Disassembler(int aID, String aName, String aNameRegional, int aTier) {

-        super(aID, aName, aNameRegional, aTier, 1, "Disassembles Machines at " + (50 + 10 * aTier) + "% Efficiency", 1, 9, "Disassembler.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER)});

-    }

-

-    public GT_MetaTileEntity_Disassembler(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {

-        super(aName, aTier, 1, aDescription, aTextures, 1, 9, aGUIName, aNEIName);

-    }

-

-    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

-        return new GT_MetaTileEntity_Disassembler(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

-    }

-

-    public int checkRecipe() {

-        if ((getInputAt(0) != null) && (isOutputEmpty())) {

-            NBTTagCompound tNBT = getInputAt(0).getTagCompound();

-            if (tNBT != null) {

-                tNBT = tNBT.getCompoundTag("GT.CraftingComponents");

-                if (tNBT != null) {

-                    getInputAt(0).stackSize -= 1;

-                    this.mEUt = (16 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-                    this.mMaxProgresstime = 80;

-                    for (int i = 0; i < this.mOutputItems.length; i++) {

-                        if (getBaseMetaTileEntity().getRandomNumber(100) < 50 + 10 * this.mTier) {

-                            this.mOutputItems[i] = GT_Utility.loadItem(tNBT, "Ingredient." + i);

-                            if (this.mOutputItems[i] != null) {

-                                this.mMaxProgresstime *= 1.7;

-                            }

-                        }

-                    }

-                    return 2;

-                }

-            }

-        }

-        return 0;

-    }

-

-    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {

-        return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (aStack.getTagCompound() != null) && (aStack.getTagCompound().getCompoundTag("GT.CraftingComponents") != null);

-    }

-}

+package gregtech.common.tileentities.machines.basic;
+
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+public class GT_MetaTileEntity_Disassembler
+        extends GT_MetaTileEntity_BasicMachine {
+    public GT_MetaTileEntity_Disassembler(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, 1, "Disassembles Machines at " + (50 + 10 * aTier) + "% Efficiency", 1, 9, "Disassembler.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER)});
+    }
+
+    public GT_MetaTileEntity_Disassembler(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+        super(aName, aTier, 1, aDescription, aTextures, 1, 9, aGUIName, aNEIName);
+    }
+
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_Disassembler(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+    }
+
+    public int checkRecipe() {
+        if ((getInputAt(0) != null) && (isOutputEmpty())) {
+            NBTTagCompound tNBT = getInputAt(0).getTagCompound();
+            if (tNBT != null) {
+                tNBT = tNBT.getCompoundTag("GT.CraftingComponents");
+                if (tNBT != null) {
+                    this.mEUt = (16 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+                    this.mMaxProgresstime = 80;
+                    for (int i = 0; i < this.mOutputItems.length; i++) {
+                        if (getBaseMetaTileEntity().getRandomNumber(100) < 50 + 10 * this.mTier) {
+                            this.mOutputItems[i] = GT_Utility.loadItem(tNBT, "Ingredient." + i);
+                            if (this.mOutputItems[i] != null) {
+                                this.mMaxProgresstime *= 1.7;
+                            }
+                        }
+                    }
+                    if(mMaxProgresstime==80){
+                    	return 0;
+                    }
+                    getInputAt(0).stackSize -= 1;
+                    return 2;
+                }
+            }
+        }
+        return 0;
+    }
+
+    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+        return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (aStack.getTagCompound() != null) && (aStack.getTagCompound().getCompoundTag("GT.CraftingComponents") != null);
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
index d7bd1e195d..da08f3253c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
@@ -1,66 +1,78 @@
-package gregtech.common.tileentities.machines.basic;

-

-import gregtech.api.enums.ConfigCategories;

-import gregtech.api.enums.ItemList;

-import gregtech.api.enums.Materials;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.ITexture;

-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

-import gregtech.api.metatileentity.MetaTileEntity;

-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

-import gregtech.api.objects.GT_RenderedTexture;

-import gregtech.api.util.GT_Config;

-import net.minecraftforge.fluids.FluidStack;

-

-public class GT_MetaTileEntity_Massfabricator

-        extends GT_MetaTileEntity_BasicMachine {

-    public static int sUUAperUUM = 1;

-    public static int sUUASpeedBonus = 4;

-    public static int sDurationMultiplier = 3215;

-    public static boolean sRequiresUUA = false;

-

-    public GT_MetaTileEntity_Massfabricator(int aID, String aName, String aNameRegional, int aTier) {

-        super(aID, aName, aNameRegional, aTier, 1, "UUM = Matter * Fabrication Squared", 1, 1, "Massfabricator.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_MASSFAB), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB)});

-    }

-

-    public GT_MetaTileEntity_Massfabricator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {

-        super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);

-    }

-

-    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

-        return new GT_MetaTileEntity_Massfabricator(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

-    }

-

-    public void onConfigLoad(GT_Config aConfig) {

-        super.onConfigLoad(aConfig);

-        sDurationMultiplier = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUM_Duration_Multiplier", sDurationMultiplier);

-        sUUAperUUM = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_per_UUM", sUUAperUUM);

-        sUUASpeedBonus = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_Speed_Bonus", sUUASpeedBonus);

-        sRequiresUUA = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_Requirement", sRequiresUUA);

-        Materials.UUAmplifier.mChemicalFormula = ("Mass Fabricator Eff/Speed Bonus: x" + sUUASpeedBonus);

-    }

-

-    public int checkRecipe() {

-        FluidStack tFluid = getDrainableStack();

-        if ((tFluid == null) || (tFluid.amount < getCapacity())) {

-            this.mOutputFluid = Materials.UUMatter.getFluid(1L);

-            this.mEUt = ((int) gregtech.api.enums.GT_Values.V[this.mTier]);

-            this.mMaxProgresstime = (sDurationMultiplier / (1 << this.mTier - 1));

-            if (((tFluid = getFillableStack()) != null) && (tFluid.amount >= sUUAperUUM) && (tFluid.isFluidEqual(Materials.UUAmplifier.getFluid(1L)))) {

-                tFluid.amount -= sUUAperUUM;

-                this.mMaxProgresstime /= sUUASpeedBonus;

-                return 2;

-            }

-            return (sRequiresUUA) || (ItemList.Circuit_Integrated.isStackEqual(getInputAt(0), true, true)) ? 1 : 2;

-        }

-        return 0;

-    }

-

-    public boolean isFluidInputAllowed(FluidStack aFluid) {

-        return aFluid.isFluidEqual(Materials.UUAmplifier.getFluid(1L));

-    }

-

-    public int getCapacity() {

-        return Math.max(sUUAperUUM, 1000);

-    }

-}

+package gregtech.common.tileentities.machines.basic;
+
+import gregtech.api.enums.ConfigCategories;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Config;
+import net.minecraftforge.fluids.FluidStack;
+
+import static gregtech.api.enums.GT_Values.V;
+
+public class GT_MetaTileEntity_Massfabricator
+        extends GT_MetaTileEntity_BasicMachine {
+    public static int sUUAperUUM = 1;
+    public static int sUUASpeedBonus = 4;
+    public static int sDurationMultiplier = 3215;
+    public static boolean sRequiresUUA = false;
+
+    public GT_MetaTileEntity_Massfabricator(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, 1, "UUM = Matter * Fabrication Squared", 1, 1, "Massfabricator.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_MASSFAB), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB)});
+    }
+
+    public GT_MetaTileEntity_Massfabricator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+        super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
+    }
+
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_Massfabricator(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+    }
+
+    public void onConfigLoad(GT_Config aConfig) {
+        super.onConfigLoad(aConfig);
+        sDurationMultiplier = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUM_Duration_Multiplier", sDurationMultiplier);
+        sUUAperUUM = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_per_UUM", sUUAperUUM);
+        sUUASpeedBonus = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_Speed_Bonus", sUUASpeedBonus);
+        sRequiresUUA = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_Requirement", sRequiresUUA);
+        Materials.UUAmplifier.mChemicalFormula = ("Mass Fabricator Eff/Speed Bonus: x" + sUUASpeedBonus);
+    }
+
+    @Override
+    public long maxAmperesIn() {
+        return 10;
+    }
+
+    @Override
+    public long maxEUStore() {
+        return V[mTier] * 512;
+    }
+
+    public int checkRecipe() {
+        FluidStack tFluid = getDrainableStack();
+        if ((tFluid == null) || (tFluid.amount < getCapacity())) {
+            this.mOutputFluid = Materials.UUMatter.getFluid(1L);
+            this.mEUt =  (((int) gregtech.api.enums.GT_Values.V[1]) * (int)Math.pow(2, this.mTier + 2));
+            this.mMaxProgresstime = (sDurationMultiplier / (1 << this.mTier - 1));
+            if (((tFluid = getFillableStack()) != null) && (tFluid.amount >= sUUAperUUM) && (tFluid.isFluidEqual(Materials.UUAmplifier.getFluid(1L)))) {
+                tFluid.amount -= sUUAperUUM;
+                this.mMaxProgresstime /= sUUASpeedBonus;
+                return 2;
+            }
+            return (sRequiresUUA) || (ItemList.Circuit_Integrated.isStackEqual(getInputAt(0), true, true)) ? 1 : 2;
+        }
+        return 0;
+    }
+
+    public boolean isFluidInputAllowed(FluidStack aFluid) {
+        return aFluid.isFluidEqual(Materials.UUAmplifier.getFluid(1L));
+    }
+
+    public int getCapacity() {
+        return Math.max(sUUAperUUM, 1000);
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
new file mode 100644
index 0000000000..de0a468582
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
@@ -0,0 +1,331 @@
+package gregtech.common.tileentities.machines.basic;
+
+import gregtech.api.enums.ConfigCategories;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IEnergyConnected;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Config;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.gui.GT_Container_MicrowaveEnergyTransmitter;
+import gregtech.common.gui.GT_GUIContainer_MicrowaveEnergyTransmitter;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.fluids.FluidStack;
+
+import static gregtech.api.enums.GT_Values.V;
+
+public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEntity_BasicTank {
+
+    public static boolean sInterDimensionalTeleportAllowed = true;
+    public int mTargetX = 0;
+    public int mTargetY = 0;
+    public int mTargetZ = 0;
+    public int mTargetD = 0;
+    public boolean mDebug = false;
+    public boolean hasEgg = false;
+    public int mMaxLoss = 50;
+    public int mMaxLossDistance = 10000;
+    public boolean mPassiveEnergyUse = true;
+    public int tTargetX = 0;
+    public int tTargetY = 0;
+    public int tTargetZ = 0;
+    public int tTargetD = 0;
+    public TileEntity tTile = null;
+
+    public GT_MetaTileEntity_MicrowaveEnergyTransmitter(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, 3, "Transmits Energy wireless");
+    }
+
+    public GT_MetaTileEntity_MicrowaveEnergyTransmitter(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, 3, aDescription, aTextures);
+    }
+
+    @Override
+    public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+        if (aBaseMetaTileEntity.isClientSide()) return true;
+        this.hasEgg = checkForEgg();
+        aBaseMetaTileEntity.openGUI(aPlayer);
+        return true;
+    }
+
+    @Override
+    public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+        return new GT_Container_MicrowaveEnergyTransmitter(aPlayerInventory, aBaseMetaTileEntity);
+    }
+
+    @Override
+    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+        return new GT_GUIContainer_MicrowaveEnergyTransmitter(aPlayerInventory, aBaseMetaTileEntity);
+    }
+
+    @Override
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_MicrowaveEnergyTransmitter(this.mName, this.mTier, this.mDescription, this.mTextures);
+    }
+
+    public String[] getInfoData() {
+        return new String[]{"Coordinates:", "X: " + this.mTargetX, "Y: " + this.mTargetY, "Z: " + this.mTargetZ, "Dimension: " + this.mTargetD};
+    }
+
+    @Override
+    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1], (aSide == 0) ? null : aActive ? new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE) : new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER)};
+    }
+
+    public void saveNBTData(NBTTagCompound aNBT) {
+        if (mFluid != null) aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
+        aNBT.setInteger("mTargetX", this.mTargetX);
+        aNBT.setInteger("mTargetY", this.mTargetY);
+        aNBT.setInteger("mTargetZ", this.mTargetZ);
+        aNBT.setInteger("mTargetD", this.mTargetD);
+        aNBT.setBoolean("mDebug", this.mDebug);
+    }
+
+    public void loadNBTData(NBTTagCompound aNBT) {
+        mFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid"));
+        this.mTargetX = aNBT.getInteger("mTargetX");
+        this.mTargetY = aNBT.getInteger("mTargetY");
+        this.mTargetZ = aNBT.getInteger("mTargetZ");
+        this.mTargetD = aNBT.getInteger("mTargetD");
+        this.mDebug = aNBT.getBoolean("mDebug");
+    }
+
+    public void onConfigLoad(GT_Config aConfig) {
+        sInterDimensionalTeleportAllowed = aConfig.get(ConfigCategories.machineconfig, "Teleporter.Interdimensional", true);
+        mMaxLoss = Math.max(aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.MaxLoss", 50), 11);
+        mMaxLossDistance = aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.MaxLossDistance", 10000);
+        mPassiveEnergyUse = aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.PassiveEnergy", true);
+    }
+
+    public void onFirstTick() {
+        if (getBaseMetaTileEntity().isServerSide()) {
+            if ((this.mTargetX == 0) && (this.mTargetY == 0) && (this.mTargetZ == 0) && (this.mTargetD == 0)) {
+                this.mTargetX = getBaseMetaTileEntity().getXCoord();
+                this.mTargetY = getBaseMetaTileEntity().getYCoord();
+                this.mTargetZ = getBaseMetaTileEntity().getZCoord();
+                this.mTargetD = getBaseMetaTileEntity().getWorld().provider.dimensionId;
+            }
+            this.hasEgg = checkForEgg();
+        }
+    }
+
+    public boolean checkForEgg() {
+        for (byte i = -5; i <= 5; i = (byte) (i + 1)) {
+            for (byte j = -5; j <= 5; j = (byte) (j + 1)) {
+                for (byte k = -5; k <= 5; k = (byte) (k + 1)) {
+                    if (getBaseMetaTileEntity().getBlockOffset(i, j, k) == Blocks.dragon_egg) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    public boolean hasDimensionalTeleportCapability() {
+        return (this.mDebug) || (this.hasEgg) || (mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)) && mFluid.amount >= 1000);
+    }
+
+    public boolean isDimensionalTeleportAvailable() {
+        return (this.mDebug) || ((hasDimensionalTeleportCapability()) && (GT_Utility.isRealDimension(this.mTargetD)) && (GT_Utility.isRealDimension(getBaseMetaTileEntity().getWorld().provider.dimensionId)));
+    }
+
+    @Override
+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        if (mFluid == null) {
+            mFluid = Materials.Nitrogen.getPlasma(0);
+        }
+        super.onPostTick(aBaseMetaTileEntity, aTick);
+        if (getBaseMetaTileEntity().isServerSide()) {
+            if (getBaseMetaTileEntity().getTimer() % 100L == 50L) {
+                this.hasEgg = checkForEgg();
+            }
+            if ((getBaseMetaTileEntity().isAllowedToWork()) && (getBaseMetaTileEntity().getRedstone())) {
+                if (getBaseMetaTileEntity().getStoredEU() > (V[mTier] * 16)) {
+                    if (mPassiveEnergyUse) {
+                        getBaseMetaTileEntity().decreaseStoredEnergyUnits((long) Math.pow(2, mTier), false);
+                    }
+                    if (hasDimensionalTeleportCapability() && this.mTargetD != getBaseMetaTileEntity().getWorld().provider.dimensionId && mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1))) {
+                        mFluid.amount--;
+                        if (mFluid.amount < 1) {
+                            mFluid = null;
+                        }
+                    }
+                    if (tTargetD != mTargetD || tTargetX != mTargetX || tTargetY != mTargetY || tTargetZ != mTargetZ) {
+                        tTargetD = mTargetD;
+                        tTargetX = mTargetX;
+                        tTargetY = mTargetY;
+                        tTargetZ = mTargetZ;
+                        if (this.mTargetD == getBaseMetaTileEntity().getWorld().provider.dimensionId) {
+                            tTile = getBaseMetaTileEntity().getTileEntity(this.mTargetX, this.mTargetY, this.mTargetZ);
+                        } else {
+                            World tWorld = DimensionManager.getWorld(this.mTargetD);
+                            if (tWorld != null) {
+                                tTile = tWorld.getTileEntity(this.mTargetX, this.mTargetY, this.mTargetZ);
+                            }
+                        }
+                    }
+                    int tDistance = distanceCalculation();
+                    long tEnergyTrans = Math.min(V[mTier], getBaseMetaTileEntity().getStoredEU());
+                    if (tTile != null && tTile instanceof IEnergyConnected) {
+                        if (((IEnergyConnected) tTile).injectEnergyUnits((byte) 6, V[mTier], 1) > 0) {
+                            int tLoss = 1;
+                            if (mMaxLossDistance != 0) {
+                                tLoss = 10 + tDistance * (mMaxLoss - 10) / mMaxLossDistance;
+                            }
+                            getBaseMetaTileEntity().decreaseStoredEnergyUnits(V[mTier] + ((V[mTier] * tLoss) / 100), false);
+                        }
+                    }
+                }
+                getBaseMetaTileEntity().setActive(true);
+            } else {
+                getBaseMetaTileEntity().setActive(false);
+            }
+        }
+    }
+
+    private int distanceCalculation() {
+        return Math.abs(((this.mTargetD != getBaseMetaTileEntity().getWorld().provider.dimensionId) && (isDimensionalTeleportAvailable()) ? 100 : 1) * (int) Math.sqrt(Math.pow(getBaseMetaTileEntity().getXCoord() - this.mTargetX, 2.0D) + Math.pow(getBaseMetaTileEntity().getYCoord() - this.mTargetY, 2.0D) + Math.pow(getBaseMetaTileEntity().getZCoord() - this.mTargetZ, 2.0D)));
+    }
+
+    @Override
+    public boolean isSimpleMachine() {
+        return false;
+    }
+
+    @Override
+    public boolean isOverclockerUpgradable() {
+        return false;
+    }
+
+    @Override
+    public boolean isTransformerUpgradable() {
+        return false;
+    }
+
+    @Override
+    public boolean isElectric() {
+        return true;
+    }
+
+    @Override
+    public boolean isFacingValid(byte aFacing) {
+        return true;
+    }
+
+    @Override
+    public boolean isEnetInput() {
+        return true;
+    }
+
+    @Override
+    public boolean isInputFacing(byte aSide) {
+        return true;
+    }
+
+    @Override
+    public boolean isOutputFacing(byte aSide) {
+        return false;
+    }
+
+    @Override
+    public boolean isTeleporterCompatible() {
+        return false;
+    }
+
+    @Override
+    public long getMinimumStoredEU() {
+        return V[mTier] * 16;
+    }
+
+    @Override
+    public long maxEUStore() {
+        return V[mTier] * 256;
+    }
+
+    @Override
+    public long maxEUInput() {
+        return V[mTier];
+    }
+
+    @Override
+    public long maxSteamStore() {
+        return maxEUStore();
+    }
+
+    @Override
+    public long maxAmperesIn() {
+        return 3;
+    }
+
+    @Override
+    public int getStackDisplaySlot() {
+        return 2;
+    }
+
+    @Override
+    public boolean isAccessAllowed(EntityPlayer aPlayer) {
+        return true;
+    }
+
+    @Override
+    public int getInputSlot() {
+        return 0;
+    }
+
+    @Override
+    public int getOutputSlot() {
+        return 0;
+    }
+
+    @Override
+    public int getCapacity() {
+        return 64000;
+    }
+
+    @Override
+    public boolean doesFillContainers() {
+        return false;
+    }
+
+    @Override
+    public boolean doesEmptyContainers() {
+        return false;
+    }
+
+    @Override
+    public boolean canTankBeFilled() {
+        return true;
+    }
+
+    @Override
+    public boolean canTankBeEmptied() {
+        return true;
+    }
+
+    @Override
+    public boolean displaysItemStack() {
+        return false;
+    }
+
+    @Override
+    public boolean displaysStackSize() {
+        return false;
+    }
+
+    @Override
+    public ITexture[][][] getTextureSet(ITexture[] aTextures) {
+        return null;
+    }
+
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java
index 88434e315f..2ba2cd140b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java
@@ -17,7 +17,7 @@ public class GT_MetaTileEntity_MonsterRepellent extends GT_MetaTileEntity_Tiered
     public int mRange = 16;
 
     public GT_MetaTileEntity_MonsterRepellent(int aID, String aName, String aNameRegional, int aTier) {
-        super(aID, aName, aNameRegional, aTier, 0, "Reprells nasty Creatures. Range: " + (4 + (12 * aTier)) + " unpowered / " + (16 + (48 * aTier)) + " powered");
+        super(aID, aName, aNameRegional, aTier, 0, "Repels nasty Creatures. Range: " + (4 + (12 * aTier)) + " unpowered / " + (16 + (48 * aTier)) + " powered");
     }
 
     public GT_MetaTileEntity_MonsterRepellent(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
index 2dcde9c082..57bfea5a97 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
@@ -1,139 +1,139 @@
-package gregtech.common.tileentities.machines.basic;

-

-import gregtech.api.enums.Materials;

-import gregtech.api.enums.OrePrefixes;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.ITexture;

-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

-import gregtech.api.metatileentity.MetaTileEntity;

-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

-import gregtech.api.objects.GT_RenderedTexture;

-import gregtech.api.util.GT_OreDictUnificator;

-import gregtech.api.util.GT_Recipe;

-import gregtech.api.util.GT_Utility;

-import net.minecraft.init.Items;

-import net.minecraft.item.ItemStack;

-import net.minecraftforge.fluids.FluidRegistry;

-import net.minecraftforge.fluids.FluidStack;

-

-public class GT_MetaTileEntity_PotionBrewer

-        extends GT_MetaTileEntity_BasicMachine {

-    public GT_MetaTileEntity_PotionBrewer(int aID, String aName, String aNameRegional, int aTier) {

-        super(aID, aName, aNameRegional, aTier, 1, "Brewing your Drinks", 1, 0, "PotionBrewer.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_POTIONBREWER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_POTIONBREWER)});

-    }

-

-    public GT_MetaTileEntity_PotionBrewer(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {

-        super(aName, aTier, 1, aDescription, aTextures, 1, 0, aGUIName, aNEIName);

-    }

-

-    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

-        return new GT_MetaTileEntity_PotionBrewer(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

-    }

-

-    public GT_Recipe.GT_Recipe_Map getRecipeList() {

-        return GT_Recipe.GT_Recipe_Map.sBrewingRecipes;

-    }

-

-    public int checkRecipe() {

-        int tCheck = super.checkRecipe();

-        if (tCheck != 0) {

-            return tCheck;

-        }

-        FluidStack aFluid = getFillableStack();

-        if ((getDrainableStack() == null) && (aFluid != null) && (getInputAt(0) != null)) {

-            String tInputName = aFluid.getFluid().getName();

-            if (tInputName.startsWith("potion.")) {

-                tInputName = tInputName.replaceFirst("potion.", "");

-                int tFirstDot = tInputName.indexOf('.') + 1;

-                String tModifier = tFirstDot <= 0 ? "" : tInputName.substring(tFirstDot);

-                if (!tModifier.isEmpty()) {

-                    tInputName = tInputName.replaceFirst("." + tModifier, "");

-                }

-                if (GT_Utility.areStacksEqual(new ItemStack(Items.fermented_spider_eye, 1, 0), getInputAt(0))) {

-                    if (tInputName.equals("poison")) {

-                        return setOutput("potion.damage" + tModifier);

-                    }

-                    if (tInputName.equals("health")) {

-                        return setOutput("potion.damage" + tModifier);

-                    }

-                    if (tInputName.equals("waterbreathing")) {

-                        return setOutput("potion.damage" + tModifier);

-                    }

-                    if (tInputName.equals("nightvision")) {

-                        return setOutput("potion.invisibility" + tModifier);

-                    }

-                    if (tInputName.equals("fireresistance")) {

-                        return setOutput("potion.slowness" + tModifier);

-                    }

-                    if (tInputName.equals("speed")) {

-                        return setOutput("potion.slowness" + tModifier);

-                    }

-                    if (tInputName.equals("strength")) {

-                        return setOutput("potion.weakness" + tModifier);

-                    }

-                    if (tInputName.equals("regen")) {

-                        return setOutput("potion.poison" + tModifier);

-                    }

-                    return setOutput("potion.weakness");

-                }

-                if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L), getInputAt(0))) {

-                    if (!tModifier.startsWith("strong")) {

-                        return setOutput("potion." + tInputName + ".strong" + (tModifier.isEmpty() ? "" : new StringBuilder().append(".").append(tModifier).toString()));

-                    }

-                    if (tModifier.startsWith("long")) {

-                        return setOutput("potion." + tInputName + tModifier.replaceFirst("long", ""));

-                    }

-                    return setOutput("potion.thick");

-                }

-                if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), getInputAt(0))) {

-                    if (!tModifier.startsWith("long")) {

-                        return setOutput("potion." + tInputName + ".long" + (tModifier.isEmpty() ? "" : new StringBuilder().append(".").append(tModifier).toString()));

-                    }

-                    if (tModifier.startsWith("strong")) {

-                        return setOutput("potion." + tInputName + tModifier.replaceFirst("strong", ""));

-                    }

-                    return setOutput("potion.mundane");

-                }

-                if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1L), getInputAt(0))) {

-                    if (!tInputName.endsWith(".splash")) {

-                        return setOutput("potion." + tInputName + ".splash");

-                    }

-                    return setOutput("potion.mundane");

-                }

-            }

-        }

-        return 0;

-    }

-

-    private final int setOutput(String aFluidName) {

-        this.mOutputFluid = FluidRegistry.getFluidStack(aFluidName, 750);

-        if (this.mOutputFluid == null) {

-            this.mOutputFluid = FluidRegistry.getFluidStack("potion.mundane", getFillableStack().amount);

-            getInputAt(0).stackSize -= 1;

-            getFillableStack().amount = 0;

-            this.mEUt = (4 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-            this.mMaxProgresstime = (128 / (1 << this.mTier - 1));

-            return 2;

-        }

-        if (getFillableStack().amount < 750) {

-            return 0;

-        }

-        getInputAt(0).stackSize -= 1;

-        getFillableStack().amount -= 750;

-        this.mEUt = (4 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-        this.mMaxProgresstime = (128 / (1 << this.mTier - 1));

-        return 2;

-    }

-

-    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {

-        return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (getRecipeList().containsInput(aStack));

-    }

-

-    public boolean isFluidInputAllowed(FluidStack aFluid) {

-        return (aFluid.getFluid().getName().startsWith("potion.")) || (super.isFluidInputAllowed(aFluid));

-    }

-

-    public int getCapacity() {

-        return 750;

-    }

-}

+package gregtech.common.tileentities.machines.basic;
+
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
+public class GT_MetaTileEntity_PotionBrewer
+        extends GT_MetaTileEntity_BasicMachine {
+    public GT_MetaTileEntity_PotionBrewer(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, 1, "Brewing your Drinks", 1, 0, "PotionBrewer.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_POTIONBREWER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_POTIONBREWER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_POTIONBREWER)});
+    }
+
+    public GT_MetaTileEntity_PotionBrewer(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+        super(aName, aTier, 1, aDescription, aTextures, 1, 0, aGUIName, aNEIName);
+    }
+
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_PotionBrewer(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+    }
+
+    public GT_Recipe.GT_Recipe_Map getRecipeList() {
+        return GT_Recipe.GT_Recipe_Map.sBrewingRecipes;
+    }
+
+    public int checkRecipe() {
+        int tCheck = super.checkRecipe();
+        if (tCheck != 0) {
+            return tCheck;
+        }
+        FluidStack aFluid = getFillableStack();
+        if ((getDrainableStack() == null) && (aFluid != null) && (getInputAt(0) != null)) {
+            String tInputName = aFluid.getFluid().getName();
+            if (tInputName.startsWith("potion.")) {
+                tInputName = tInputName.replaceFirst("potion.", "");
+                int tFirstDot = tInputName.indexOf('.') + 1;
+                String tModifier = tFirstDot <= 0 ? "" : tInputName.substring(tFirstDot);
+                if (!tModifier.isEmpty()) {
+                    tInputName = tInputName.replaceFirst("." + tModifier, "");
+                }
+                if (GT_Utility.areStacksEqual(new ItemStack(Items.fermented_spider_eye, 1, 0), getInputAt(0))) {
+                    if (tInputName.equals("poison")) {
+                        return setOutput("potion.damage" + tModifier);
+                    }
+                    if (tInputName.equals("health")) {
+                        return setOutput("potion.damage" + tModifier);
+                    }
+                    if (tInputName.equals("waterbreathing")) {
+                        return setOutput("potion.damage" + tModifier);
+                    }
+                    if (tInputName.equals("nightvision")) {
+                        return setOutput("potion.invisibility" + tModifier);
+                    }
+                    if (tInputName.equals("fireresistance")) {
+                        return setOutput("potion.slowness" + tModifier);
+                    }
+                    if (tInputName.equals("speed")) {
+                        return setOutput("potion.slowness" + tModifier);
+                    }
+                    if (tInputName.equals("strength")) {
+                        return setOutput("potion.weakness" + tModifier);
+                    }
+                    if (tInputName.equals("regen")) {
+                        return setOutput("potion.poison" + tModifier);
+                    }
+                    return setOutput("potion.weakness");
+                }
+                if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L), getInputAt(0))) {
+                    if (!tModifier.startsWith("strong")) {
+                        return setOutput("potion." + tInputName + ".strong" + (tModifier.isEmpty() ? "" : new StringBuilder().append(".").append(tModifier).toString()));
+                    }
+                    if (tModifier.startsWith("long")) {
+                        return setOutput("potion." + tInputName + tModifier.replaceFirst("long", ""));
+                    }
+                    return setOutput("potion.thick");
+                }
+                if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), getInputAt(0))) {
+                    if (!tModifier.startsWith("long")) {
+                        return setOutput("potion." + tInputName + ".long" + (tModifier.isEmpty() ? "" : new StringBuilder().append(".").append(tModifier).toString()));
+                    }
+                    if (tModifier.startsWith("strong")) {
+                        return setOutput("potion." + tInputName + tModifier.replaceFirst("strong", ""));
+                    }
+                    return setOutput("potion.mundane");
+                }
+                if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1L), getInputAt(0))) {
+                    if (!tInputName.endsWith(".splash")) {
+                        return setOutput("potion." + tInputName + ".splash");
+                    }
+                    return setOutput("potion.mundane");
+                }
+            }
+        }
+        return 0;
+    }
+
+    private final int setOutput(String aFluidName) {
+        this.mOutputFluid = FluidRegistry.getFluidStack(aFluidName, 750);
+        if (this.mOutputFluid == null) {
+            this.mOutputFluid = FluidRegistry.getFluidStack("potion.mundane", getFillableStack().amount);
+            getInputAt(0).stackSize -= 1;
+            getFillableStack().amount = 0;
+            this.mEUt = (4 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+            this.mMaxProgresstime = (128 / (1 << this.mTier - 1));
+            return 2;
+        }
+        if (getFillableStack().amount < 750) {
+            return 0;
+        }
+        getInputAt(0).stackSize -= 1;
+        getFillableStack().amount -= 750;
+        this.mEUt = (4 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+        this.mMaxProgresstime = (128 / (1 << this.mTier - 1));
+        return 2;
+    }
+
+    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+        return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (getRecipeList().containsInput(aStack));
+    }
+
+    public boolean isFluidInputAllowed(FluidStack aFluid) {
+        return (aFluid.getFluid().getName().startsWith("potion.")) || (super.isFluidInputAllowed(aFluid));
+    }
+
+    public int getCapacity() {
+        return 750;
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java
index 2f1eecdd91..312047cc8d 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java
@@ -1,53 +1,53 @@
-package gregtech.common.tileentities.machines.basic;

-

-import gregtech.api.enums.OrePrefixes;

-import gregtech.api.interfaces.ITexture;

-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;

-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

-import gregtech.api.util.GT_OreDictUnificator;

-import gregtech.api.util.GT_Recipe;

-import gregtech.api.util.GT_Utility;

-import net.minecraft.item.ItemStack;

-

-import java.util.ArrayList;

-

-public class GT_MetaTileEntity_Printer

-        extends GT_MetaTileEntity_BasicMachine {

-    public GT_MetaTileEntity_Printer(int aID, String aName, String aNameRegional, int aTier) {

-        super(aID, aName, aNameRegional, aTier, 1, "It can copy Books and paint Stuff", 1, 1, "Printer.png", GT_Recipe.GT_Recipe_Map.sPrinterRecipes.mNEIName, new ITexture[0]);

-    }

-

-    public GT_MetaTileEntity_Printer(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {

-        super(aName, aTier, 1, aDescription, aTextures, 2, 2, aGUIName, aNEIName);

-    }

-

-    public int checkRecipe() {

-        if (getOutputAt(0) != null) {

-            this.mOutputBlocked += 1;

-        } else if ((GT_Utility.isStackValid(getInputAt(0))) && (getInputAt(0).stackSize > 0) &&

-                (GT_Utility.isStackInvalid(getSpecialSlot())) &&

-                (OrePrefixes.block.contains(getInputAt(0)))) {

-            ArrayList<ItemStack> tList = GT_OreDictUnificator.getOres(GT_OreDictUnificator.getAssociation(getInputAt(0)));

-            if (tList.size() > 1) {

-                tList.add(tList.get(0));

-                int i = 0;

-                for (int j = tList.size() - 1; i < j; i++) {

-                    if (GT_Utility.areStacksEqual(getInputAt(0), (ItemStack) tList.get(i))) {

-                        this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{tList.get(i + 1)});

-                        this.mEUt = (1 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-                        this.mMaxProgresstime = (32 / (1 << this.mTier - 1));

-                        getInputAt(0).stackSize -= 1;

-                        return 2;

-                    }

-                }

-            }

-        }

-        this.mMaxProgresstime = 0;

-        return 0;

-    }

-

-    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

-        return null;

-    }

-}

+package gregtech.common.tileentities.machines.basic;
+
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.item.ItemStack;
+
+import java.util.ArrayList;
+
+public class GT_MetaTileEntity_Printer
+        extends GT_MetaTileEntity_BasicMachine {
+    public GT_MetaTileEntity_Printer(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, 1, "It can copy Books and paint Stuff", 1, 1, "Printer.png", GT_Recipe.GT_Recipe_Map.sPrinterRecipes.mNEIName, new ITexture[0]);
+    }
+
+    public GT_MetaTileEntity_Printer(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+        super(aName, aTier, 1, aDescription, aTextures, 2, 2, aGUIName, aNEIName);
+    }
+
+    public int checkRecipe() {
+        if (getOutputAt(0) != null) {
+            this.mOutputBlocked += 1;
+        } else if ((GT_Utility.isStackValid(getInputAt(0))) && (getInputAt(0).stackSize > 0) &&
+                (GT_Utility.isStackInvalid(getSpecialSlot())) &&
+                (OrePrefixes.block.contains(getInputAt(0)))) {
+            ArrayList<ItemStack> tList = GT_OreDictUnificator.getOres(GT_OreDictUnificator.getAssociation(getInputAt(0)));
+            if (tList.size() > 1) {
+                tList.add(tList.get(0));
+                int i = 0;
+                for (int j = tList.size() - 1; i < j; i++) {
+                    if (GT_Utility.areStacksEqual(getInputAt(0), (ItemStack) tList.get(i))) {
+                        this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{tList.get(i + 1)});
+                        this.mEUt = (1 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+                        this.mMaxProgresstime = (32 / (1 << this.mTier - 1));
+                        getInputAt(0).stackSize -= 1;
+                        return 2;
+                    }
+                }
+            }
+        }
+        this.mMaxProgresstime = 0;
+        return 0;
+    }
+
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return null;
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
index b1ba0101e0..6aabea8286 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
@@ -203,7 +203,6 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch {
             getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord(), y, getBaseMetaTileEntity().getZCoord(),
                     GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L)));
             getBaseMetaTileEntity().decrStackSize(0, 1);
-
         }
         return y;
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
index 6f3818b47e..a9c2d6f216 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
@@ -1,95 +1,95 @@
-package gregtech.common.tileentities.machines.basic;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.*;

-import gregtech.api.interfaces.ITexture;

-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

-import gregtech.api.metatileentity.MetaTileEntity;

-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

-import gregtech.api.objects.GT_RenderedTexture;

-import gregtech.api.util.GT_OreDictUnificator;

-import gregtech.api.util.GT_Utility;

-import gregtech.common.items.behaviors.Behaviour_DataOrb;

-import net.minecraft.item.ItemStack;

-import net.minecraftforge.fluids.FluidStack;

-

-import java.util.Iterator;

-

-public class GT_MetaTileEntity_Replicator

-        extends GT_MetaTileEntity_BasicMachine {

-    private static int sHeaviestElementMass = 0;

-

-    public GT_MetaTileEntity_Replicator(int aID, String aName, String aNameRegional, int aTier) {

-        super(aID, aName, aNameRegional, aTier, 1, "Producing Elemental Matter", 1, 1, "Replicator.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_REPLICATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_REPLICATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_REPLICATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_REPLICATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_REPLICATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_REPLICATOR)});

-    }

-

-    public GT_MetaTileEntity_Replicator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {

-        super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);

-    }

-

-    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

-        return new GT_MetaTileEntity_Replicator(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

-    }

-

-    public int checkRecipe() {

-        FluidStack tFluid = getFillableStack();

-        if ((tFluid != null) && (tFluid.isFluidEqual(Materials.UUMatter.getFluid(1L)))) {

-            ItemStack tDataOrb = getSpecialSlot();

-            if ((ItemList.Tool_DataOrb.isStackEqual(tDataOrb, false, true)) && (Behaviour_DataOrb.getDataTitle(tDataOrb).equals("Elemental-Scan"))) {

-                Materials tMaterial = (Materials) Element.get(Behaviour_DataOrb.getDataName(tDataOrb)).mLinkedMaterials.get(0);

-                long tMass = tMaterial.getMass();

-                if ((tFluid.amount >= tMass) && (tMass > 0L)) {

-                    this.mEUt = ((int) gregtech.api.enums.GT_Values.V[this.mTier]);

-                    this.mMaxProgresstime = ((int) (tMass * 512L / (1 << this.mTier - 1)));

-                    if ((this.mOutputItems[0] = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, 1L)) == null) {

-                        if ((this.mOutputItems[0] = GT_OreDictUnificator.get(OrePrefixes.cell, tMaterial, 1L)) != null) {

-                            if ((this.mOutputFluid = GT_Utility.getFluidForFilledItem(this.mOutputItems[0], true)) == null) {

-                                if (ItemList.Cell_Empty.isStackEqual(getInputAt(0))) {

-                                    if (canOutput(new ItemStack[]{this.mOutputItems[0]})) {

-                                        getInputAt(0).stackSize -= 1;

-                                        FluidStack

-                                                tmp231_230 = tFluid;

-                                        tmp231_230.amount = ((int) (tmp231_230.amount - tMass));

-                                        return 2;

-                                    }

-                                }

-                            } else {

-                                this.mOutputItems[0] = null;

-                                if ((getDrainableStack() == null) || ((getDrainableStack().isFluidEqual(this.mOutputFluid)) && (getDrainableStack().amount < 16000))) {

-                                    FluidStack tmp287_286 = tFluid;

-                                    tmp287_286.amount = ((int) (tmp287_286.amount - tMass));

-                                    return 2;

-                                }

-                            }

-                        }

-                    } else if (canOutput(new ItemStack[]{this.mOutputItems[0]})) {

-                        FluidStack tmp322_321 = tFluid;

-                        tmp322_321.amount = ((int) (tmp322_321.amount - tMass));

-                        return 2;

-                    }

-                }

-            }

-        }

-        return 0;

-    }

-

-    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {

-        return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (ItemList.Cell_Empty.isStackEqual(aStack));

-    }

-

-    public boolean isFluidInputAllowed(FluidStack aFluid) {

-        return aFluid.isFluidEqual(Materials.UUMatter.getFluid(1L));

-    }

-

-    public int getCapacity() {

-        if ((sHeaviestElementMass == 0) && (GregTech_API.sPostloadFinished)) {

-            Materials tMaterial;

-            for (Iterator i$ = Materials.VALUES.iterator(); i$.hasNext(); sHeaviestElementMass = Math.max(sHeaviestElementMass, (int) tMaterial.getMass())) {

-                tMaterial = (Materials) i$.next();

-                if ((tMaterial.mElement == null) || (tMaterial.mElement.mIsIsotope)) {

-                }

-            }

-        }

-        return sHeaviestElementMass;

-    }

-}

+package gregtech.common.tileentities.machines.basic;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.*;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.items.behaviors.Behaviour_DataOrb;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+import java.util.Iterator;
+
+public class GT_MetaTileEntity_Replicator
+        extends GT_MetaTileEntity_BasicMachine {
+    private static int sHeaviestElementMass = 0;
+
+    public GT_MetaTileEntity_Replicator(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, 1, "Producing Elemental Matter", 1, 1, "Replicator.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_REPLICATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_REPLICATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_REPLICATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_REPLICATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_REPLICATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_REPLICATOR)});
+    }
+
+    public GT_MetaTileEntity_Replicator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+        super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
+    }
+
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_Replicator(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+    }
+
+    public int checkRecipe() {
+        FluidStack tFluid = getFillableStack();
+        if ((tFluid != null) && (tFluid.isFluidEqual(Materials.UUMatter.getFluid(1L)))) {
+            ItemStack tDataOrb = getSpecialSlot();
+            if ((ItemList.Tool_DataOrb.isStackEqual(tDataOrb, false, true)) && (Behaviour_DataOrb.getDataTitle(tDataOrb).equals("Elemental-Scan"))) {
+                Materials tMaterial = (Materials) Element.get(Behaviour_DataOrb.getDataName(tDataOrb)).mLinkedMaterials.get(0);
+                long tMass = tMaterial.getMass();
+                if ((tFluid.amount >= tMass) && (tMass > 0L)) {
+                    this.mEUt = ((int) gregtech.api.enums.GT_Values.V[this.mTier]);
+                    this.mMaxProgresstime = ((int) (tMass * 512L / (1 << this.mTier - 1)));
+                    if ((this.mOutputItems[0] = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, 1L)) == null) {
+                        if ((this.mOutputItems[0] = GT_OreDictUnificator.get(OrePrefixes.cell, tMaterial, 1L)) != null) {
+                            if ((this.mOutputFluid = GT_Utility.getFluidForFilledItem(this.mOutputItems[0], true)) == null) {
+                                if (ItemList.Cell_Empty.isStackEqual(getInputAt(0))) {
+                                    if (canOutput(new ItemStack[]{this.mOutputItems[0]})) {
+                                        getInputAt(0).stackSize -= 1;
+                                        FluidStack
+                                                tmp231_230 = tFluid;
+                                        tmp231_230.amount = ((int) (tmp231_230.amount - tMass));
+                                        return 2;
+                                    }
+                                }
+                            } else {
+                                this.mOutputItems[0] = null;
+                                if ((getDrainableStack() == null) || ((getDrainableStack().isFluidEqual(this.mOutputFluid)) && (getDrainableStack().amount < 16000))) {
+                                    FluidStack tmp287_286 = tFluid;
+                                    tmp287_286.amount = ((int) (tmp287_286.amount - tMass));
+                                    return 2;
+                                }
+                            }
+                        }
+                    } else if (canOutput(new ItemStack[]{this.mOutputItems[0]})) {
+                        FluidStack tmp322_321 = tFluid;
+                        tmp322_321.amount = ((int) (tmp322_321.amount - tMass));
+                        return 2;
+                    }
+                }
+            }
+        }
+        return 0;
+    }
+
+    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+        return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (ItemList.Cell_Empty.isStackEqual(aStack));
+    }
+
+    public boolean isFluidInputAllowed(FluidStack aFluid) {
+        return aFluid.isFluidEqual(Materials.UUMatter.getFluid(1L));
+    }
+
+    public int getCapacity() {
+        if ((sHeaviestElementMass == 0) && (GregTech_API.sPostloadFinished)) {
+            Materials tMaterial;
+            for (Iterator i$ = Materials.VALUES.iterator(); i$.hasNext(); sHeaviestElementMass = Math.max(sHeaviestElementMass, (int) tMaterial.getMass())) {
+                tMaterial = (Materials) i$.next();
+                if ((tMaterial.mElement == null) || (tMaterial.mElement.mIsIsotope)) {
+                }
+            }
+        }
+        return sHeaviestElementMass;
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java
index 171c6a847a..54bb105274 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java
@@ -1,68 +1,68 @@
-package gregtech.common.tileentities.machines.basic;

-

-import gregtech.api.enums.Materials;

-import gregtech.api.enums.OrePrefixes;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.ITexture;

-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

-import gregtech.api.metatileentity.MetaTileEntity;

-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

-import gregtech.api.objects.GT_RenderedTexture;

-import gregtech.api.util.GT_OreDictUnificator;

-import gregtech.api.util.GT_Recipe;

-import gregtech.api.util.GT_Utility;

-import net.minecraft.init.Blocks;

-import net.minecraft.item.ItemStack;

-

-public class GT_MetaTileEntity_RockBreaker

-        extends GT_MetaTileEntity_BasicMachine {

-    public GT_MetaTileEntity_RockBreaker(int aID, String aName, String aNameRegional, int aTier) {

-        super(aID, aName, aNameRegional, aTier, 1, "Put Lava and Water adjacent", 1, 1, "RockBreaker.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER)});

-    }

-

-    public GT_MetaTileEntity_RockBreaker(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {

-        super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);

-    }

-

-    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

-        return new GT_MetaTileEntity_RockBreaker(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

-    }

-

-    public GT_Recipe.GT_Recipe_Map getRecipeList() {

-        return GT_Recipe.GT_Recipe_Map.sRockBreakerFakeRecipes;

-    }

-

-    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {

-        return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (getRecipeList().containsInput(aStack));

-    }

-

-    public int checkRecipe() {

-        IGregTechTileEntity aBaseMetaTileEntity = getBaseMetaTileEntity();

-        if ((aBaseMetaTileEntity.getBlockOffset(0, 0, 1) == Blocks.water) || (aBaseMetaTileEntity.getBlockOffset(0, 0, -1) == Blocks.water) || (aBaseMetaTileEntity.getBlockOffset(-1, 0, 0) == Blocks.water) || (aBaseMetaTileEntity.getBlockOffset(1, 0, 0) == Blocks.water)) {

-            ItemStack tOutput = null;

-            if (aBaseMetaTileEntity.getBlockOffset(0, 1, 0) == Blocks.lava) {

-                tOutput = new ItemStack(Blocks.stone, 1);

-            } else if ((aBaseMetaTileEntity.getBlockOffset(0, 0, 1) == Blocks.lava) || (aBaseMetaTileEntity.getBlockOffset(0, 0, -1) == Blocks.lava) || (aBaseMetaTileEntity.getBlockOffset(-1, 0, 0) == Blocks.lava) || (aBaseMetaTileEntity.getBlockOffset(1, 0, 0) == Blocks.lava)) {

-                tOutput = new ItemStack(Blocks.cobblestone, 1);

-            }

-            if (tOutput != null) {

-                if (GT_Utility.areStacksEqual(getInputAt(0), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L))) {

-                    tOutput = new ItemStack(Blocks.obsidian, 1);

-                    if (canOutput(new ItemStack[]{tOutput})) {

-                        getInputAt(0).stackSize -= 1;

-                        this.mOutputItems[0] = tOutput;

-                        this.mMaxProgresstime = (128 / (1 << this.mTier - 1));

-                        this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-                        return 2;

-                    }

-                } else if (canOutput(new ItemStack[]{tOutput})) {

-                    this.mOutputItems[0] = tOutput;

-                    this.mMaxProgresstime = (16 / (1 << this.mTier - 1));

-                    this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-                    return 2;

-                }

-            }

-        }

-        return 0;

-    }

-}

+package gregtech.common.tileentities.machines.basic;
+
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+
+public class GT_MetaTileEntity_RockBreaker
+        extends GT_MetaTileEntity_BasicMachine {
+    public GT_MetaTileEntity_RockBreaker(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, 1, "Put Lava and Water adjacent", 1, 1, "RockBreaker.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER)});
+    }
+
+    public GT_MetaTileEntity_RockBreaker(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+        super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
+    }
+
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_RockBreaker(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+    }
+
+    public GT_Recipe.GT_Recipe_Map getRecipeList() {
+        return GT_Recipe.GT_Recipe_Map.sRockBreakerFakeRecipes;
+    }
+
+    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+        return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (getRecipeList().containsInput(aStack));
+    }
+
+    public int checkRecipe() {
+        IGregTechTileEntity aBaseMetaTileEntity = getBaseMetaTileEntity();
+        if ((aBaseMetaTileEntity.getBlockOffset(0, 0, 1) == Blocks.water) || (aBaseMetaTileEntity.getBlockOffset(0, 0, -1) == Blocks.water) || (aBaseMetaTileEntity.getBlockOffset(-1, 0, 0) == Blocks.water) || (aBaseMetaTileEntity.getBlockOffset(1, 0, 0) == Blocks.water)) {
+            ItemStack tOutput = null;
+            if (aBaseMetaTileEntity.getBlockOffset(0, 1, 0) == Blocks.lava) {
+                tOutput = new ItemStack(Blocks.stone, 1);
+            } else if ((aBaseMetaTileEntity.getBlockOffset(0, 0, 1) == Blocks.lava) || (aBaseMetaTileEntity.getBlockOffset(0, 0, -1) == Blocks.lava) || (aBaseMetaTileEntity.getBlockOffset(-1, 0, 0) == Blocks.lava) || (aBaseMetaTileEntity.getBlockOffset(1, 0, 0) == Blocks.lava)) {
+                tOutput = new ItemStack(Blocks.cobblestone, 1);
+            }
+            if (tOutput != null) {
+                if (GT_Utility.areStacksEqual(getInputAt(0), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L))) {
+                    tOutput = new ItemStack(Blocks.obsidian, 1);
+                    if (canOutput(new ItemStack[]{tOutput})) {
+                        getInputAt(0).stackSize -= 1;
+                        this.mOutputItems[0] = tOutput;
+                        this.mMaxProgresstime = (128 / (1 << this.mTier - 1));
+                        this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+                        return 2;
+                    }
+                } else if (canOutput(new ItemStack[]{tOutput})) {
+                    this.mOutputItems[0] = tOutput;
+                    this.mMaxProgresstime = (16 / (1 << this.mTier - 1));
+                    this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+                    return 2;
+                }
+            }
+        }
+        return 0;
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
index bb1afd3a74..90746e3fbd 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
@@ -1,177 +1,191 @@
-package gregtech.common.tileentities.machines.basic;

-

-import forestry.api.genetics.AlleleManager;

-import forestry.api.genetics.IIndividual;

-import gregtech.GT_Mod;

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.*;

-import gregtech.api.interfaces.ITexture;

-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

-import gregtech.api.metatileentity.MetaTileEntity;

-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

-import gregtech.api.objects.GT_RenderedTexture;

-import gregtech.api.objects.ItemData;

-import gregtech.api.util.GT_Log;

-import gregtech.api.util.GT_OreDictUnificator;

-import gregtech.api.util.GT_Recipe;

-import gregtech.api.util.GT_Utility;

-import gregtech.common.items.behaviors.Behaviour_DataOrb;

-import net.minecraft.init.Items;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-

-public class GT_MetaTileEntity_Scanner

-        extends GT_MetaTileEntity_BasicMachine {

-    public GT_MetaTileEntity_Scanner(int aID, String aName, String aNameRegional, int aTier) {

-        super(aID, aName, aNameRegional, aTier, 1, "Scans Crops and other things.", 1, 1, "Scanner.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_SCANNER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_SCANNER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_SCANNER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_SCANNER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_SCANNER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_SCANNER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER)});

-    }

-

-    public GT_MetaTileEntity_Scanner(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {

-        super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);

-    }

-

-    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

-        return new GT_MetaTileEntity_Scanner(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

-    }

-

-    public int checkRecipe() {

-        ItemStack aStack = getInputAt(0);

-        if (getOutputAt(0) != null) {

-            this.mOutputBlocked += 1;

-        } else if ((GT_Utility.isStackValid(aStack)) && (aStack.stackSize > 0)) {

-            if ((getFillableStack() != null) && (getFillableStack().containsFluid(Materials.Honey.getFluid(100L)))) {

-                try {

-                    Object tIndividual = AlleleManager.alleleRegistry.getIndividual(aStack);

-                    if (tIndividual != null) {

-                        if (((IIndividual) tIndividual).analyze()) {

-                            getFillableStack().amount -= 100;

-                            this.mOutputItems[0] = GT_Utility.copy(new Object[]{aStack});

-                            aStack.stackSize = 0;

-                            NBTTagCompound tNBT = new NBTTagCompound();

-                            ((IIndividual) tIndividual).writeToNBT(tNBT);

-                            this.mOutputItems[0].setTagCompound(tNBT);

-                            this.mMaxProgresstime = (500 / (1 << this.mTier - 1));

-                            this.mEUt = (2 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-                            return 2;

-                        }

-                        this.mOutputItems[0] = GT_Utility.copy(new Object[]{aStack});

-                        aStack.stackSize = 0;

-                        this.mMaxProgresstime = 1;

-                        this.mEUt = 1;

-                        return 2;

-                    }

-                } catch (Throwable e) {

-                    if (GT_Values.D1) {

-                        e.printStackTrace(GT_Log.err);

-                    }

-                }

-            }

-            if (ItemList.IC2_Crop_Seeds.isStackEqual(aStack, true, true)) {

-                NBTTagCompound tNBT = aStack.getTagCompound();

-                if (tNBT == null) {

-                    tNBT = new NBTTagCompound();

-                }

-                if (tNBT.getByte("scan") < 4) {

-                    tNBT.setByte("scan", (byte) 4);

-                    this.mMaxProgresstime = (160 / (1 << this.mTier - 1));

-                    this.mEUt = (8 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-                } else {

-                    this.mMaxProgresstime = 1;

-                    this.mEUt = 1;

-                }

-                aStack.stackSize -= 1;

-                this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{aStack});

-                this.mOutputItems[0].setTagCompound(tNBT);

-                return 2;

-            }

-            if (ItemList.Tool_DataOrb.isStackEqual(getSpecialSlot(), false, true)) {

-                if (ItemList.Tool_DataOrb.isStackEqual(aStack, false, true)) {

-                    aStack.stackSize -= 1;

-                    this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{getSpecialSlot()});

-                    this.mMaxProgresstime = (512 / (1 << this.mTier - 1));

-                    this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-                    return 2;

-                }

-                ItemData tData = GT_OreDictUnificator.getAssociation(aStack);

-                if ((tData != null) && ((tData.mPrefix == OrePrefixes.dust) || (tData.mPrefix == OrePrefixes.cell)) && (tData.mMaterial.mMaterial.mElement != null) && (!tData.mMaterial.mMaterial.mElement.mIsIsotope) && (tData.mMaterial.mMaterial != Materials.Magic) && (tData.mMaterial.mMaterial.getMass() > 0L)) {

-                    getSpecialSlot().stackSize -= 1;

-                    aStack.stackSize -= 1;

-

-                    this.mOutputItems[0] = ItemList.Tool_DataOrb.get(1L, new Object[0]);

-                    Behaviour_DataOrb.setDataTitle(this.mOutputItems[0], "Elemental-Scan");

-                    Behaviour_DataOrb.setDataName(this.mOutputItems[0], tData.mMaterial.mMaterial.mElement.name());

-                    this.mMaxProgresstime = ((int) (tData.mMaterial.mMaterial.getMass() * 8192L / (1 << this.mTier - 1)));

-                    this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-                    return 2;

-                }

-            }

-            if (ItemList.Tool_DataStick.isStackEqual(getSpecialSlot(), false, true)) {

-                if (ItemList.Tool_DataStick.isStackEqual(aStack, false, true)) {

-                    aStack.stackSize -= 1;

-                    this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{getSpecialSlot()});

-                    this.mMaxProgresstime = (128 / (1 << this.mTier - 1));

-                    this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-                    return 2;

-                }

-                if (aStack.getItem() == Items.written_book) {

-                    getSpecialSlot().stackSize -= 1;

-                    aStack.stackSize -= 1;

-

-                    this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{getSpecialSlot()});

-                    this.mOutputItems[0].setTagCompound(aStack.getTagCompound());

-                    this.mMaxProgresstime = (128 / (1 << this.mTier - 1));

-                    this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-                    return 2;

-                }

-                if (aStack.getItem() == Items.filled_map) {

-                    getSpecialSlot().stackSize -= 1;

-                    aStack.stackSize -= 1;

-

-                    this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{getSpecialSlot()});

-                    this.mOutputItems[0].setTagCompound(GT_Utility.getNBTContainingShort(new NBTTagCompound(), "map_id", (short) aStack.getItemDamage()));

-                    this.mMaxProgresstime = (128 / (1 << this.mTier - 1));

-                    this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-                    return 2;

-                }

-            }

-        }

-        return 0;

-    }

-

-    @Override

-    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {

-        if (mProgresstime >= (mMaxProgresstime - 1)) {

-            try {

-                if (this.mOutputItems[0].getUnlocalizedName().equals("gt.metaitem.01.32707")) {

-                    GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "scanning");

-                }

-            } catch (Exception e) {

-            }

-        }

-        super.onPostTick(aBaseMetaTileEntity, aTick);

-    }

-

-

-    public GT_Recipe.GT_Recipe_Map getRecipeList() {

-        return GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes;

-    }

-

-    public int getCapacity() {

-        return 1000;

-    }

-

-    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {

-        return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (getRecipeList().containsInput(aStack));

-    }

-

-    public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {

-        super.startSoundLoop(aIndex, aX, aY, aZ);

-        if (aIndex == 1) {

-            GT_Utility.doSoundAtClient((String) GregTech_API.sSoundList.get(Integer.valueOf(212)), 10, 1.0F, aX, aY, aZ);

-        }

-    }

-

-    public void startProcess() {

-        sendLoopStart((byte) 1);

-    }

-}

+package gregtech.common.tileentities.machines.basic;
+
+import forestry.api.genetics.AlleleManager;
+import forestry.api.genetics.IIndividual;
+import gregtech.GT_Mod;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.*;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.ItemData;
+import gregtech.api.util.GT_Log;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.items.behaviors.Behaviour_DataOrb;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+public class GT_MetaTileEntity_Scanner
+        extends GT_MetaTileEntity_BasicMachine {
+    public GT_MetaTileEntity_Scanner(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, 1, "Scans Crops and other things.", 1, 1, "Scanner.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_SCANNER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_SCANNER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_SCANNER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_SCANNER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_SCANNER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_SCANNER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER)});
+    }
+
+    public GT_MetaTileEntity_Scanner(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+        super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
+    }
+
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_Scanner(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+    }
+
+    public int checkRecipe() {
+        ItemStack aStack = getInputAt(0);
+        if (getOutputAt(0) != null) {
+            this.mOutputBlocked += 1;
+        } else if ((GT_Utility.isStackValid(aStack)) && (aStack.stackSize > 0)) {
+            if ((getFillableStack() != null) && (getFillableStack().containsFluid(Materials.Honey.getFluid(100L)))) {
+                try {
+                    Object tIndividual = AlleleManager.alleleRegistry.getIndividual(aStack);
+                    if (tIndividual != null) {
+                        if (((IIndividual) tIndividual).analyze()) {
+                            getFillableStack().amount -= 100;
+                            this.mOutputItems[0] = GT_Utility.copy(new Object[]{aStack});
+                            aStack.stackSize = 0;
+                            NBTTagCompound tNBT = new NBTTagCompound();
+                            ((IIndividual) tIndividual).writeToNBT(tNBT);
+                            this.mOutputItems[0].setTagCompound(tNBT);
+                            this.mMaxProgresstime = (500 / (1 << this.mTier - 1));
+                            this.mEUt = (2 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+                            return 2;
+                        }
+                        this.mOutputItems[0] = GT_Utility.copy(new Object[]{aStack});
+                        aStack.stackSize = 0;
+                        this.mMaxProgresstime = 1;
+                        this.mEUt = 1;
+                        return 2;
+                    }
+                } catch (Throwable e) {
+                    if (GT_Values.D1) {
+                        e.printStackTrace(GT_Log.err);
+                    }
+                }
+            }
+            if (ItemList.IC2_Crop_Seeds.isStackEqual(aStack, true, true)) {
+                NBTTagCompound tNBT = aStack.getTagCompound();
+                if (tNBT == null) {
+                    tNBT = new NBTTagCompound();
+                }
+                if (tNBT.getByte("scan") < 4) {
+                    tNBT.setByte("scan", (byte) 4);
+                    this.mMaxProgresstime = (160 / (1 << this.mTier - 1));
+                    this.mEUt = (8 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+                } else {
+                    this.mMaxProgresstime = 1;
+                    this.mEUt = 1;
+                }
+                aStack.stackSize -= 1;
+                this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{aStack});
+                this.mOutputItems[0].setTagCompound(tNBT);
+                return 2;
+            }
+            if (ItemList.Tool_DataOrb.isStackEqual(getSpecialSlot(), false, true)) {
+                if (ItemList.Tool_DataOrb.isStackEqual(aStack, false, true)) {
+                    aStack.stackSize -= 1;
+                    this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{getSpecialSlot()});
+                    this.mMaxProgresstime = (512 / (1 << this.mTier - 1));
+                    this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+                    return 2;
+                }
+                ItemData tData = GT_OreDictUnificator.getAssociation(aStack);
+                if ((tData != null) && ((tData.mPrefix == OrePrefixes.dust) || (tData.mPrefix == OrePrefixes.cell)) && (tData.mMaterial.mMaterial.mElement != null) && (!tData.mMaterial.mMaterial.mElement.mIsIsotope) && (tData.mMaterial.mMaterial != Materials.Magic) && (tData.mMaterial.mMaterial.getMass() > 0L)) {
+                    getSpecialSlot().stackSize -= 1;
+                    aStack.stackSize -= 1;
+
+                    this.mOutputItems[0] = ItemList.Tool_DataOrb.get(1L, new Object[0]);
+                    Behaviour_DataOrb.setDataTitle(this.mOutputItems[0], "Elemental-Scan");
+                    Behaviour_DataOrb.setDataName(this.mOutputItems[0], tData.mMaterial.mMaterial.mElement.name());
+                    this.mMaxProgresstime = ((int) (tData.mMaterial.mMaterial.getMass() * 8192L / (1 << this.mTier - 1)));
+                    this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+                    return 2;
+                }
+            }
+            if (ItemList.Tool_DataStick.isStackEqual(getSpecialSlot(), false, true)) {
+                if (ItemList.Tool_DataStick.isStackEqual(aStack, false, true)) {
+                    aStack.stackSize -= 1;
+                    this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{getSpecialSlot()});
+                    this.mMaxProgresstime = (128 / (1 << this.mTier - 1));
+                    this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+                    return 2;
+                }
+                if (aStack.getItem() == Items.written_book) {
+                    getSpecialSlot().stackSize -= 1;
+                    aStack.stackSize -= 1;
+
+                    this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{getSpecialSlot()});
+                    this.mOutputItems[0].setTagCompound(aStack.getTagCompound());
+                    this.mMaxProgresstime = (128 / (1 << this.mTier - 1));
+                    this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+                    return 2;
+                }
+                if (aStack.getItem() == Items.filled_map) {
+                    getSpecialSlot().stackSize -= 1;
+                    aStack.stackSize -= 1;
+
+                    this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{getSpecialSlot()});
+                    this.mOutputItems[0].setTagCompound(GT_Utility.getNBTContainingShort(new NBTTagCompound(), "map_id", (short) aStack.getItemDamage()));
+                    this.mMaxProgresstime = (128 / (1 << this.mTier - 1));
+                    this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+                    return 2;
+                }
+            }
+            if (getSpecialSlot() == null && ItemList.Tool_DataStick.isStackEqual(aStack, false, true)) {
+                if (GT_Utility.ItemNBT.getBookTitle(aStack).equals("Raw Prospection Data")) {
+                    GT_Utility.ItemNBT.setBookTitle(aStack, "Analyzed Prospection Data");
+                    GT_Utility.ItemNBT.convertProspectionData(aStack);
+                    aStack.stackSize -= 1;
+
+                    this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{aStack});
+                    this.mMaxProgresstime = (1000 / (1 << this.mTier - 1));
+                    this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
+                    return 2;
+
+                }
+            }
+
+        }
+        return 0;
+    }
+
+    @Override
+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        if (mProgresstime >= (mMaxProgresstime - 1)) {
+            try {
+                if (this.mOutputItems[0].getUnlocalizedName().equals("gt.metaitem.01.32707")) {
+                    GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "scanning");
+                }
+            } catch (Exception e) {
+            }
+        }
+        super.onPostTick(aBaseMetaTileEntity, aTick);
+    }
+
+
+    public GT_Recipe.GT_Recipe_Map getRecipeList() {
+        return GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes;
+    }
+
+    public int getCapacity() {
+        return 1000;
+    }
+
+    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+        return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (getRecipeList().containsInput(aStack));
+    }
+
+    public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
+        super.startSoundLoop(aIndex, aX, aY, aZ);
+        if (aIndex == 1) {
+            GT_Utility.doSoundAtClient((String) GregTech_API.sSoundList.get(Integer.valueOf(212)), 10, 1.0F, aX, aY, aZ);
+        }
+    }
+
+    public void startProcess() {
+        sendLoopStart((byte) 1);
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
new file mode 100644
index 0000000000..c0fa372c94
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
@@ -0,0 +1,116 @@
+package gregtech.common.tileentities.machines.basic;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.ItemData;
+import gregtech.api.objects.MaterialStack;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.blocks.GT_Block_Ores;
+import gregtech.common.blocks.GT_TileEntity_Ores;
+import ic2.core.Ic2Items;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.fluids.FluidStack;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_BasicMachine {
+
+    boolean ready = false;
+
+    public GT_MetaTileEntity_SeismicProspector(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, 1, "Place, activate with explosives(8 Dynamite, 1 Glyceryl, 4 TNT or 2 ITNT), use Data Stick", 1, 1, "Default.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER)});
+    }
+
+    public GT_MetaTileEntity_SeismicProspector(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+        super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
+    }
+
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_SeismicProspector(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
+    }
+
+    @Override
+    public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+        if (aBaseMetaTileEntity.isServerSide()) {
+            ItemStack aStack = aPlayer.getCurrentEquippedItem();
+            if (!ready && (aStack != null) && (
+            		(aStack.getItem() == Item.getItemFromBlock(Blocks.tnt) && aStack.stackSize > 3 ) || 
+            		(aStack.getItem() == Ic2Items.industrialTnt.getItem()  && aStack.stackSize > 1 ) ||
+            		(aStack.getItem() == Ic2Items.dynamite.getItem()  	   && aStack.stackSize > 7 ) ||
+            		(GT_OreDictUnificator.getItemData(aStack).mMaterial.mMaterial == Materials.Glyceryl  && aStack.stackSize > 0 )
+            		) ) {
+                if ((!aPlayer.capabilities.isCreativeMode) && (aStack.stackSize != 111)) {
+                	if(aStack.getItem() == Item.getItemFromBlock(Blocks.tnt)){
+                    aStack.stackSize -= 4;
+                	}else if(aStack.getItem() == Ic2Items.industrialTnt.getItem()){
+                    aStack.stackSize -= 2;
+                    }else if(aStack.getItem() == Ic2Items.dynamite.getItem()){
+                    aStack.stackSize -= 8;
+                    }else{
+                    aStack.stackSize -= 1;
+                    }
+                }
+                this.ready = true;
+                this.mMaxProgresstime = 200;
+            } else if (ready && mMaxProgresstime == 0 && aStack != null && aStack.stackSize == 1 && aStack.getItem() == ItemList.Tool_DataStick.getItem()) {
+                this.ready = false;
+                GT_Utility.ItemNBT.setBookTitle(aPlayer.getCurrentEquippedItem(), "Raw Prospection Data");
+                List<String> tStringList = new ArrayList<String>();
+                for (int i = this.getBaseMetaTileEntity().getYCoord(); i > 0; i--) {
+                    for (int f = -2; f < 3; f++) {
+                        for (int g = -2; g < 3; g++) {
+                            Block tBlock = this.getBaseMetaTileEntity().getBlockOffset(f, -i, g);
+                            if ((tBlock instanceof GT_Block_Ores)) {
+                                TileEntity tTileEntity = getBaseMetaTileEntity().getWorld().getTileEntity(getBaseMetaTileEntity().getXCoord() + f, getBaseMetaTileEntity().getYCoord() + (-i), getBaseMetaTileEntity().getZCoord() + g);
+                                if ((tTileEntity instanceof GT_TileEntity_Ores)) {
+                                	if(((GT_TileEntity_Ores) tTileEntity).mMetaData < 16000){
+                                    Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData % 1000)];
+                                    if ((tMaterial != null) && (tMaterial != Materials._NULL)) {
+                                        if (!tStringList.contains(tMaterial.mDefaultLocalName)) {
+                                            tStringList.add(tMaterial.mDefaultLocalName);
+                                        }
+                                    }
+                                  }
+                                }
+                            } else {
+                                int tMetaID = getBaseMetaTileEntity().getWorld().getBlockMetadata(getBaseMetaTileEntity().getXCoord() + f, getBaseMetaTileEntity().getYCoord() + (-i), getBaseMetaTileEntity().getZCoord() + g);
+                                ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
+                                if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {
+                                    if (!tStringList.contains(tAssotiation.mMaterial.mMaterial.mDefaultLocalName)) {
+                                        tStringList.add(tAssotiation.mMaterial.mMaterial.mDefaultLocalName);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                if(tStringList.size()<1){tStringList.add("No Ores found.");}
+                FluidStack tFluid = GT_Utility.getUndergroundOil(getBaseMetaTileEntity().getWorld(), getBaseMetaTileEntity().getXCoord(), getBaseMetaTileEntity().getZCoord());
+                String[] tStringArray = new String[tStringList.size()];
+                {
+                    for (int i = 0; i < tStringArray.length; i++) {
+                        tStringArray[i] = tStringList.get(i);
+                    }
+                }
+                GT_Utility.ItemNBT.setProspectionData(aPlayer.getCurrentEquippedItem(), this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), this.getBaseMetaTileEntity().getWorld().provider.dimensionId, tFluid, tStringArray);
+            }
+        }
+
+        return true;
+    }
+
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
index 0410c92717..e49a1bbe60 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
@@ -160,7 +160,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank {
     public boolean isGivingInformation() {
         return true;
     }
-
+    
 
     public String[] getInfoData() {
         return new String[]{"Coordinates:", "X: " + this.mTargetX, "Y: " + this.mTargetY, "Z: " + this.mTargetZ, "Dimension: " + this.mTargetD};
@@ -431,4 +431,4 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank {
     public ITexture[][][] getTextureSet(ITexture[] aTextures) {
         return null;
     }
-}
\ No newline at end of file
+}