Merge remote-tracking branch 'origin/unstable' into OilRefining

Conflicts:
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java

79 files changed, 1775 insertions, 1047 deletions

diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java
index ff4968cd16..7d3f687b28 100644
--- a/src/main/java/gregtech/common/GT_Client.java
+++ b/src/main/java/gregtech/common/GT_Client.java
@@ -9,6 +9,7 @@ import codechicken.lib.vec.Rotation;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
+import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
@@ -30,6 +31,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.DrawBlockHighlightEvent;
+import net.minecraftforge.client.event.EntityViewRenderEvent;
+import net.minecraftforge.event.terraingen.BiomeEvent;
+import net.minecraftforge.oredict.OreDictionary;
 import org.lwjgl.opengl.GL11;
 
 import java.net.URL;
@@ -139,6 +143,44 @@ public class GT_Client extends GT_Proxy
         GL11.glEnd();
         GL11.glPopMatrix();
     }
+    
+    @SubscribeEvent
+    public void manipulateDensity(EntityViewRenderEvent.FogDensity event) {
+    	if(GT_Pollution.mPlayerPollution > (GT_Mod.gregtechproxy.mPollutionSmogLimit)){    	
+        event.density = (0.15f*(Math.min(GT_Pollution.mPlayerPollution/((float)GT_Mod.gregtechproxy.mPollutionSourRainLimit),1.0f)))+0.1f;
+        event.setCanceled(true);
+    	}
+    }
+
+    @SubscribeEvent
+    public void manipulateColor(EntityViewRenderEvent.FogColors event) {
+    	if(GT_Pollution.mPlayerPollution > GT_Mod.gregtechproxy.mPollutionSmogLimit){
+        event.red = 140f/255f;
+        event.green = 80f/255f;
+        event.blue = 40f/255f;
+    	}
+    }
+    
+    @SubscribeEvent
+    public void manipulateGrassColor(BiomeEvent.GetGrassColor event) {
+    	if(GT_Pollution.mPlayerPollution > GT_Mod.gregtechproxy.mPollutionSmogLimit){
+        event.newColor = 0xD2691E;
+    	}
+    }
+
+    @SubscribeEvent
+    public void manipulateWaterColor(BiomeEvent.GetWaterColor event) {
+    	if(GT_Pollution.mPlayerPollution > GT_Mod.gregtechproxy.mPollutionSmogLimit){
+        event.newColor = 0x556B2F;
+    	}
+    }
+
+    @SubscribeEvent
+    public void manipulateFoliageColor(BiomeEvent.GetFoliageColor event) {
+    	if(GT_Pollution.mPlayerPollution > GT_Mod.gregtechproxy.mPollutionSmogLimit){
+        event.newColor = 0xCD853F;
+    	}
+    }
 
     public boolean isServerSide() {
         return true;
@@ -327,6 +369,12 @@ public class GT_Client extends GT_Proxy
     @SubscribeEvent
     public void onClientTickEvent(cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent aEvent) {
         if (aEvent.phase == cpw.mods.fml.common.gameevent.TickEvent.Phase.END) {
+            if(changeDetected>0)changeDetected--;
+            int newHideValue=shouldHeldItemHideThings();
+            if(newHideValue!=hideValue){
+                hideValue=newHideValue;
+                changeDetected=5;
+            }
             mAnimationTick++;
             if (mAnimationTick % 50L == 0L)
                 {mAnimationDirection = !mAnimationDirection;}
@@ -493,4 +541,27 @@ public class GT_Client extends GT_Proxy
         else
             aWorld.playSound(aX, aY, aZ, tString, 3F, tString.startsWith("note.") ? (float) Math.pow(2D, (double) (aStack.stackSize - 13) / 12D) : 1.0F, false);
     }
+
+    public static int hideValue=0;
+    public static int changeDetected=0;
+
+    private static int shouldHeldItemHideThings() {
+        try {
+            EntityPlayer player = Minecraft.getMinecraft().thePlayer;
+            if (player == null) return 0;
+            ItemStack held = player.getCurrentEquippedItem();
+            if (held == null) return 0;
+            int[] ids = OreDictionary.getOreIDs(held);
+            int hide = 0;
+            for (int i : ids) {
+                if (OreDictionary.getOreName(i).equals("craftingToolSolderingIron")) {
+                    hide |= 0x1;
+                    break;
+                }
+            }
+            return hide;
+        }catch(Exception e){
+            return 0;
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/GT_Network.java b/src/main/java/gregtech/common/GT_Network.java
index 2b19b98dff..ae444429bf 100644
--- a/src/main/java/gregtech/common/GT_Network.java
+++ b/src/main/java/gregtech/common/GT_Network.java
@@ -32,7 +32,7 @@ public class GT_Network
 

     public GT_Network() {

         this.mChannel = NetworkRegistry.INSTANCE.newChannel("GregTech", new ChannelHandler[]{this, new HandlerShared()});

-        this.mSubChannels = new GT_Packet[]{new GT_Packet_TileEntity(), new GT_Packet_Sound(), new GT_Packet_Block_Event(), new GT_Packet_Ores()};

+        this.mSubChannels = new GT_Packet[]{new GT_Packet_TileEntity(), new GT_Packet_Sound(), new GT_Packet_Block_Event(), new GT_Packet_Ores(), new GT_Packet_Pollution()};

     }

 

     protected void encode(ChannelHandlerContext aContext, GT_Packet aPacket, List<Object> aOutput)

@@ -47,6 +47,12 @@ public class GT_Network
     }

 

     public void sendToPlayer(GT_Packet aPacket, EntityPlayerMP aPlayer) {

+    	if(aPacket==null){

+    		System.out.println("packet null");return;

+    	}

+    	if(aPlayer==null){

+    		System.out.println("player null");return;

+    	}

         ((FMLEmbeddedChannel) this.mChannel.get(Side.SERVER)).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER);

         ((FMLEmbeddedChannel) this.mChannel.get(Side.SERVER)).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(aPlayer);

         ((FMLEmbeddedChannel) this.mChannel.get(Side.SERVER)).writeAndFlush(aPacket);

diff --git a/src/main/java/gregtech/common/GT_Pollution.java b/src/main/java/gregtech/common/GT_Pollution.java
index a950e8a2f2..6669bf861a 100644
--- a/src/main/java/gregtech/common/GT_Pollution.java
+++ b/src/main/java/gregtech/common/GT_Pollution.java
@@ -1,6 +1,8 @@
 package gregtech.common;
 
+import cpw.mods.fml.common.gameevent.TickEvent;
 import gregtech.GT_Mod;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.objects.XSTR;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.block.Block;
@@ -10,12 +12,17 @@ import net.minecraft.init.Blocks;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.ChunkPosition;
 import net.minecraft.world.World;
-import net.minecraftforge.common.DimensionManager;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraftforge.event.world.WorldEvent;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+
+import static gregtech.common.GT_Proxy.*;
+
+//import net.minecraft.entity.EntityLiving;
 
 public class GT_Pollution {
 	/**
@@ -49,95 +56,132 @@ public class GT_Pollution {
 	 * Muffler Hatch Pollution reduction:
 	 * LV (0%), MV (30%), HV (52%), EV (66%), IV (76%), LuV (84%), ZPM (89%), UV (92%), MAX (95%)
 	 */
+	private static XSTR tRan = new XSTR();
+	private List<ChunkCoordIntPair> pollutionList = new ArrayList<>();//chunks left to process
+	private HashMap<ChunkCoordIntPair,int[]> chunkData;//link to chunk data that is saved/loaded
+	private int operationsPerTick=0;//how much chunks should be processed in each cycle
+	private static final short cycleLen=1200;
+	private final World aWorld;
+	public static int mPlayerPollution;
 
-	static List<ChunkPosition> tList = null;
-	static int loops = 1;
-	static XSTR tRan = new XSTR();
+	public GT_Pollution(World world){
+		aWorld=world;
+		chunkData=dimensionWiseChunkData.get(aWorld.provider.dimensionId);
+		if(chunkData==null){
+			chunkData=new HashMap<>(1024);
+			dimensionWiseChunkData.put(world.provider.dimensionId,chunkData);
+		}
+		dimensionWisePollution.put(aWorld.provider.dimensionId,this);
+	}
 
-	public static void onWorldTick(World aWorld, int aTick){
-		if(!GT_Mod.gregtechproxy.mPollution)return;
-		if(aTick == 0 || (tList==null && GT_Proxy.chunkData!=null)){
-			tList = new ArrayList<ChunkPosition>(GT_Proxy.chunkData.keySet());
-			loops = (tList.size()/1200) + 1;
-//			System.out.println("new Pollution loop"+aTick);
+	public static void onWorldTick(TickEvent.WorldTickEvent aEvent){//called from proxy
+		//return if pollution disabled
+		if(!GT_Mod.gregtechproxy.mPollution) return;
+		final GT_Pollution pollutionInstance = dimensionWisePollution.get(aEvent.world.provider.dimensionId);
+		if(pollutionInstance==null)return;
+		pollutionInstance.tickPollutionInWorld((int)(aEvent.world.getTotalWorldTime()%cycleLen));
+	}
+
+	private void tickPollutionInWorld(int aTickID){//called from method above
+		//gen data set
+		if(aTickID==0){
+			pollutionList = new ArrayList<>(chunkData.keySet());
+			//set operations per tick
+			if(pollutionList.size()>0) operationsPerTick =(pollutionList.size()/cycleLen);
+			else operationsPerTick=0;//SANity
 		}
-		if(tList!=null && tList.size() > 0){
-			int i = 0;
-			for(; i < loops ; i++){
-				if(tList.size()>0){
-				ChunkPosition tPos = tList.get(0);
-				tList.remove(0);
-				if(tPos!=null && GT_Proxy.chunkData.containsKey(tPos)){
-				int tPollution = GT_Proxy.chunkData.get(tPos)[1];
-//				System.out.println("process: "+tPos.chunkPosY+" "+tPos.chunkPosX+" "+tPos.chunkPosZ+" "+tPollution);
-				//Reduce pollution in chunk
-				tPollution = (int)(0.99f*tPollution);
-				tPollution -= 2000;
-				if(tPollution<=0){tPollution = 0;}
-				//Spread Pollution
-				if(tPollution>50000){
-				List<ChunkPosition> tNeighbor = new ArrayList();
-				tNeighbor.add(new ChunkPosition(tPos.chunkPosX+1, tPos.chunkPosY, tPos.chunkPosZ));
-				tNeighbor.add(new ChunkPosition(tPos.chunkPosX-1, tPos.chunkPosY, tPos.chunkPosZ));
-				tNeighbor.add(new ChunkPosition(tPos.chunkPosX, tPos.chunkPosY, tPos.chunkPosZ+1));
-				tNeighbor.add(new ChunkPosition(tPos.chunkPosX, tPos.chunkPosY, tPos.chunkPosZ-1));
-				for(ChunkPosition tNPos : tNeighbor){
-					if(GT_Proxy.chunkData.containsKey(tNPos)){
-						int tNPol = GT_Proxy.chunkData.get(tNPos)[1];
-						if(tNPol<tPollution && tNPol*12 < tPollution*10){
-							int tDiff = tPollution - tNPol;
-							tDiff = tDiff/10;
-							tNPol += tDiff;
-							tPollution -= tDiff;
-							GT_Proxy.chunkData.get(tNPos)[1] = tNPol;
-						}
-					}else{
-						GT_Utility.getUndergroundOil(aWorld,tNPos.chunkPosX<<4,tNPos.chunkPosZ<<4);
+
+		for(int chunksProcessed=0;chunksProcessed<=operationsPerTick;chunksProcessed++){
+			if(pollutionList.size()==0)break;//no more stuff to do
+			ChunkCoordIntPair actualPos=pollutionList.remove(pollutionList.size()-1);//faster
+			//add default data if missing
+			if(!chunkData.containsKey(actualPos)) chunkData.put(actualPos,getDefaultChunkDataOnCreation());
+			//get pollution
+			int tPollution = chunkData.get(actualPos)[GTPOLLUTION];
+			//remove some
+			tPollution = (int)(0.9945f*tPollution);
+			//tPollution -= 2000;//This does not really matter...
+
+			if(tPollution<=0) tPollution = 0;//SANity check
+			else if(tPollution>400000){//Spread Pollution
+
+				ChunkCoordIntPair[] tNeighbors = new ChunkCoordIntPair[4];//array is faster
+				tNeighbors[0]=(new ChunkCoordIntPair(actualPos.chunkXPos+1,actualPos.chunkZPos));
+				tNeighbors[1]=(new ChunkCoordIntPair(actualPos.chunkXPos-1,actualPos.chunkZPos));
+				tNeighbors[2]=(new ChunkCoordIntPair(actualPos.chunkXPos,actualPos.chunkZPos+1));
+				tNeighbors[3]=(new ChunkCoordIntPair(actualPos.chunkXPos,actualPos.chunkZPos-1));
+				for(ChunkCoordIntPair neighborPosition : tNeighbors){
+					if(!chunkData.containsKey(neighborPosition)) chunkData.put(neighborPosition,getDefaultChunkDataOnCreation());
+
+					int neighborPollution = chunkData.get(neighborPosition)[GTPOLLUTION];
+					if(neighborPollution*6 < tPollution*5){//METHEMATICS...
+						int tDiff = tPollution - neighborPollution;
+						tDiff = tDiff/20;
+						neighborPollution = GT_Utility.safeInt((long)neighborPollution+tDiff);//tNPol += tDiff;
+						tPollution -= tDiff;
+						chunkData.get(neighborPosition)[GTPOLLUTION] = neighborPollution;
 					}
-				}}
-				int[] tArray = GT_Proxy.chunkData.get(tPos);
-				tArray[1] = tPollution;
-				GT_Proxy.chunkData.remove(tPos);
-				GT_Proxy.chunkData.put(tPos, tArray);
+				}
+
+
 				//Create Pollution effects
-//				Smog filter TODO
-				if(tPollution > GT_Mod.gregtechproxy.mPollutionSmogLimit){
-				AxisAlignedBB chunk = AxisAlignedBB.getBoundingBox(tPos.chunkPosX<<4, 0, tPos.chunkPosZ<<4, (tPos.chunkPosX<<4)+16, 256, (tPos.chunkPosZ<<4)+16);
-				List<EntityLivingBase> tEntitys = aWorld.getEntitiesWithinAABB(EntityLivingBase.class, chunk);
-					for(EntityLivingBase tEnt : tEntitys){
-						if(!GT_Utility.isWearingFullGasHazmat(tEnt) && tRan.nextInt(tPollution/2000) > 40){
-							int ran = tRan.nextInt(3);
-							if(ran==0)tEnt.addPotionEffect(new PotionEffect(Potion.weakness.id,  Math.min(tPollution/2500,1000), tPollution/400000));
-							if(ran==1)tEnt.addPotionEffect(new PotionEffect(Potion.digSlowdown.id,  Math.min(tPollution/2500,1000), tPollution/400000));
-							if(ran==2)tEnt.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id,  Math.min(tPollution/2500,1000), tPollution/400000));
+				//Smog filter TODO
+				if(tPollution > GT_Mod.gregtechproxy.mPollutionSmogLimit) {
+					AxisAlignedBB chunk = AxisAlignedBB.getBoundingBox(actualPos.chunkXPos << 4, 0, actualPos.chunkZPos << 4, (actualPos.chunkXPos << 4) + 16, 256, (actualPos.chunkZPos << 4) + 16);
+					List<EntityLivingBase> tEntitys = aWorld.getEntitiesWithinAABB(EntityLivingBase.class, chunk);
+					for (EntityLivingBase tEnt : tEntitys) {
+						if (!GT_Utility.isWearingFullGasHazmat(tEnt)) {
+							switch (tRan.nextInt(3)) {
+								default:
+									tEnt.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, Math.min(tPollution / 1000, 1000), tPollution / 400000));
+								case 1:
+									tEnt.addPotionEffect(new PotionEffect(Potion.weakness.id, Math.min(tPollution / 1000, 1000), tPollution / 400000));
+								case 2:
+									tEnt.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, Math.min(tPollution / 1000, 1000), tPollution / 400000));
+							}
 						}
-}
-//				Poison effects
-				if(tPollution > GT_Mod.gregtechproxy.mPollutionPoisonLimit){
-				for(EntityLivingBase tEnt : tEntitys){
-				if(!GT_Utility.isWearingFullGasHazmat(tEnt) && tRan.nextInt(tPollution/2000) > 20){
-					int ran = tRan.nextInt(3);
-					if(ran==0)tEnt.addPotionEffect(new PotionEffect(Potion.poison.id, Math.min(tPollution/2500,1000), tPollution/500000));
-					if(ran==1)tEnt.addPotionEffect(new PotionEffect(Potion.confusion.id, Math.min(tPollution/2500,1000), 1));
-					if(ran==2)tEnt.addPotionEffect(new PotionEffect(Potion.blindness.id, Math.min(tPollution/2500,1000), 1));
-}
-				}
-//				killing plants
-				if(tPollution > GT_Mod.gregtechproxy.mPollutionVegetationLimit){
-				int f = 20;
-				for(;f<(tPollution/25000);f++){
-					int x =tPos.chunkPosX<<4+(tRan.nextInt(16));;
-					int y =60 +(-f+tRan.nextInt(f*2+1));
-					int z =tPos.chunkPosZ<<4+(tRan.nextInt(16));
-					damageBlock(x, y, z, tPollution > GT_Mod.gregtechproxy.mPollutionSourRainLimit);
-				}}}}
+					}
+
+
+					//				Poison effects
+					if (tPollution > GT_Mod.gregtechproxy.mPollutionPoisonLimit) {
+						//AxisAlignedBB chunk = AxisAlignedBB.getBoundingBox(tPos.chunkPosX*16, 0, tPos.chunkPosZ*16, tPos.chunkPosX*16+16, 256, tPos.chunkPosZ*16+16);
+						//List<EntityLiving> tEntitys = aWorld.getEntitiesWithinAABB(EntityLiving.class, chunk);
+						for (EntityLivingBase tEnt : tEntitys) {
+							if (!GT_Utility.isWearingFullGasHazmat(tEnt)) {
+								switch (tRan.nextInt(4)) {
+									default:
+										tEnt.addPotionEffect(new PotionEffect(Potion.hunger.id, tPollution / 500000));
+									case 1:
+										tEnt.addPotionEffect(new PotionEffect(Potion.confusion.id, Math.min(tPollution / 2000, 1000), 1));
+									case 2:
+										tEnt.addPotionEffect(new PotionEffect(Potion.poison.id, Math.min(tPollution / 4000, 1000), tPollution / 500000));
+									case 3:
+										tEnt.addPotionEffect(new PotionEffect(Potion.blindness.id, Math.min(tPollution / 2000, 1000), 1));
+								}
+							}
+						}
+
+
+						//				killing plants
+						if (tPollution > GT_Mod.gregtechproxy.mPollutionVegetationLimit) {
+							int f = 20;
+							for (; f < (tPollution / 25000); f++) {
+								int x = (actualPos.chunkXPos << 4) + tRan.nextInt(16);
+								int y = 60 + (-f + tRan.nextInt(f * 2 + 1));
+								int z = (actualPos.chunkZPos << 4) + tRan.nextInt(16);
+								damageBlock(aWorld, x, y, z, tPollution > GT_Mod.gregtechproxy.mPollutionSourRainLimit);
+							}
+						}
+					}
 				}
 			}
-			}}
+			//Write new pollution to Hashmap !!!
+			chunkData.get(actualPos)[GTPOLLUTION] = tPollution;
+		}
 	}
 	
-	public static void damageBlock(int x, int y, int z, boolean sourRain){
-		World world = DimensionManager.getWorld(0);
+	private static void damageBlock(World world, int x, int y, int z, boolean sourRain){
 		if (world.isRemote)	return;
 		Block tBlock = world.getBlock(x, y, z);
 		int tMeta = world.getBlockMetadata(x, y, z);
@@ -187,24 +231,49 @@ public class GT_Pollution {
 			}
 	}
 
-	//Add aWorld to Save Pollution
-	public static void addPollution(World aWorld, ChunkPosition aPos, int aPollution){
+	public static void addPollution(IGregTechTileEntity te, int aPollution){
+		addPollution(te.getWorld().getChunkFromBlockCoords(te.getXCoord(),te.getZCoord()), aPollution);
+	}
+
+	public static void addPollution(Chunk ch, int aPollution){
 		if(!GT_Mod.gregtechproxy.mPollution)return;
-		try{
-		ChunkPosition tPos = new ChunkPosition(GT_Utility.getScaleCoordinates(aPos.chunkPosX,16), aWorld.provider.dimensionId, GT_Utility.getScaleCoordinates(aPos.chunkPosZ,16)); // OLD in coordinate -1 -1 chunk 0 0
-//		System.out.println("add pollution dim: "+aWorld.provider.dimensionId+" x: "+ tPos.chunkPosX +" z: " + tPos.chunkPosZ +" poll: "+aPollution);
-		int[] tData = new int[3];
-		if(GT_Proxy.chunkData.containsKey(tPos)){
-			tData = GT_Proxy.chunkData.get(tPos);
-			if(tData.length>1){
-				tData[1] += aPollution;
-			}
-		}else{
-			tData[1] += aPollution;
-			GT_Proxy.chunkData.put(tPos, tData);
+		HashMap<ChunkCoordIntPair,int[]> dataMap=dimensionWiseChunkData.get(ch.worldObj.provider.dimensionId);
+		if(dataMap==null){
+			dataMap=new HashMap<>(1024);
+			dimensionWiseChunkData.put(ch.worldObj.provider.dimensionId,dataMap);
 		}
-		}catch(Exception e){
-			
+		int[] dataArr=dataMap.get(ch.getChunkCoordIntPair());
+		if(dataArr==null){
+			dataArr=getDefaultChunkDataOnCreation();
+			dataMap.put(ch.getChunkCoordIntPair(),dataArr);
 		}
+		dataArr[GTPOLLUTION]+=aPollution;
+		if(dataArr[GTPOLLUTION]<0)dataArr[GTPOLLUTION]=0;
+	}
+
+	public static int getPollution(IGregTechTileEntity te){
+		return getPollution(te.getWorld().getChunkFromBlockCoords(te.getXCoord(),te.getZCoord()));
+	}
+
+	public static int getPollution(Chunk ch){
+		if(!GT_Mod.gregtechproxy.mPollution)return 0;
+		HashMap<ChunkCoordIntPair,int[]> dataMap=dimensionWiseChunkData.get(ch.worldObj.provider.dimensionId);
+		if(dataMap==null || dataMap.get(ch.getChunkCoordIntPair())==null) return 0;
+		return dataMap.get(ch.getChunkCoordIntPair())[GTPOLLUTION];
+	}
+
+	public static int getPollution(ChunkCoordIntPair aCh, int aDim){
+		if(!GT_Mod.gregtechproxy.mPollution)return 0;
+		HashMap<ChunkCoordIntPair,int[]> dataMap=dimensionWiseChunkData.get(aDim);
+		if(dataMap==null || dataMap.get(aCh)==null) return 0;
+		return dataMap.get(aCh)[GTPOLLUTION];
+	}
+	
+	//Add compatibility with old code
+	@Deprecated /*Don't use it... too weird way of passing position*/
+	public static void addPollution(World aWorld, ChunkPosition aPos, int aPollution){
+		//The abuse of ChunkPosition to store block position and dim... 
+		//is just bad expacially when that is both used to store ChunkPos and BlockPos depeending on context
+		addPollution(aWorld.getChunkFromBlockCoords(aPos.chunkPosX,aPos.chunkPosZ),aPollution);
 	}
 }
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index c92c8bba74..f94b84ecd8 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -6,6 +6,8 @@ import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.ProgressManager;
 import cpw.mods.fml.common.eventhandler.Event.Result;
+import cpw.mods.fml.common.eventhandler.EventBus;
+import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.network.FMLNetworkEvent;
@@ -22,6 +24,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.items.GT_MetaGenerated_Item;
 import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.net.GT_Packet_Pollution;
 import gregtech.api.objects.GT_Fluid;
 import gregtech.api.objects.GT_FluidStack;
 import gregtech.api.objects.GT_UO_DimensionList;
@@ -36,6 +39,7 @@ import gregtech.common.items.armor.gui.ContainerElectricArmor1;
 import gregtech.common.items.armor.gui.GuiElectricArmor1;
 import gregtech.common.items.armor.gui.GuiModularArmor;
 import gregtech.common.items.armor.gui.InventoryArmor;
+import gregtech.common.tools.GT_Tool;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
@@ -44,6 +48,7 @@ import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.monster.EntityEnderman;
 import net.minecraft.entity.monster.EntitySkeleton;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.projectile.EntityArrow;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -55,20 +60,24 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.Potion;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.DamageSource;
+import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.ChunkPosition;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldSettings.GameType;
 import net.minecraft.world.gen.feature.WorldGenMinable;
+import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.ForgeEventFactory;
 import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import net.minecraftforge.event.entity.living.EnderTeleportEvent;
 import net.minecraftforge.event.entity.player.ArrowLooseEvent;
 import net.minecraftforge.event.entity.player.ArrowNockEvent;
+import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.terraingen.OreGenEvent;
 import net.minecraftforge.event.world.BlockEvent;
 import net.minecraftforge.event.world.ChunkDataEvent;
+import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
@@ -193,10 +202,13 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
     public boolean mEnableAllMaterials = false;
     public boolean mEnableAllComponents = false;
     public boolean mAddGTRecipesToIC2Machines = true;
+	public boolean mEnableCleanroom = true;
     public boolean mLowGravProcessing = false;
     public boolean mAprilFool = false;
     public boolean mCropNeedBlock = true;
     public boolean mReenableSimplifiedChemicalRecipes = false;
+    public boolean mAMHInteraction = true;
+    public boolean mForceFreeFace = false;
     
     public GT_Proxy() {
         GameRegistry.registerFuelHandler(this);
@@ -497,6 +509,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
                 break;
             }
         }
+        GT_LanguageManager.writePlaceholderStrings();
     }
 
     public static long tBits = GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.ONLY_ADD_IF_RESULT_IS_NOT_NULL | GT_ModHandler.RecipeBits.NOT_REMOVABLE;
@@ -581,6 +594,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
                 }
             }
         } catch (Throwable e) {e.printStackTrace(GT_Log.err);}
+
+        dimensionWiseChunkData.clear();//!!! IMPORTANT for map switching...
+        dimensionWisePollution.clear();//!!! IMPORTANT for map switching...
     }
 
     public void onServerStarted() {
@@ -1246,8 +1262,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
                     }
                 }
             }
-            if(aEvent.world.provider.dimensionId==0)
-                GT_Pollution.onWorldTick(aEvent.world, (int) (aEvent.world.getTotalWorldTime() % 1200));
+
+            GT_Pollution.onWorldTick(aEvent);
         }
     }
 
@@ -1259,7 +1275,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
                 aEvent.player.setGameType(GameType.ADVENTURE);
                 aEvent.player.capabilities.allowEdit = false;
                 if (this.mAxeWhenAdventure) {
-                    GT_Utility.sendChatToPlayer(aEvent.player, "It's dangerous to go alone! Take this.");
+                    GT_Utility.sendChatToPlayer(aEvent.player, GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_097", "It's dangerous to go alone! Take this.", false));
                     aEvent.player.worldObj.spawnEntityInWorld(new EntityItem(aEvent.player.worldObj, aEvent.player.posX, aEvent.player.posY,
                             aEvent.player.posZ, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.AXE, 1, Materials.Flint, Materials.Wood, null)));
                 }
@@ -1312,6 +1328,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
                     aEvent.player.addExhaustion(Math.max(1.0F, tCount / 666.6F));
                 }
             }
+            if (aEvent.player.ticksExisted % 10 == 0) {
+        	int tPollution = 0;
+        	tPollution = GT_Pollution.getPollution(new ChunkCoordIntPair(aEvent.player.chunkCoordX,aEvent.player.chunkCoordZ), aEvent.player.dimension);
+        	if(aEvent.player instanceof EntityPlayerMP)GT_Values.NW.sendToPlayer(new GT_Packet_Pollution(tPollution), (EntityPlayerMP) aEvent.player);
+            }
         }
     }
 
@@ -1765,48 +1786,106 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
         ProgressManager.pop(progressBar);
     }
 
-    public static final HashMap<ChunkPosition, int[]>  chunkData = new HashMap<ChunkPosition, int[]>(5000);
+    public static final HashMap<Integer,HashMap<ChunkCoordIntPair,int []>> dimensionWiseChunkData = new HashMap<>(16);//stores chunk data that is loaded/saved
+    public static final HashMap<Integer,GT_Pollution> dimensionWisePollution = new HashMap<>(16);//stores GT_Polluttors objects
+	public static final byte GTOIL=3,GTOILFLUID=2,GTPOLLUTION=1,GTMETADATA=0,NOT_LOADED=0,LOADED=1;//consts
+    //@Deprecated
+	//public static final HashMap<ChunkPosition, int[]>  chunkData = new HashMap<>(0);
+
+    private static final byte oilVer=(byte)20;//non zero plz
+
+    //TO get default's fast
+    public static int[] getDefaultChunkDataOnCreation(){
+        return new int[]{NOT_LOADED,0,-1,-1};
+    }
+    public static int[] getDefaultChunkDataOnLoad(){
+        return new int[]{LOADED,0,-1,-1};
+    }
 
     @SubscribeEvent
-    public void handleChunkSaveEvent(ChunkDataEvent.Save event)
-    {  
-        ChunkPosition tPos = new ChunkPosition(event.getChunk().xPosition,event.getChunk().worldObj.provider.dimensionId,event.getChunk().zPosition);
-        if(chunkData.containsKey(tPos)){
-            int[] tInts = chunkData.get(tPos);
-            if(tInts.length>0){event.getData().setInteger("GTOIL", tInts[0]);}
-            if(tInts.length>1){event.getData().setInteger("GTPOLLUTION", tInts[1]);}
-            if(tInts.length>2){event.getData().setInteger("GTOILFLUID", tInts[2]);}
-        }
+    public void handleChunkSaveEvent(ChunkDataEvent.Save event) {//ALWAYS SAVE FROM THE HASH MAP DATA
+        HashMap<ChunkCoordIntPair,int []> chunkData=dimensionWiseChunkData.get(event.world.provider.dimensionId);
+        if(chunkData==null) return;//no dim info stored
+
+        int[] tInts = chunkData.get(event.getChunk().getChunkCoordIntPair());
+        if(tInts==null) return;//no chunk data stored
+        //assuming len of this array 4
+        if(tInts[3]>=0)event.getData().setInteger("GTOIL", tInts[GTOIL]);
+        else event.getData().removeTag("GTOIL");
+        if(tInts[2]>=0)event.getData().setInteger("GTOILFLUID", tInts[GTOILFLUID]);
+        else event.getData().removeTag("GTOILFLUID");
+        if(tInts[1]>0)event.getData().setInteger("GTPOLLUTION", tInts[GTPOLLUTION]);
+        else event.getData().removeTag("GTPOLLUTION");
+        event.getData().setByte("GTOILVER", oilVer);//version mark
     }
 
     @SubscribeEvent
-    public void handleChunkLoadEvent(ChunkDataEvent.Load event)
-    {
-        int tOil = 0;
-        int tOilFluid = 0;
-        int tPollution = 0;
-
-        ChunkPosition tPos = new ChunkPosition(event.getChunk().xPosition,event.getChunk().worldObj.provider.dimensionId,event.getChunk().zPosition);
-        int[] tData = new int[0];
-        if(chunkData.containsKey(tPos)){
-            tData = chunkData.get(tPos);
-            chunkData.remove(tPos);
-            if(tData.length>0)
-                tOil = tData[0];
-            if(tData.length>1)
-            	tPollution = tData[1];
-            if(tData.length>2)
-            	tOilFluid = tData[2];
+    public void handleChunkLoadEvent(ChunkDataEvent.Load event) {
+        final int worldID=event.world.provider.dimensionId;
+        HashMap<ChunkCoordIntPair, int[]> chunkData = dimensionWiseChunkData.get(worldID);
+        if (chunkData == null){
+            chunkData=new HashMap<>(1024);
+            dimensionWiseChunkData.put(worldID, chunkData);
         }
+        if (dimensionWisePollution.get(worldID) == null)
+            dimensionWisePollution.put(worldID, new GT_Pollution(event.world));
+
+        int[] tInts = chunkData.get(event.getChunk().getChunkCoordIntPair());
+        if (tInts == null) {
+            //NOT LOADED and NOT PROCESSED by pollution algorithms
+            //regular load
+            tInts = getDefaultChunkDataOnLoad();
+
+            if (event.getData().getByte("GTOILVER") == oilVer) {
+                if (event.getData().hasKey("GTOIL"))
+                    tInts[GTOIL] = event.getData().getInteger("GTOIL");
+                if (event.getData().hasKey("GTOILFLUID"))
+                    tInts[GTOILFLUID] = event.getData().getInteger("GTOILFLUID");
+            }
 
-        if(tOil==0&&event.getData().hasKey("GTOIL"))
-            tOil = event.getData().getInteger("GTOIL");
-        if(tPollution==0&&event.getData().hasKey("GTPOLLUTION"))
-        	tPollution = event.getData().getInteger("GTPOLLUTION");
-        if(tOilFluid==0&&event.getData().hasKey("GTOILFLUID"))
-        	tOilFluid = event.getData().getInteger("GTOILFLUID");
+            tInts[GTPOLLUTION] = event.getData().getInteger("GTPOLLUTION");//Defaults to 0
 
-        chunkData.put(tPos, new int[]{tOil,tPollution,tOilFluid});
+            //store in HASH MAP if has useful data
+            if (tInts[GTPOLLUTION] > 0 || tInts[GTOIL] >= 0 || tInts[GTOILFLUID] >= 0)
+                chunkData.put(event.getChunk().getChunkCoordIntPair(), tInts);
+        } else if (tInts[GTMETADATA] == NOT_LOADED) {//was NOT loaded from chunk save game data
+            //NOT LOADED but generated
+            //append load
+            if (event.getData().getByte("GTOILVER") == oilVer) {
+                if (tInts[GTOIL] < 0 && event.getData().hasKey("GTOIL"))//if was not yet initialized
+                    tInts[GTOIL] = event.getData().getInteger("GTOIL");
+
+                if (tInts[GTOILFLUID] < 0 && event.getData().hasKey("GTOILFLUID"))//if was not yet initialized
+                    tInts[GTOILFLUID] = event.getData().getInteger("GTOILFLUID");
+            } else {
+                tInts[GTOIL] = -1;
+                tInts[GTOILFLUID] = -1;
+            }
+
+            tInts[GTPOLLUTION] += event.getData().getInteger("GTPOLLUTION");//Defaults to 0, add stored pollution to data
+            tInts[GTMETADATA] = LOADED;//mark as = loaded
+            //store in HASHMAP
+
+            chunkData.put(event.getChunk().getChunkCoordIntPair(), tInts);
+        }//else if(tInts[0]==1){
+        ////Already loaded chunk data
+        ////DO NOTHING - this chunk data was already loaded and stored in hash map
+        //}
+    }
+    
+    @SubscribeEvent
+    public void onBlockBreakSpeedEvent(PlayerEvent.BreakSpeed aEvent)
+    {
+      if (aEvent.newSpeed > 0.0F)
+      {
+        if (aEvent.entityPlayer != null)
+        {
+          ItemStack aStack = aEvent.entityPlayer.getCurrentEquippedItem();
+          if ((aStack != null) && ((aStack.getItem() instanceof GT_MetaGenerated_Tool))) {
+            aEvent.newSpeed = ((GT_MetaGenerated_Tool)aStack.getItem()).onBlockBreakSpeedEvent(aEvent.newSpeed, aStack, aEvent.entityPlayer, aEvent.block, aEvent.x, aEvent.y, aEvent.z, (byte)aEvent.metadata, aEvent);
+          }
+        }
+      }
     }
 
     public static class OreDictEventContainer {
diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java
index 1726d15357..2dae433f25 100644
--- a/src/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/src/main/java/gregtech/common/GT_RecipeAdder.java
@@ -669,6 +669,9 @@ public class GT_RecipeAdder
         if ((aDuration = GregTech_API.sRecipeFile.get("autoclave", aInput, aDuration)) <= 0) {
             return false;
         }
+		if (!GT_Mod.gregtechproxy.mEnableCleanroom){
+			aCleanroom = false;
+		}
         GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aOutput}, null, new int[]{aChance}, new FluidStack[]{aFluid}, null, aDuration, aEUt, aCleanroom ? -100 : 0);
         return true;
     }
@@ -698,6 +701,9 @@ public class GT_RecipeAdder
         if ((aDuration = GregTech_API.sRecipeFile.get("laserengraving", aEngravedItem, aDuration)) <= 0) {
             return false;
         }
+		if (!GT_Mod.gregtechproxy.mEnableCleanroom){
+			aCleanroom = false;
+		}
         GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes.addRecipe(true, new ItemStack[]{aItemToEngrave, aLens}, new ItemStack[]{aEngravedItem}, null, null, null, aDuration, aEUt, aCleanroom ? -200 : 0);
         return true;
     }
diff --git a/src/main/java/gregtech/common/GT_UndergroundOil.java b/src/main/java/gregtech/common/GT_UndergroundOil.java
new file mode 100644
index 0000000000..a3e0962100
--- /dev/null
+++ b/src/main/java/gregtech/common/GT_UndergroundOil.java
@@ -0,0 +1,100 @@
+package gregtech.common;
+
+import gregtech.GT_Mod;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.objects.GT_UO_Fluid;
+import gregtech.api.objects.XSTR;
+import gregtech.common.GT_Proxy;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.ChunkPosition;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
+import java.util.HashMap;
+
+import static gregtech.api.util.GT_Utility.getScaleCoordinates;
+import static gregtech.common.GT_Proxy.*;
+
+/**
+ * Created by Tec on 29.04.2017.
+ */
+public class GT_UndergroundOil {
+    public static final short DIVIDER=5000;
+
+    public static FluidStack undergroundOil(IGregTechTileEntity te, float drainSpeedCoefficient){
+        return undergroundOil(te.getWorld().getChunkFromBlockCoords(te.getXCoord(),te.getZCoord()),drainSpeedCoefficient);
+    }
+
+    //Returns whole content for information purposes -> when drainSpeedCoeff < 0
+    //Else returns extracted fluidStack if amount > 0, or null otherwise
+    public static FluidStack undergroundOil(Chunk chunk, float drainSpeedCoefficient) {
+        if (GT_Mod.gregtechproxy.mUndergroundOil.CheckBlackList(chunk.worldObj.provider.dimensionId)) return null;
+        World aWorld = chunk.worldObj;
+
+        //Read hash map
+        HashMap<ChunkCoordIntPair, int[]> chunkData = dimensionWiseChunkData.get(aWorld.provider.dimensionId);
+        if(chunkData==null){
+            chunkData=new HashMap<>(1024);
+            dimensionWiseChunkData.put(aWorld.provider.dimensionId,chunkData);
+        }
+
+        int[] tInts = chunkData.get(chunk.getChunkCoordIntPair());
+
+        if(tInts==null) tInts=getDefaultChunkDataOnCreation();//init if null
+        else if(tInts[GTOIL]==0){//FAST stop
+            //can return 0 amount stack for info :D
+            return drainSpeedCoefficient>=0 ? null : new FluidStack(FluidRegistry.getFluid(tInts[GTOILFLUID]),0);
+        }
+
+        //GEN IT TO GET OBJECT...
+        XSTR tRandom = new XSTR(aWorld.getSeed() + aWorld.provider.dimensionId * 2 +
+                       (chunk.getChunkCoordIntPair().chunkXPos>>3) +
+                8267 * (chunk.getChunkCoordIntPair().chunkZPos>>3));
+        GT_UO_Fluid uoFluid = GT_Mod.gregtechproxy.mUndergroundOil.GetDimension(aWorld.provider.dimensionId).getRandomFluid(tRandom);
+
+        //Fluid stack holder
+        FluidStack fluidInChunk;
+
+        //Set fluidstack from uoFluid
+        if (uoFluid == null || uoFluid.getFluid()==null){
+            tInts[GTOILFLUID]=Integer.MAX_VALUE;//null fluid pointer... kindof
+            tInts[GTOIL]=0;
+            chunkData.put(chunk.getChunkCoordIntPair(),tInts);//update hash map
+            return null;
+        } else {
+            if(tInts[GTOILFLUID]== uoFluid.getFluid().getID()){//if stored fluid matches uoFluid
+                fluidInChunk = new FluidStack(uoFluid.getFluid(),tInts[GTOIL]);
+            }else{
+                fluidInChunk  = new FluidStack(uoFluid.getFluid(), uoFluid.getRandomAmount(tRandom));
+                tRandom=new XSTR();
+                fluidInChunk.amount=(int)((float)fluidInChunk.amount*(0.75f+(tRandom.nextFloat()/2f)));//Randomly change amounts by +/- 25%
+            }
+            tInts[GTOIL]=fluidInChunk.amount;
+            tInts[GTOILFLUID]=fluidInChunk.getFluidID();
+        }
+
+        //do stuff on it if needed
+        if(drainSpeedCoefficient>=0){
+            if(fluidInChunk.amount<DIVIDER){
+                fluidInChunk=null;
+                tInts[GTOIL]=0;//so in next access it will stop way above
+            }else{
+                fluidInChunk.amount = (int)(fluidInChunk.amount*(double)drainSpeedCoefficient/DIVIDER);//give appropriate amount
+                tInts[GTOIL]-=uoFluid.DecreasePerOperationAmount;//diminish amount
+            }
+        }else{//just get info
+            if(fluidInChunk.amount<DIVIDER){
+                fluidInChunk.amount=0;//return informative stack
+                tInts[GTOIL]=0;//so in next access it will stop way above
+            }else{
+                fluidInChunk.amount=fluidInChunk.amount/DIVIDER;//give moderate extraction speed
+            }
+        }
+
+        chunkData.put(chunk.getChunkCoordIntPair(),tInts);//update hash map
+        return fluidInChunk;
+    }
+}
diff --git a/src/main/java/gregtech/common/GT_Worldgenerator.java b/src/main/java/gregtech/common/GT_Worldgenerator.java
index 73b720ca21..2b63f337c3 100644
--- a/src/main/java/gregtech/common/GT_Worldgenerator.java
+++ b/src/main/java/gregtech/common/GT_Worldgenerator.java
@@ -10,17 +10,15 @@ import gregtech.api.world.GT_Worldgen;
 import gregtech.common.blocks.GT_TileEntity_Ores;

 import net.minecraft.init.Blocks;

 import net.minecraft.util.MathHelper;

+import net.minecraft.world.ChunkCoordIntPair;

 import net.minecraft.world.World;

-import net.minecraft.world.biome.BiomeGenBase;

 import net.minecraft.world.chunk.Chunk;

 import net.minecraft.world.chunk.IChunkProvider;

-import net.minecraft.world.gen.ChunkProviderEnd;

-import net.minecraft.world.gen.ChunkProviderHell;

 

+import java.util.HashSet;

 import java.util.Random;

 

-public class GT_Worldgenerator

-        implements IWorldGenerator {

+public class GT_Worldgenerator implements IWorldGenerator {

     private static int mEndAsteroidProbability = 300;

     private static int mGCAsteroidProbability = 50;

     private static int mSize = 100;

@@ -52,16 +50,16 @@ public class GT_Worldgenerator
         new WorldGenContainer(new XSTR(aRandom.nextInt()), aX * 16, aZ * 16, tempDimensionId, aWorld, aChunkGenerator, aChunkProvider, aWorld.getBiomeGenForCoords(aX * 16 + 8, aZ * 16 + 8).biomeName).run();

     }

 

-    public static class WorldGenContainer

-            implements Runnable {

+    public static class WorldGenContainer implements Runnable {

         public final Random mRandom;

-        public final int mX;

-        public final int mZ;

+        public int mX;

+        public int mZ;

         public final int mDimensionType;

         public final World mWorld;

         public final IChunkProvider mChunkGenerator;

         public final IChunkProvider mChunkProvider;

         public final String mBiome;

+        public static HashSet<ChunkCoordIntPair> mGenerated = new HashSet<>(2000);

 

         public WorldGenContainer(Random aRandom, int aX, int aZ, int aDimensionType, World aWorld, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider, String aBiome) {

             this.mRandom = aRandom;

@@ -74,8 +72,22 @@ public class GT_Worldgenerator
             this.mBiome = aBiome;

         }

 

+        //returns a coordinate of a center chunk of 3x3 square; the argument belongs to this square

+        public int getVeinCenterCoordinate(int c) {

+            c += c < 0 ? 1 : 3;

+            return c - c % 3 - 2;

+        }

+

+        public boolean surroundingChunksLoaded(int xCenter, int zCenter) {

+            return mWorld.checkChunksExist(xCenter - 16, 0, zCenter - 16, xCenter + 16, 0, zCenter + 16);

+        }

+

         public void run() {

-            if (((this.mX / 16 - 1) % 3 == 0) && ((this.mZ / 16 - 1) % 3 == 0)) {

+            int xCenter = getVeinCenterCoordinate(mX >> 4) << 4;

+            int zCenter = getVeinCenterCoordinate(mZ >> 4) << 4;

+            ChunkCoordIntPair centerChunk = new ChunkCoordIntPair(xCenter, zCenter);

+            if (surroundingChunksLoaded(xCenter, zCenter) && !mGenerated.contains(centerChunk)) {

+                mGenerated.add(centerChunk);

                 if ((GT_Worldgen_GT_Ore_Layer.sWeight > 0) && (GT_Worldgen_GT_Ore_Layer.sList.size() > 0)) {

                     boolean temp = true;

                     int tRandomWeight;

@@ -85,7 +97,7 @@ public class GT_Worldgenerator
                             tRandomWeight -= ((GT_Worldgen_GT_Ore_Layer) tWorldGen).mWeight;

                             if (tRandomWeight <= 0) {

                                 try {

-                                    if (tWorldGen.executeWorldgen(this.mWorld, this.mRandom, this.mBiome, this.mDimensionType, this.mX, this.mZ, this.mChunkGenerator, this.mChunkProvider)) {

+                                    if (tWorldGen.executeWorldgen(this.mWorld, this.mRandom, this.mBiome, this.mDimensionType, xCenter, zCenter, this.mChunkGenerator, this.mChunkProvider)) {

                                         temp = false;

                                     }

                                     break;

@@ -97,10 +109,9 @@ public class GT_Worldgenerator
                     }

                 }

                 int i = 0;

-                for (int tX = this.mX - 16; i < 3; tX += 16) {

+                for (int tX = xCenter - 16; i < 3; tX += 16) {

                     int j = 0;

-                    for (int tZ = this.mZ - 16; j < 3; tZ += 16) {

-                        String tBiome = this.mWorld.getBiomeGenForCoords(tX + 8, tZ + 8).biomeName;

+                    for (int tZ = zCenter - 16; j < 3; tZ += 16) {

                         try {

                             for (GT_Worldgen tWorldGen : GregTech_API.sWorldgenList) {

                                 tWorldGen.executeWorldgen(this.mWorld, this.mRandom, this.mBiome, this.mDimensionType, tX, tZ, this.mChunkGenerator, this.mChunkProvider);

@@ -118,7 +129,7 @@ public class GT_Worldgenerator
             String tDimensionName = this.mWorld.provider.getDimensionName();

             Random aRandom = new Random();

             if (((tDimensionType == 1) && endAsteroids && ((mEndAsteroidProbability <= 1) || (aRandom.nextInt(mEndAsteroidProbability) == 0))) || ((tDimensionName.equals("Asteroids")) && gcAsteroids && ((mGCAsteroidProbability <= 1) || (aRandom.nextInt(mGCAsteroidProbability) == 0)))) {

-            	short primaryMeta = 0;

+                short primaryMeta = 0;

                 short secondaryMeta = 0;

                 short betweenMeta = 0;

                 short sporadicMeta = 0;

@@ -146,7 +157,7 @@ public class GT_Worldgenerator
                         }

                     }

                 }

-                if(GT_Values.D1)System.out.println("do asteroid gen: "+this.mX+" "+this.mZ);

+                if (GT_Values.D1) System.out.println("do asteroid gen: " + this.mX + " " + this.mZ);

                 int tX = mX + aRandom.nextInt(16);

                 int tY = 50 + aRandom.nextInt(200 - 50);

                 int tZ = mZ + aRandom.nextInt(16);

@@ -198,12 +209,7 @@ public class GT_Worldgenerator
                                                     if (tDimensionType == 1) {

                                                         mWorld.setBlock(eX, eY, eZ, Blocks.end_stone, 0, 2);

                                                     } else if (tDimensionName.equals("Asteroids")) {

-                                                        //int asteroidType = aRandom.nextInt(20);

-                                                        //if (asteroidType == 19) { //Rare Asteroid?

-                                                        //mWorld.setBlock(eX, eY, eZ, GregTech_API.sBlockGranites, 8, 3);

-                                                        //} else {

                                                         mWorld.setBlock(eX, eY, eZ, GregTech_API.sBlockGranites, 8, 3);

-                                                        //}

                                                     }

                                                 }

                                             }

@@ -214,10 +220,8 @@ public class GT_Worldgenerator
                         }

                     }

                 }

-

             }

 

-

             Chunk tChunk = this.mWorld.getChunkFromBlockCoords(this.mX, this.mZ);

             if (tChunk != null) {

                 tChunk.isModified = true;

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
index 639cbf5d6f..81daf2c04a 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
@@ -27,8 +27,8 @@ public class GT_Block_Casings4
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Clean Stainless Steel Machine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Stable Titanium Machine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Titanium Firebox Casing");
-//    GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Fusion Casing");
-//    GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Fusion Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Chemically Inert Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "PTFE Pipe Machine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Fusion Machine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Fusion Coil Block");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Fusion Machine Casing MK II");
@@ -37,13 +37,14 @@ public class GT_Block_Casings4
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Titanium Turbine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Tungstensteel Turbine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Engine Intake Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chemically Inert Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "PTFE Pipe Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Mining Osmiridium Casing");
 
         ItemList.Casing_RobustTungstenSteel.set(new ItemStack(this, 1, 0));
         ItemList.Casing_CleanStainlessSteel.set(new ItemStack(this, 1, 1));
         ItemList.Casing_StableTitanium.set(new ItemStack(this, 1, 2));
         ItemList.Casing_Firebox_Titanium.set(new ItemStack(this, 1, 3));
+        ItemList.Casing_Chemically_Inert.set(new ItemStack(this, 1, 4));
+        ItemList.Casing_Pipe_Polytetrafluoroethylene.set(new ItemStack(this, 1, 5));
         ItemList.Casing_Fusion.set(new ItemStack(this, 1, 6));
         ItemList.Casing_Fusion_Coil.set(new ItemStack(this, 1, 7));
         ItemList.Casing_Fusion2.set(new ItemStack(this, 1, 8));
@@ -52,8 +53,7 @@ public class GT_Block_Casings4
         ItemList.Casing_Turbine2.set(new ItemStack(this, 1, 11));
         ItemList.Casing_Turbine3.set(new ItemStack(this, 1, 12));
         ItemList.Casing_EngineIntake.set(new ItemStack(this, 1, 13));
-        ItemList.Casing_Chemically_Inert.set(new ItemStack(this, 1, 14));
-        ItemList.Casing_Pipe_Polytetrafluoroethylene.set(new ItemStack(this, 1, 15));
+        ItemList.Casing_MiningOsmiridium.set(new ItemStack(this, 1, 14));
     }
 
     public IIcon getIcon(int aSide, int aMeta) {
@@ -67,9 +67,9 @@ public class GT_Block_Casings4
             case 3:
                 return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_TITANIUM.getIcon() : Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
             case 4:
-                return Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW.getIcon();
+                return Textures.BlockIcons.MACHINE_CASING_CHEMICALLY_INERT.getIcon();
             case 5:
-                return Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS.getIcon();
+                return Textures.BlockIcons.MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.getIcon();
             case 6:
                 return Textures.BlockIcons.MACHINE_CASING_FUSION.getIcon();
             case 7:
@@ -87,9 +87,9 @@ public class GT_Block_Casings4
             case 13:
                 return Textures.BlockIcons.MACHINE_CASING_ENGINE_INTAKE.getIcon();
             case 14:
-                return Textures.BlockIcons.MACHINE_CASING_CHEMICALLY_INERT.getIcon();
+                return Textures.BlockIcons.MACHINE_CASING_MINING_OSMIRIDIUM.getIcon();
             case 15:
-                return Textures.BlockIcons.MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.getIcon();
+                return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
         }
         return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
     }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
index 3d8a814260..42e50794a2 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
@@ -196,6 +196,27 @@ public class GT_Block_Machines
         return super.getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);

     }

 

+    @Override

+    @SideOnly(Side.CLIENT)

+    public AxisAlignedBB getSelectedBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) {

+        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);

+        if (((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null)) {

+            return ((IGregTechTileEntity) tTileEntity).getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);

+        }

+        return super.getSelectedBoundingBoxFromPool(aWorld, aX, aY, aZ);

+    }

+

+    @Override

+    public void setBlockBoundsBasedOnState(IBlockAccess blockAccess, int aX, int aY, int aZ) {

+        TileEntity tTileEntity = blockAccess.getTileEntity(aX, aY, aZ);

+        if (((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null)) {

+            AxisAlignedBB bbb = ((IGregTechTileEntity) tTileEntity).getCollisionBoundingBoxFromPool(((IGregTechTileEntity) tTileEntity).getWorld(), aX, aY, aZ).getOffsetBoundingBox(-aX, -aY, -aZ);

+            setBlockBounds((float) bbb.minX, (float) bbb.minY, (float) bbb.minZ, (float) bbb.maxX, (float) bbb.maxY, (float) bbb.maxZ);

+            return;

+        }

+        super.setBlockBoundsBasedOnState(blockAccess, aX, aY, aZ);

+    }

+

     public void onEntityCollidedWithBlock(World aWorld, int aX, int aY, int aZ, Entity collider) {

         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);

         if (((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null)) {

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
index 4b61da0f3f..ccb4896d68 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
@@ -36,7 +36,6 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     public static ThreadLocal<GT_TileEntity_Ores> mTemporaryTileEntity = new ThreadLocal();
     public static boolean FUCKING_LOCK = false;
     public static boolean tHideOres;
-    public static int tOreMetaCount;
     private final String aTextName = ".name";
     private final String aTextSmall = "Small ";
 
@@ -46,7 +45,6 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
         setStepSound(soundTypeStone);
         setCreativeTab(GregTech_API.TAB_GREGTECH_ORES);
         tHideOres = Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres;
-        tOreMetaCount = aOreMetaCount;
         if(aOreMetaCount > 8 || aOreMetaCount < 0) aOreMetaCount = 8;
 
         for (int i = 0; i < 16; i++) {
@@ -59,12 +57,11 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
                     GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + ((i + 16000) + (j * 1000)) + aTextName, aTextSmall + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                     if ((GregTech_API.sGeneratedMaterials[i].mTypes & 0x8) != 0) {
                         GT_OreDictUnificator.registerOre(this.getProcessingPrefix()[j] != null ? this.getProcessingPrefix()[j].get(GregTech_API.sGeneratedMaterials[i]) : "", new ItemStack(this, 1, i + (j * 1000)));
-                        if (tHideOres) {
-                            if(!(j == 0 && !aHideFirstMeta)){
-                                codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + (j * 1000)));}
+                    if (tHideOres) {
+                        if(!(j == 0 && !aHideFirstMeta)){
+                            codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + (j * 1000)));}
                             codechicken.nei.api.API.hideItem(new ItemStack(this, 1, (i + 16000) + (j * 1000)));
-                        }
-                    }
+                    }}
                 }
             }
         }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java
index d7a47c0bb6..c63882e944 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java
@@ -184,7 +184,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block {
     }
 
     public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {
-        return true;
+        return false;
     }
 
     public int damageDropped(int par1) {
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Stones.java b/src/main/java/gregtech/common/blocks/GT_Block_Stones.java
index 05c294f0ee..993033051b 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Stones.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Stones.java
@@ -29,22 +29,11 @@ public class GT_Block_Stones extends GT_Block_Stones_Abstract {
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Mossy Basalt Bricks");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chiseled Basalt");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Smooth Basalt");
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(this, 1, 0));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(this, 1, 1));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(this, 1, 2));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(this, 1, 3));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(this, 1, 4));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(this, 1, 5));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(this, 1, 6));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(this, 1, 7));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(this, 1, 8));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(this, 1, 9));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(this, 1, 10));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(this, 1, 11));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(this, 1, 12));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(this, 1, 13));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(this, 1, 14));
-        GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(this, 1, 15));
+        for(int i = 0;i<16;i++){
+            GT_OreDictUnificator.registerOre(OrePrefixes.stone, i < 8 ? Materials.Marble : Materials.Basalt, new ItemStack(this, 1, i));
+            GT_OreDictUnificator.registerOre(OrePrefixes.block, i < 8 ? Materials.Marble : Materials.Basalt, new ItemStack(this, 1, i));
+            GT_OreDictUnificator.registerOre((i < 8 ? Materials.Marble.mName.toLowerCase() : Materials.Basalt.mName.toLowerCase()), new ItemStack(this, 1, i));        	
+        }
     }
 
     public int getHarvestLevel(int aMeta) {
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
index 4014b01f39..8189a8a52b 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
@@ -33,14 +33,9 @@ public class GT_Item_Machines
             if ((tDamage <= 0) || (tDamage >= GregTech_API.METATILEENTITIES.length)) {

                 return;

             }

-            TileEntity temp = GregTech_API.sBlockMachines.createTileEntity(aPlayer == null ? GT_Values.DW : aPlayer.worldObj, GregTech_API.METATILEENTITIES[tDamage] == null ? 0 : GregTech_API.METATILEENTITIES[tDamage].getTileEntityBaseType());

-            temp.setWorldObj(aPlayer == null ? GT_Values.DW : aPlayer.worldObj);

-            temp.xCoord = 0;

-            temp.yCoord = 0;

-            temp.zCoord = 0;

-            if ((temp instanceof IGregTechTileEntity)) {

-                IGregTechTileEntity tTileEntity = (IGregTechTileEntity) temp;

-                tTileEntity.setInitialValuesAsNBT(new NBTTagCompound(), (short) tDamage);

+

+            if (GregTech_API.METATILEENTITIES[tDamage] != null) {

+                IGregTechTileEntity tTileEntity = GregTech_API.METATILEENTITIES[tDamage].getBaseMetaTileEntity();

                 if (tTileEntity.getDescription() != null) {

                     int i = 0;

                     for (String tDescription : tTileEntity.getDescription()) {

diff --git a/src/main/java/gregtech/common/blocks/GT_Material_Casings.java b/src/main/java/gregtech/common/blocks/GT_Material_Casings.java
index 211fbdd65f..94afcbd894 100644
--- a/src/main/java/gregtech/common/blocks/GT_Material_Casings.java
+++ b/src/main/java/gregtech/common/blocks/GT_Material_Casings.java
@@ -13,6 +13,6 @@ public class GT_Material_Casings
     }

 

     public boolean isOpaque() {

-        return false;

+        return true;

     }

 }

diff --git a/src/main/java/gregtech/common/blocks/GT_Material_Reinforced.java b/src/main/java/gregtech/common/blocks/GT_Material_Reinforced.java
index a6cf425caa..4aa9ba6931 100644
--- a/src/main/java/gregtech/common/blocks/GT_Material_Reinforced.java
+++ b/src/main/java/gregtech/common/blocks/GT_Material_Reinforced.java
@@ -12,6 +12,6 @@ public class GT_Material_Reinforced
     }
 
     public boolean isOpaque() {
-        return false;
+        return true;
     }
 }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
index d0c2ae3cc0..240ca3667d 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
@@ -3,6 +3,7 @@ package gregtech.common.covers;
 import gregtech.api.interfaces.tileentity.ICoverable;

 import gregtech.api.interfaces.tileentity.IMachineProgress;

 import gregtech.api.util.GT_CoverBehavior;

+import gregtech.api.util.GT_LanguageManager;

 import gregtech.api.util.GT_Utility;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.tileentity.TileEntity;

@@ -38,7 +39,7 @@ public class GT_Cover_Arm
         } else {

             aCoverVariable -= 16;

         }

-        GT_Utility.sendChatToPlayer(aPlayer, (aCoverVariable > 0 ? "Puts out into adjacent Slot #" : "Grabs in for own Slot #") + (Math.abs(aCoverVariable) - 1));

+        GT_Utility.sendChatToPlayer(aPlayer, (aCoverVariable > 0 ? trans("001","Puts out into adjacent Slot #") : trans("002","Grabs in for own Slot #")) + (Math.abs(aCoverVariable) - 1));

         return aCoverVariable;

     }

 

@@ -48,7 +49,7 @@ public class GT_Cover_Arm
         } else {

             aCoverVariable--;

         }

-        GT_Utility.sendChatToPlayer(aPlayer, (aCoverVariable > 0 ? "Puts out into adjacent Slot #" : "Grabs in for own Slot #") + (Math.abs(aCoverVariable) - 1));

+        GT_Utility.sendChatToPlayer(aPlayer, (aCoverVariable > 0 ? trans("001","Puts out into adjacent Slot #") : trans("002","Grabs in for own Slot #")) + (Math.abs(aCoverVariable) - 1));

         aTileEntity.setCoverDataAtSide(aSide, aCoverVariable);

         return true;

     }

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
index abb6d0a3ad..f0bf72eacc 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
@@ -56,13 +56,13 @@ public class GT_Cover_ControlsWork
         aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % 3;

         if(aCoverVariable <0){aCoverVariable = 2;}

         if (aCoverVariable == 0) {

-            GT_Utility.sendChatToPlayer(aPlayer, "Normal");

+            GT_Utility.sendChatToPlayer(aPlayer, trans("003", "Normal"));

         }

         if (aCoverVariable == 1) {

-            GT_Utility.sendChatToPlayer(aPlayer, "Inverted");

+            GT_Utility.sendChatToPlayer(aPlayer, trans("004", "Inverted"));

         }

         if (aCoverVariable == 2) {

-            GT_Utility.sendChatToPlayer(aPlayer, "No Work at all");

+            GT_Utility.sendChatToPlayer(aPlayer, trans("005", "No Work at all"));

         }

         return aCoverVariable;

     }

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
index 0168228bc5..ca3674efa4 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
@@ -38,18 +38,18 @@ public class GT_Cover_Conveyor
         aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % 12;

         if(aCoverVariable <0){aCoverVariable = 11;}

         switch(aCoverVariable) {

-            case 0: GT_Utility.sendChatToPlayer(aPlayer, "Export"); break;

-            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Import"); break;

-            case 2: GT_Utility.sendChatToPlayer(aPlayer, "Export (conditional)"); break;

-            case 3: GT_Utility.sendChatToPlayer(aPlayer, "Import (conditional)"); break;

-            case 4: GT_Utility.sendChatToPlayer(aPlayer, "Export (invert cond)"); break;

-            case 5: GT_Utility.sendChatToPlayer(aPlayer, "Import (invert cond)"); break;

-            case 6: GT_Utility.sendChatToPlayer(aPlayer, "Export allow Input"); break;

-            case 7: GT_Utility.sendChatToPlayer(aPlayer, "Import allow Output"); break;

-            case 8: GT_Utility.sendChatToPlayer(aPlayer, "Export allow Input (conditional)"); break;

-            case 9: GT_Utility.sendChatToPlayer(aPlayer, "Import allow Output (conditional)"); break;

-            case 10: GT_Utility.sendChatToPlayer(aPlayer, "Export allow Input (invert cond)"); break;

-            case 11: GT_Utility.sendChatToPlayer(aPlayer, "Import allow Output (invert cond)"); break;

+            case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("006", "Export")); break;

+            case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("007", "Import")); break;

+            case 2: GT_Utility.sendChatToPlayer(aPlayer, trans("008", "Export (conditional)")); break;

+            case 3: GT_Utility.sendChatToPlayer(aPlayer, trans("009", "Import (conditional)")); break;

+            case 4: GT_Utility.sendChatToPlayer(aPlayer, trans("010", "Export (invert cond)")); break;

+            case 5: GT_Utility.sendChatToPlayer(aPlayer, trans("011", "Import (invert cond)")); break;

+            case 6: GT_Utility.sendChatToPlayer(aPlayer, trans("012", "Export allow Input")); break;

+            case 7: GT_Utility.sendChatToPlayer(aPlayer, trans("013", "Import allow Output")); break;

+            case 8: GT_Utility.sendChatToPlayer(aPlayer, trans("014", "Export allow Input (conditional)")); break;

+            case 9: GT_Utility.sendChatToPlayer(aPlayer, trans("015", "Import allow Output (conditional)")); break;

+            case 10: GT_Utility.sendChatToPlayer(aPlayer, trans("016", "Export allow Input (invert cond)")); break;

+            case 11: GT_Utility.sendChatToPlayer(aPlayer, trans("017", "Import allow Output (invert cond)")); break;

         }

         return aCoverVariable;

     }

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
index 0a440c5ae4..7830b3824a 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
@@ -31,10 +31,10 @@ public class GT_Cover_DoesWork
         aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % 4;

         if(aCoverVariable <0){aCoverVariable = 3;}

         switch(aCoverVariable) {

-            case 0: GT_Utility.sendChatToPlayer(aPlayer, "Normal"); break;

-            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Inverted"); break;

-            case 2: GT_Utility.sendChatToPlayer(aPlayer, "Ready to work"); break;

-            case 3: GT_Utility.sendChatToPlayer(aPlayer, "Not ready to work"); break;

+            case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("018", "Normal")); break;

+            case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("019", "Inverted")); break;

+            case 2: GT_Utility.sendChatToPlayer(aPlayer, trans("020", "Ready to work")); break;

+            case 3: GT_Utility.sendChatToPlayer(aPlayer, trans("021", "Not ready to work")); break;

         }

         return aCoverVariable;

     }

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java
index 09a7a9a36b..ee2ae8a303 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java
@@ -61,12 +61,12 @@ public class GT_Cover_Drain
         aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % 6;

         if(aCoverVariable <0){aCoverVariable = 5;}

         switch(aCoverVariable) {

-            case 0: GT_Utility.sendChatToPlayer(aPlayer, "Import"); break;

-            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Import (conditional)"); break;

-            case 2: GT_Utility.sendChatToPlayer(aPlayer, "Import (invert cond)"); break;

-            case 3: GT_Utility.sendChatToPlayer(aPlayer, "Keep Liquids Away"); break;

-            case 4: GT_Utility.sendChatToPlayer(aPlayer, "Keep Liquids Away (conditional)"); break;

-            case 5: GT_Utility.sendChatToPlayer(aPlayer, "Keep Liquids Away (invert cond)"); break;

+            case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("022", "Import")); break;

+            case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("023", "Import (conditional)")); break;

+            case 2: GT_Utility.sendChatToPlayer(aPlayer, trans("024", "Import (invert cond)")); break;

+            case 3: GT_Utility.sendChatToPlayer(aPlayer, trans("025", "Keep Liquids Away")); break;

+            case 4: GT_Utility.sendChatToPlayer(aPlayer, trans("026", "Keep Liquids Away (conditional)")); break;

+            case 5: GT_Utility.sendChatToPlayer(aPlayer, trans("027", "Keep Liquids Away (invert cond)")); break;

         }

         return aCoverVariable;

     }

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
index 8a59326236..87cb83598f 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
@@ -94,18 +94,18 @@ public class GT_Cover_EUMeter
         aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % 12;

         if(aCoverVariable <0){aCoverVariable = 11;}

         switch(aCoverVariable) {

-            case 0: GT_Utility.sendChatToPlayer(aPlayer, "Normal Universal Storage"); break;

-            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Inverted Universal Storage"); break;

-            case 2: GT_Utility.sendChatToPlayer(aPlayer, "Normal Electricity Storage"); break;

-            case 3: GT_Utility.sendChatToPlayer(aPlayer, "Inverted Electricity Storage"); break;

-            case 4: GT_Utility.sendChatToPlayer(aPlayer, "Normal Steam Storage"); break;

-            case 5: GT_Utility.sendChatToPlayer(aPlayer, "Inverted Steam Storage"); break;

-            case 6: GT_Utility.sendChatToPlayer(aPlayer, "Normal Average Electric Input"); break;

-            case 7: GT_Utility.sendChatToPlayer(aPlayer, "Inverted Average Electric Input"); break;

-            case 8: GT_Utility.sendChatToPlayer(aPlayer, "Normal Average Electric Output"); break;

-            case 9: GT_Utility.sendChatToPlayer(aPlayer, "Inverted Average Electric Output"); break;

-            case 10: GT_Utility.sendChatToPlayer(aPlayer, "Normal Electricity Storage(Including Batteries)"); break;

-            case 11: GT_Utility.sendChatToPlayer(aPlayer, "Inverted Electricity Storage(Including Batteries)"); break;

+            case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("031", "Normal Universal Storage")); break;

+            case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("032", "Inverted Universal Storage")); break;

+            case 2: GT_Utility.sendChatToPlayer(aPlayer, trans("033", "Normal Electricity Storage")); break;

+            case 3: GT_Utility.sendChatToPlayer(aPlayer, trans("034", "Inverted Electricity Storage")); break;

+            case 4: GT_Utility.sendChatToPlayer(aPlayer, trans("035", "Normal Steam Storage")); break;

+            case 5: GT_Utility.sendChatToPlayer(aPlayer, trans("036", "Inverted Steam Storage")); break;

+            case 6: GT_Utility.sendChatToPlayer(aPlayer, trans("037", "Normal Average Electric Input")); break;

+            case 7: GT_Utility.sendChatToPlayer(aPlayer, trans("038", "Inverted Average Electric Input")); break;

+            case 8: GT_Utility.sendChatToPlayer(aPlayer, trans("039", "Normal Average Electric Output")); break;

+            case 9: GT_Utility.sendChatToPlayer(aPlayer, trans("040", "Inverted Average Electric Output")); break;

+            case 10: GT_Utility.sendChatToPlayer(aPlayer, trans("041", "Normal Electricity Storage(Including Batteries)")); break;

+            case 11: GT_Utility.sendChatToPlayer(aPlayer, trans("042", "Inverted Electricity Storage(Including Batteries)")); break;

         }

         return aCoverVariable;

     }

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_EnergyOnly.java b/src/main/java/gregtech/common/covers/GT_Cover_EnergyOnly.java
index 2ab40531f3..46b34ebac9 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_EnergyOnly.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_EnergyOnly.java
@@ -12,9 +12,9 @@ public class GT_Cover_EnergyOnly
     public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {

         aCoverVariable = (aCoverVariable + 1) % 3;

         switch(aCoverVariable) {

-            case 0: GT_Utility.sendChatToPlayer(aPlayer, "Allow"); break;

-            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Allow (conditional)"); break;

-            case 2: GT_Utility.sendChatToPlayer(aPlayer, "Disallow (conditional)"); break;

+            case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("028", "Allow")); break;

+            case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("029", "Allow (conditional)")); break;

+            case 2: GT_Utility.sendChatToPlayer(aPlayer, trans("030", "Disallow (conditional)")); break;

         }

         return aCoverVariable;

     }

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
index a8361a78dc..fd8e13504c 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
@@ -72,7 +72,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehavior {
 			aCoverVariable = (0 - mTransferRate);
 		}
 		GT_Utility.sendChatToPlayer(aPlayer,
-				"Pump speed: " + aCoverVariable + "L/tick " + aCoverVariable * 20 + "L/sec");
+				trans("048", "Pump speed: ") + aCoverVariable + trans("049", "L/tick ") + aCoverVariable * 20 + trans("050", "L/sec"));
 		return aCoverVariable;
 	}
 
@@ -90,7 +90,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehavior {
 			aCoverVariable = (0 - mTransferRate);
 		}
 		GT_Utility.sendChatToPlayer(aPlayer,
-				"Pump speed: " + aCoverVariable + "L/tick " + aCoverVariable * 20 + "L/sec");
+				trans("048", "Pump speed: ") + aCoverVariable + trans("049", "L/tick ") + aCoverVariable * 20 + trans("050", "L/sec"));
 		aTileEntity.setCoverDataAtSide(aSide, aCoverVariable);
 		return true;
 	}
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
index 2b65e36994..9d54e83569 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
@@ -33,10 +33,10 @@ public class GT_Cover_Fluidfilter
         aFilterMode = (aFilterMode + (aPlayer.isSneaking()? -1 : 1)) % 4;
         if(aFilterMode < 0){aFilterMode = 3;}
         switch(aFilterMode) {
-            case 0: GT_Utility.sendChatToPlayer(aPlayer, "Allow input, no output"); break;
-            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Deny input, no output"); break;
-            case 2: GT_Utility.sendChatToPlayer(aPlayer, "Allow input, permit any output"); break;
-            case 3: GT_Utility.sendChatToPlayer(aPlayer, "Deny input, permit any output"); break;
+            case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("043", "Allow input, no output")); break;
+            case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("044", "Deny input, no output")); break;
+            case 2: GT_Utility.sendChatToPlayer(aPlayer, trans("045", "Allow input, permit any output")); break;
+            case 3: GT_Utility.sendChatToPlayer(aPlayer, trans("046", "Deny input, permit any output")); break;
         }
         aCoverVariable|=aFilterMode;
         return aCoverVariable;
@@ -54,7 +54,7 @@ public class GT_Cover_Fluidfilter
                 aCoverVariable = (aCoverVariable & 7) | (aFluid << 3);
                 aTileEntity.setCoverDataAtSide(aSide, aCoverVariable);
                 FluidStack sFluid = new FluidStack(FluidRegistry.getFluid(aFluid),1000);
-                GT_Utility.sendChatToPlayer(aPlayer, "Filter Fluid: " + sFluid.getLocalizedName());
+                GT_Utility.sendChatToPlayer(aPlayer, trans("047", "Filter Fluid: ") + sFluid.getLocalizedName());
             }else if(tStack.getItem() instanceof IFluidContainerItem){
                 IFluidContainerItem tContainer = (IFluidContainerItem)tStack.getItem();
                 if(tContainer.getFluid(tStack) != null) {
@@ -62,7 +62,7 @@ public class GT_Cover_Fluidfilter
                     aCoverVariable = (aCoverVariable & 7) | (aFluid << 3);
                     aTileEntity.setCoverDataAtSide(aSide, aCoverVariable);
                     FluidStack sFluid = new FluidStack(FluidRegistry.getFluid(aFluid),1000);
-                    GT_Utility.sendChatToPlayer(aPlayer, "Filter Fluid: " + sFluid.getLocalizedName());
+                    GT_Utility.sendChatToPlayer(aPlayer, trans("047", "Filter Fluid: ") + sFluid.getLocalizedName());
                 }
             }
             }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
index d353b715dc..448470f87f 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
@@ -38,9 +38,9 @@ public class GT_Cover_ItemMeter
     public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {

         aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % (1 + aTileEntity.getSizeInventory());

         switch(aCoverVariable) {

-            case 0: GT_Utility.sendChatToPlayer(aPlayer, "Normal"); break;

-            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Inverted"); break;

-            default: GT_Utility.sendChatToPlayer(aPlayer, "Slot: " + (aCoverVariable - 2)); break;

+            case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("051", "Normal")); break;

+            case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("052", "Inverted")); break;

+            default: GT_Utility.sendChatToPlayer(aPlayer, trans("053", "Slot: ") + (aCoverVariable - 2)); break;

         }

         return aCoverVariable;

     }

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java
index 882c32e244..4874e4bd82 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java
@@ -42,9 +42,9 @@ public class GT_Cover_LiquidMeter
 
     public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (aCoverVariable == 0) {
-            GT_Utility.sendChatToPlayer(aPlayer, "Inverted");
+            GT_Utility.sendChatToPlayer(aPlayer, trans("054", "Inverted"));
         } else {
-            GT_Utility.sendChatToPlayer(aPlayer, "Normal");
+            GT_Utility.sendChatToPlayer(aPlayer, trans("055", "Normal"));
         }
         return aCoverVariable == 0 ? 1 : 0;
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java
index 1f5c5c2fbb..4c0f47751f 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java
@@ -64,18 +64,18 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
         aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % 12;
         if(aCoverVariable <0){aCoverVariable = 11;}
         switch(aCoverVariable) {
-            case 0: GT_Utility.sendChatToPlayer(aPlayer, "Emit if 1 Maintenance Needed"); break;
-            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Emit if 1 Maintenance Needed(inverted)"); break;
-            case 2: GT_Utility.sendChatToPlayer(aPlayer, "Emit if 2 Maintenance Needed"); break;
-            case 3: GT_Utility.sendChatToPlayer(aPlayer, "Emit if 2 Maintenance Needed(inverted)"); break;
-            case 4: GT_Utility.sendChatToPlayer(aPlayer, "Emit if 3 Maintenance Needed"); break;
-            case 5: GT_Utility.sendChatToPlayer(aPlayer, "Emit if 3 Maintenance Needed(inverted)"); break;
-            case 6: GT_Utility.sendChatToPlayer(aPlayer, "Emit if 4 Maintenance Needed"); break;
-            case 7: GT_Utility.sendChatToPlayer(aPlayer, "Emit if 4 Maintenance Needed(inverted)"); break;
-            case 8: GT_Utility.sendChatToPlayer(aPlayer, "Emit if 5 Maintenance Needed"); break;
-            case 9: GT_Utility.sendChatToPlayer(aPlayer, "Emit if 5 Maintenance Needed(inverted)"); break;
-            case 10: GT_Utility.sendChatToPlayer(aPlayer, "Emit if rotor needs maintainance"); break;
-            case 11: GT_Utility.sendChatToPlayer(aPlayer, "Emit if rotor needs maintainance(inverted)"); break;
+            case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("056", "Emit if 1 Maintenance Needed")); break;
+            case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("057", "Emit if 1 Maintenance Needed(inverted)")); break;
+            case 2: GT_Utility.sendChatToPlayer(aPlayer, trans("058", "Emit if 2 Maintenance Needed")); break;
+            case 3: GT_Utility.sendChatToPlayer(aPlayer, trans("059", "Emit if 2 Maintenance Needed(inverted)")); break;
+            case 4: GT_Utility.sendChatToPlayer(aPlayer, trans("060", "Emit if 3 Maintenance Needed")); break;
+            case 5: GT_Utility.sendChatToPlayer(aPlayer, trans("061", "Emit if 3 Maintenance Needed(inverted)")); break;
+            case 6: GT_Utility.sendChatToPlayer(aPlayer, trans("062", "Emit if 4 Maintenance Needed")); break;
+            case 7: GT_Utility.sendChatToPlayer(aPlayer, trans("063", "Emit if 4 Maintenance Needed(inverted)")); break;
+            case 8: GT_Utility.sendChatToPlayer(aPlayer, trans("064", "Emit if 5 Maintenance Needed")); break;
+            case 9: GT_Utility.sendChatToPlayer(aPlayer, trans("065", "Emit if 5 Maintenance Needed(inverted)")); break;
+            case 10: GT_Utility.sendChatToPlayer(aPlayer, trans("066", "Emit if rotor needs maintainance")); break;
+            case 11: GT_Utility.sendChatToPlayer(aPlayer, trans("067", "Emit if rotor needs maintainance(inverted)")); break;
         }
         return aCoverVariable;
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
index 9c61f4feee..9e6c764170 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
@@ -56,9 +56,9 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
         aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % 3;
         if(aCoverVariable <0){aCoverVariable = 2;}
         switch(aCoverVariable) {
-            case 0: GT_Utility.sendChatToPlayer(aPlayer, "Emit if any Player is close"); break;
-            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Emit if you are close"); break;
-            case 2: GT_Utility.sendChatToPlayer(aPlayer, "Emit if other player is close"); break;
+            case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("068", "Emit if any Player is close")); break;
+            case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("069", "Emit if other Player is close")); break;
+            case 2: GT_Utility.sendChatToPlayer(aPlayer, trans("070", "Emit if you are close")); break;
         }
         return aCoverVariable;
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
index 2bae554b76..1572d33edc 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
@@ -71,18 +71,18 @@ public class GT_Cover_Pump
         aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % 12;

         if(aCoverVariable <0){aCoverVariable = 11;}

         switch(aCoverVariable) {

-            case 0: GT_Utility.sendChatToPlayer(aPlayer, "Export"); break;

-            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Import"); break;

-            case 2: GT_Utility.sendChatToPlayer(aPlayer, "Export (conditional)"); break;

-            case 3: GT_Utility.sendChatToPlayer(aPlayer, "Import (conditional)"); break;

-            case 4: GT_Utility.sendChatToPlayer(aPlayer, "Export (invert cond)"); break;

-            case 5: GT_Utility.sendChatToPlayer(aPlayer, "Import (invert cond)"); break;

-            case 6: GT_Utility.sendChatToPlayer(aPlayer, "Export allow Input"); break;

-            case 7: GT_Utility.sendChatToPlayer(aPlayer, "Import allow Output"); break;

-            case 8: GT_Utility.sendChatToPlayer(aPlayer, "Export allow Input (conditional)"); break;

-            case 9: GT_Utility.sendChatToPlayer(aPlayer, "Import allow Output (conditional)"); break;

-            case 10: GT_Utility.sendChatToPlayer(aPlayer, "Export allow Input (invert cond)"); break;

-            case 11: GT_Utility.sendChatToPlayer(aPlayer, "Import allow Output (invert cond)"); break;

+        case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("006", "Export")); break;

+        case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("007", "Import")); break;

+        case 2: GT_Utility.sendChatToPlayer(aPlayer, trans("008", "Export (conditional)")); break;

+        case 3: GT_Utility.sendChatToPlayer(aPlayer, trans("009", "Import (conditional)")); break;

+        case 4: GT_Utility.sendChatToPlayer(aPlayer, trans("010", "Export (invert cond)")); break;

+        case 5: GT_Utility.sendChatToPlayer(aPlayer, trans("011", "Import (invert cond)")); break;

+        case 6: GT_Utility.sendChatToPlayer(aPlayer, trans("012", "Export allow Input")); break;

+        case 7: GT_Utility.sendChatToPlayer(aPlayer, trans("013", "Import allow Output")); break;

+        case 8: GT_Utility.sendChatToPlayer(aPlayer, trans("014", "Export allow Input (conditional)")); break;

+        case 9: GT_Utility.sendChatToPlayer(aPlayer, trans("015", "Import allow Output (conditional)")); break;

+        case 10: GT_Utility.sendChatToPlayer(aPlayer, trans("016", "Export allow Input (invert cond)")); break;

+        case 11: GT_Utility.sendChatToPlayer(aPlayer, trans("017", "Import allow Output (invert cond)")); break;

         }

         return aCoverVariable;

     }

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java
index 9675ef6c99..d824727492 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java
@@ -21,13 +21,13 @@ public class GT_Cover_RedstoneConductor
         aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % 7;

         if(aCoverVariable <0){aCoverVariable = 6;}

         switch (aCoverVariable) {

-            case 0: GT_Utility.sendChatToPlayer(aPlayer, "Conducts strongest Input"); break;

-            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Conducts from bottom Input"); break;

-            case 2: GT_Utility.sendChatToPlayer(aPlayer, "Conducts from top Input"); break;

-            case 3: GT_Utility.sendChatToPlayer(aPlayer, "Conducts from north Input"); break;

-            case 4: GT_Utility.sendChatToPlayer(aPlayer, "Conducts from south Input"); break;

-            case 5: GT_Utility.sendChatToPlayer(aPlayer, "Conducts from west Input"); break;

-            case 6: GT_Utility.sendChatToPlayer(aPlayer, "Conducts from east Input"); break;

+            case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("071", "Conducts strongest Input")); break;

+            case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("072", "Conducts from bottom Input")); break;

+            case 2: GT_Utility.sendChatToPlayer(aPlayer, trans("073", "Conducts from top Input")); break;

+            case 3: GT_Utility.sendChatToPlayer(aPlayer, trans("074", "Conducts from north Input")); break;

+            case 4: GT_Utility.sendChatToPlayer(aPlayer, trans("075", "Conducts from south Input")); break;

+            case 5: GT_Utility.sendChatToPlayer(aPlayer, trans("076", "Conducts from west Input")); break;

+            case 6: GT_Utility.sendChatToPlayer(aPlayer, trans("077", "Conducts from east Input")); break;

         }

         return aCoverVariable;

     }

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java
index 3af0a7de99..371928ec58 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java
@@ -2,10 +2,18 @@ package gregtech.common.covers;
 

 import gregtech.api.GregTech_API;

 import gregtech.api.interfaces.tileentity.ICoverable;

+import gregtech.api.interfaces.tileentity.IMachineProgress;

 

 public class GT_Cover_RedstoneReceiverInternal

         extends GT_Cover_RedstoneWirelessBase {

     public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) {

+        if (aTileEntity instanceof IMachineProgress) {

+            if (getRedstoneInput(aSide, aInputRedstone, aCoverID, aCoverVariable, aTileEntity) >0)

+                ((IMachineProgress) aTileEntity).enableWorking();

+            else

+                ((IMachineProgress) aTileEntity).disableWorking();

+            ((IMachineProgress) aTileEntity).setWorkDataValue(aInputRedstone);

+        }

         return aCoverVariable;

     }

 

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java
index fa1af824b3..cda45256b9 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java
@@ -12,9 +12,9 @@ public class GT_Cover_RedstoneSignalizer
     public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {

         aCoverVariable = (aCoverVariable + 1) % 48;

         switch(aCoverVariable / 16) {

-            case 0: GT_Utility.sendChatToPlayer(aPlayer, "Signal = " + (aCoverVariable & 0xF)); break;

-            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Conditional Signal = " + (aCoverVariable & 0xF)); break;

-            case 2: GT_Utility.sendChatToPlayer(aPlayer, "Inverted Conditional Signal = " + (aCoverVariable & 0xF)); break;

+            case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("078", "Signal = ") + (aCoverVariable & 0xF)); break;

+            case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("079", "Conditional Signal = ") + (aCoverVariable & 0xF)); break;

+            case 2: GT_Utility.sendChatToPlayer(aPlayer, trans("080", "Inverted Conditional Signal = ") + (aCoverVariable & 0xF)); break;

         }

         return aCoverVariable;

     }

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
index 490cfe05a2..960d3e6c56 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
@@ -19,7 +19,7 @@ public abstract class GT_Cover_RedstoneWirelessBase
             GregTech_API.sWirelessRedstone.put(Integer.valueOf(aCoverVariable), Byte.valueOf((byte) 0));

             aCoverVariable = GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem());

             aTileEntity.setCoverDataAtSide(aSide, aCoverVariable);

-            GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + aCoverVariable);

+            GT_Utility.sendChatToPlayer(aPlayer, trans("081", "Frequency: ") + aCoverVariable);

             return true;

         }

         return false;

@@ -43,7 +43,7 @@ public abstract class GT_Cover_RedstoneWirelessBase
                     aCoverVariable += 1024;

             }

         }

-        GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + aCoverVariable);

+        GT_Utility.sendChatToPlayer(aPlayer, trans("081", "Frequency: ") + aCoverVariable);

         return aCoverVariable;

     }

 

@@ -72,7 +72,7 @@ public abstract class GT_Cover_RedstoneWirelessBase
     }

 

     public String getDescription(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {

-        return "Frequency: " + aCoverVariable;

+        return trans("081", "Frequency: ") + aCoverVariable;

     }

 

     public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
index a936d8db2a..0bc513c2d6 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
@@ -17,10 +17,10 @@ public class GT_Cover_Shutter
         aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % 4;

         if(aCoverVariable <0){aCoverVariable = 3;}

         switch(aCoverVariable) {

-            case 0: GT_Utility.sendChatToPlayer(aPlayer, "Open if work enabled"); break;

-            case 1: GT_Utility.sendChatToPlayer(aPlayer, "Open if work disabled"); break;

-            case 2: GT_Utility.sendChatToPlayer(aPlayer, "Only Output allowed"); break;

-            case 3: GT_Utility.sendChatToPlayer(aPlayer, "Only Input allowed"); break;

+            case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("082", "Open if work enabled")); break;

+            case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("083", "Open if work disabled")); break;

+            case 2: GT_Utility.sendChatToPlayer(aPlayer, trans("084", "Only Output allowed")); break;

+            case 3: GT_Utility.sendChatToPlayer(aPlayer, trans("085", "Only Intput allowed")); break;

         }

         return aCoverVariable;

     }

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Vent.java b/src/main/java/gregtech/common/covers/GT_Cover_Vent.java
index e22c2945b9..a0f24b3d02 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Vent.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Vent.java
@@ -29,6 +29,6 @@ public class GT_Cover_Vent
     }

 

     public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {

-        return 60;

+        return 100;

     }

 }

diff --git a/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java b/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
index 8cd6e9db54..b061cca2e5 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
@@ -39,27 +39,27 @@ public class GT_Container_ChestBuffer
             if (aSlotIndex == 27) {

                 ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bOutput);

                 if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bOutput) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("116","Emit Energy to Outputside"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("117","Don't emit Energy"));

                 }

                 return null;

             }

             if (aSlotIndex == 28) {

                 ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull);

                 if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone if no Slot is free");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("118","Emit Redstone if no Slot is free"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Redstone");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("119","Don't emit Redstone"));

                 }

                 return null;

             }

             if (aSlotIndex == 29) {

                 ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bInvert = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bInvert);

                 if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bInvert) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Invert Redstone");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("120","Invert Redstone"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Redstone");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("121","Don't invert Redstone"));

                 }

                 return null;

             }

diff --git a/src/main/java/gregtech/common/gui/GT_Container_Filter.java b/src/main/java/gregtech/common/gui/GT_Container_Filter.java
index 2c2e4e8c13..9e5e2195fc 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_Filter.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_Filter.java
@@ -72,45 +72,45 @@ public class GT_Container_Filter
             if (aSlotIndex == 18) {

                 ((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bOutput);

                 if (((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bOutput) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("116","Emit Energy to Outputside"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("117","Don't emit Energy"));

                 }

                 return null;

             }

             if (aSlotIndex == 19) {

                 ((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull = (!((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull);

                 if (((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone if slots contain something");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("122","Emit Redstone if slots contain something"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Redstone");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("123","Don't emit Redstone"));

                 }

                 return null;

             }

             if (aSlotIndex == 20) {

                 ((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvert = (!((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvert);

                 if (((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvert) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Invert Redstone");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("120","Invert Redstone"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Redstone");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("121","Don't invert Redstone"));

                 }

                 return null;

             }

             if (aSlotIndex == 21) {

                 ((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvertFilter = (!((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvertFilter);

                 if (((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bInvertFilter) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Invert Filter");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("124","Invert Filter"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Filter");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("125","Don't invert Filter"));

                 }

                 return null;

             }

             if (aSlotIndex == 22) {

                 ((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bIgnoreNBT = (!((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bIgnoreNBT);

                 if (((GT_MetaTileEntity_Filter) this.mTileEntity.getMetaTileEntity()).bIgnoreNBT) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Ignore NBT");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("126","Ignore NBT"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "NBT has to match");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("127","NBT has to match"));

                 }

                 return null;

             }

diff --git a/src/main/java/gregtech/common/gui/GT_Container_Regulator.java b/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
index c9e51ecb81..b4e8e7aebb 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_Regulator.java
@@ -5,6 +5,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;

 import gregtech.api.gui.GT_Slot_Holo;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

+import gregtech.api.util.GT_LanguageManager;

 import gregtech.api.util.GT_Utility;

 import gregtech.common.tileentities.automation.GT_MetaTileEntity_Regulator;

 import net.minecraft.entity.player.EntityPlayer;

@@ -73,9 +74,9 @@ public class GT_Container_Regulator
             if (aSlotIndex == 28) {

                 ((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).bOutput);

                 if (((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).bOutput) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("116", "Emit Energy to Outputside"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("117", "Don't emit Energy"));

                 }

                 return null;

             }

diff --git a/src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java b/src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java
index 46d011dcb6..4ffa2b9e23 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java
@@ -34,27 +34,27 @@ public class GT_Container_SuperBuffer
             if (aSlotIndex == 0) {

                 ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bOutput);

                 if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bOutput) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("116","Emit Energy to Outputside"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("117","Don't emit Energy"));

                 }

                 return null;

             }

             if (aSlotIndex == 1) {

                 ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull);

                 if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone if no Slot is free");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("118","Emit Redstone if no Slot is free"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Redstone");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("119","Don't emit Redstone"));

                 }

                 return null;

             }

             if (aSlotIndex == 2) {

                 ((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bInvert = (!((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bInvert);

                 if (((GT_MetaTileEntity_ChestBuffer) this.mTileEntity.getMetaTileEntity()).bInvert) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Invert Redstone");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("120","Invert Redstone"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Redstone");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("121","Don't invert Redstone"));

                 }

                 return null;

             }

diff --git a/src/main/java/gregtech/common/gui/GT_Container_TypeFilter.java b/src/main/java/gregtech/common/gui/GT_Container_TypeFilter.java
index d492ee2336..bedd14e8a6 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_TypeFilter.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_TypeFilter.java
@@ -53,45 +53,45 @@ public class GT_Container_TypeFilter
             if (aSlotIndex == 10) {

                 ((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bOutput);

                 if (((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bOutput) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Energy to Outputside");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("116","Emit Energy to Outputside"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("117","Don't emit Energy"));

                 }

                 return null;

             }

             if (aSlotIndex == 11) {

                 ((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull = (!((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull);

                 if (((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone if slots contain something");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("122","Emit Redstone if slots contain something"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Redstone");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("123","Don't emit Redstone"));

                 }

                 return null;

             }

             if (aSlotIndex == 12) {

                 ((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bInvert = (!((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bInvert);

                 if (((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bInvert) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Invert Redstone");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("120","Invert Redstone"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Redstone");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("121","Don't invert Redstone"));

                 }

                 return null;

             }

             if (aSlotIndex == 13) {

                 ((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bInvertFilter = (!((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bInvertFilter);

                 if (((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bInvertFilter) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Invert Filter");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("124","Invert Filter"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't invert Filter");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("125","Don't invert Filter"));

                 }

                 return null;

             }

             if (aSlotIndex == 14) {

                 ((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bNBTAllowed = (!((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bNBTAllowed);

                 if (((GT_MetaTileEntity_TypeFilter) this.mTileEntity.getMetaTileEntity()).bNBTAllowed) {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Allow Items with NBT");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("126","Ignore NBT"));

                 } else {

-                    GT_Utility.sendChatToPlayer(aPlayer, "Don't allow Items with NBT");

+                    GT_Utility.sendChatToPlayer(aPlayer, trans("127","NBT has to match"));

                 }

                 return null;

             }

diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
index b40c2fd8ff..379b86f72b 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
@@ -42,7 +42,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
 

         setBurnValue(17000 + Materials.Wood.mMetaItemSubID, 1600);

         GT_OreDictUnificator.addToBlacklist(new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID));

-        GT_ModHandler.addCompressionRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 8L), new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID));

+        GT_ModHandler.addCompressionRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID));

         GregTech_API.registerCover(new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID), new GT_RenderedTexture(Textures.BlockIcons.COVER_WOOD_PLATE), null);

 

         ItemStack tStack = new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID);

@@ -626,9 +626,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
         ItemList.Circuit_Data.set(addItem(tLastID = 704, "Workstation", "A extreme Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION}));

         ItemList.Circuit_Elite.set(addItem(tLastID = 705, "Mainframe", "A elite Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Elite), SubTag.NO_UNIFICATION}));

         ItemList.Circuit_Master.set(addItem(tLastID = 706, "Nanoprocessor Mainframe", "A master Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Master), SubTag.NO_UNIFICATION}));

-        ItemList.Tool_DataOrb.set(addItem(tLastID = 707, "Data Orb", "A High Capacity Data Storage and Master Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Master), SubTag.NO_UNIFICATION, new Behaviour_DataOrb()}));

+        ItemList.Tool_DataOrb.set(addItem(tLastID = 707, "Data Orb", "A High Capacity Data Storage", new Object[]{SubTag.NO_UNIFICATION, new Behaviour_DataOrb()}));

         GT_ModHandler.addShapelessCraftingRecipe(ItemList.Tool_DataOrb.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{ItemList.Tool_DataOrb.get(1L, new Object[0])});

-        ItemList.Tool_DataStick.set(addItem(tLastID = 708, "Data Stick", "A Low Capacity Data Storage and Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION, new Behaviour_DataStick()}));

+        ItemList.Tool_DataStick.set(addItem(tLastID = 708, "Data Stick", "A Low Capacity Data Storage", new Object[]{SubTag.NO_UNIFICATION, new Behaviour_DataStick()}));

         GT_ModHandler.addShapelessCraftingRecipe(ItemList.Tool_DataStick.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{ItemList.Tool_DataStick.get(1L, new Object[0])});

         

         ItemList.Circuit_Board_Basic.set(addItem(tLastID = 710, "Coated Circuit Board", "A basic Board", new Object[0])); ItemList.Circuit_Board_Coated.set(ItemList.Circuit_Board_Basic.get(1,new Object[0]));

diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
index cf57b4edb6..b773b4d78d 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
@@ -81,9 +81,9 @@ public class GT_MetaGenerated_Item_03
          * 

          * quantum chips

          */

-        ItemList.Circuit_Silicon_Ingot.set(addItem(tLastID = 30, "Monocrystalline Silicon Ingot", "Raw Circuit", o));

-        ItemList.Circuit_Silicon_Ingot2.set(addItem(tLastID = 31, "Glowstone doped Monocrystalline Silicon Ingot", "Raw Circuit", o));

-        ItemList.Circuit_Silicon_Ingot3.set(addItem(tLastID = 32, "Naquadah doped Monocrystalline Silicon Ingot", "Raw Circuit", o));

+        ItemList.Circuit_Silicon_Ingot.set(addItem(tLastID = 30, "Monocrystalline Silicon Boule", "Raw Circuit", o));

+        ItemList.Circuit_Silicon_Ingot2.set(addItem(tLastID = 31, "Glowstone doped Monocrystalline Silicon Boule", "Raw Circuit", o));

+        ItemList.Circuit_Silicon_Ingot3.set(addItem(tLastID = 32, "Naquadah doped Monocrystalline Silicon Boule", "Raw Circuit", o));

 

         ItemList.Circuit_Silicon_Wafer.set(addItem(tLastID = 33, "Wafer", "Raw Circuit", o));

         ItemList.Circuit_Silicon_Wafer2.set(addItem(tLastID = 34, "Glowstone doped Wafer", "Raw Circuit", o));

@@ -146,7 +146,7 @@ public class GT_MetaGenerated_Item_03
         

         ItemList.Circuit_Processor.set(addItem(tLastID = 80, "Integrated Processor", "Good Circuit",  new Object[]{OrePrefixes.circuit.get(Materials.Good), SubTag.NO_UNIFICATION}));

 //        ItemList.Circuit_Computer.set(addItem(tLastID = 81, "Processor Assembly", "Advanced Circuit",  new Object[]{OrePrefixes.circuit.get(Materials.Advanced), SubTag.NO_UNIFICATION}));

-        //Workstation/DataStick		Item01 Datacircuit

+        //Workstation				Item01 Datacircuit

         //Mainframe					Item01 DataProcessor

         

         ItemList.Circuit_Nanoprocessor.set(addItem(tLastID = 82, "Nanoprocessor", "Advanced Circuit",  new Object[]{OrePrefixes.circuit.get(Materials.Advanced), SubTag.NO_UNIFICATION}));

@@ -160,15 +160,15 @@ public class GT_MetaGenerated_Item_03
         ItemList.Circuit_Quantummainframe.set(addItem(tLastID = 88, "Quantumprocessor Mainframe", "Ultimate Circuit",  new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION}));

         

         ItemList.Circuit_Crystalprocessor.set(addItem(tLastID = 89, "Crystalprocessor", "Elite Circuit",  new Object[]{OrePrefixes.circuit.get(Materials.Elite), SubTag.NO_UNIFICATION}));

-        //Dataorb 					Dataorb

-        ItemList.Circuit_Crystalcomputer.set(addItem(tLastID = 90, "Crystalprocessor Assembly", "Ultimate Circuit",  new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION}));

+        ItemList.Circuit_Crystalcomputer.set(addItem(tLastID = 96, "Crystalprocessor Assembly", "Master Circuit",  new Object[]{OrePrefixes.circuit.get(Materials.Master), SubTag.NO_UNIFICATION}));

+        ItemList.Circuit_Ultimatecrystalcomputer.set(addItem(tLastID = 90, "Ultimate Crystalcomputer", "Ultimate Circuit",  new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION}));

         ItemList.Circuit_Crystalmainframe.set(addItem(tLastID = 91, "Crystalprocessor Mainframe", "Super Circuit",  new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), SubTag.NO_UNIFICATION}));

         

         ItemList.Circuit_Neuroprocessor.set(addItem(tLastID = 92, "Wetwareprocessor", "Master Circuit",  new Object[]{OrePrefixes.circuit.get(Materials.Master), SubTag.NO_UNIFICATION}));

         ItemList.Circuit_Wetwarecomputer.set(addItem(tLastID = 93, "Wetwareprocessor Assembly", "Ultimate Circuit",  new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION}));

         ItemList.Circuit_Wetwaresupercomputer.set(addItem(tLastID = 94, "Wetware Supercomputer", "Super Circuit",  new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), SubTag.NO_UNIFICATION}));

         ItemList.Circuit_Wetwaremainframe.set(addItem(tLastID = 95, "Wetware Mainframe", "Infinite Circuit",  new Object[]{OrePrefixes.circuit.get(Materials.Infinite), SubTag.NO_UNIFICATION}));

-        ItemList.Circuit_Ultimate.set(ItemList.Circuit_Crystalcomputer.get(1L, new Object[0]));

+        ItemList.Circuit_Ultimate.set(ItemList.Circuit_Ultimatecrystalcomputer.get(1L, new Object[0]));//maybe should be removed

     }

 

     public boolean doesShowInCreative(OrePrefixes aPrefix, Materials aMaterial, boolean aDoShowAllItems) {

diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index ee314c8e31..6ee6d790db 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -187,15 +187,15 @@ public class ItemComb extends Item {
 		if (ProcessingModSupport.aEnableGCMarsMats)
 			addProcess(tComb, Materials.MeteoricIron, 100);
 		tComb = getStackForType(CombType.STEEL);
-		addProcess(tComb, Materials.Iron, Materials.Steel, 100);
-		addProcess(tComb, Materials.Magnetite, Materials.Steel, 100);
-		addProcess(tComb, Materials.BrownLimonite, Materials.Steel, 100);
-		addProcess(tComb, Materials.YellowLimonite, Materials.Steel, 100);
-		addProcess(tComb, Materials.VanadiumMagnetite, Materials.VanadiumSteel, 100);
-		addProcess(tComb, Materials.BandedIron, Materials.Steel, 100);
-		addProcess(tComb, Materials.Pyrite, Materials.Steel, 100);
+		addProcess(tComb, Materials.Iron, Materials.Iron, 100);
+		addProcess(tComb, Materials.Magnetite, Materials.Magnetite, 100);
+		addProcess(tComb, Materials.BrownLimonite, Materials.BrownLimonite, 100);
+		addProcess(tComb, Materials.YellowLimonite, Materials.YellowLimonite, 100);
+		addProcess(tComb, Materials.VanadiumMagnetite, Materials.VanadiumMagnetite, 100);
+		addProcess(tComb, Materials.BandedIron, Materials.BandedIron, 100);
+		addProcess(tComb, Materials.Pyrite, Materials.Pyrite, 100);
 		if (ProcessingModSupport.aEnableGCMarsMats)
-			addProcess(tComb, Materials.MeteoricIron, Materials.MeteoricSteel, 100);
+			addProcess(tComb, Materials.MeteoricIron, Materials.MeteoricIron, 100);
 		addProcess(tComb, Materials.Molybdenite, 100);
 		addProcess(tComb, Materials.Molybdenum, 100);
 		tComb = getStackForType(CombType.NICKEL);
diff --git a/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java b/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
index d2e51e67f1..761f263d79 100644
--- a/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
+++ b/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
@@ -89,6 +89,7 @@ public class ModularArmor_Item extends ItemArmor implements ISpecialArmor, IGogg
 			data = fillArmorData((EntityPlayer) player, armor);
 		}
 		if (player != null && armor != null && source != null) {
+			try{
 			double tmp = 0.0d;
 			if (source.isMagicDamage()) {
 				tmp = data.mStat.get(StatType.MAGICDEFENCE);
@@ -127,6 +128,9 @@ public class ModularArmor_Item extends ItemArmor implements ISpecialArmor, IGogg
 				tmp = 1.0f - ((1.0f - tmp) / 2.0f);
 			}
 			return new ISpecialArmor.ArmorProperties(0, data.getBaseAbsorptionRatio() * tmp, 1000);
+			}catch(Exception e){System.err.println(e);
+			return new ISpecialArmor.ArmorProperties(0, 0, 0);
+			}
 
 		} else {
 			return new ISpecialArmor.ArmorProperties(0, 0, 0);
@@ -266,10 +270,10 @@ public class ModularArmor_Item extends ItemArmor implements ISpecialArmor, IGogg
 				}
 					aPlayer.openGui(GT_Values.GT, openGuiNr+(typeMod), aWorld, (int) aPlayer.posX, (int) aPlayer.posY, (int) aPlayer.posZ);
 			}
-			if(data.helmet!=null&&data.helmet.openGui){data.helmet.openGui=false;aPlayer.openGui(GT_Values.GT, openGuiNr+400, aWorld, (int) aPlayer.posX, (int) aPlayer.posY, (int) aPlayer.posZ);}
-			if(data.chestplate!=null&&data.chestplate.openGui){data.chestplate.openGui=false;aPlayer.openGui(GT_Values.GT, openGuiNr+300, aWorld, (int) aPlayer.posX, (int) aPlayer.posY, (int) aPlayer.posZ);}
-			if(data.leggings!=null&&data.leggings.openGui){data.leggings.openGui=false;aPlayer.openGui(GT_Values.GT, openGuiNr+200, aWorld, (int) aPlayer.posX, (int) aPlayer.posY, (int) aPlayer.posZ);}
-			if(data.boots!=null&&data.boots.openGui){data.boots.openGui=false;aPlayer.openGui(GT_Values.GT, openGuiNr+100, aWorld, (int) aPlayer.posX, (int) aPlayer.posY, (int) aPlayer.posZ);}
+//			if(data.helmet!=null&&data.helmet.openGui){data.helmet.openGui=false;aPlayer.openGui(GT_Values.GT, openGuiNr+400, aWorld, (int) aPlayer.posX, (int) aPlayer.posY, (int) aPlayer.posZ);}
+//			if(data.chestplate!=null&&data.chestplate.openGui){data.chestplate.openGui=false;aPlayer.openGui(GT_Values.GT, openGuiNr+300, aWorld, (int) aPlayer.posX, (int) aPlayer.posY, (int) aPlayer.posZ);}
+//			if(data.leggings!=null&&data.leggings.openGui){data.leggings.openGui=false;aPlayer.openGui(GT_Values.GT, openGuiNr+200, aWorld, (int) aPlayer.posX, (int) aPlayer.posY, (int) aPlayer.posZ);}
+//			if(data.boots!=null&&data.boots.openGui){data.boots.openGui=false;aPlayer.openGui(GT_Values.GT, openGuiNr+100, aWorld, (int) aPlayer.posX, (int) aPlayer.posY, (int) aPlayer.posZ);}
 			// Night Vision
 			if (timer >= 200) {
 				timer = 0;
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_None.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_None.java
index 66ed8bb672..bad13f591f 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_None.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_None.java
@@ -3,6 +3,7 @@ package gregtech.common.items.behaviors;
 import gregtech.api.enums.SubTag;

 import gregtech.api.interfaces.IItemBehaviour;

 import gregtech.api.items.GT_MetaBase_Item;

+import gregtech.api.util.GT_LanguageManager;

 import net.minecraft.block.BlockDispenser;

 import net.minecraft.dispenser.BehaviorDefaultDispenseItem;

 import net.minecraft.dispenser.IBlockSource;

@@ -68,5 +69,9 @@ public class Behaviour_None
 

     public EntityArrow getProjectile(GT_MetaBase_Item aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, float aSpeed) {

         return null;

+    } 

+    

+    public String trans(String aKey, String aEnglish){

+    	return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_"+aKey, aEnglish, false);

     }

 }

diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java
index c950cc8fe1..de22776eb3 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java
@@ -13,6 +13,7 @@ import gregtech.api.util.GT_Utility;
 import gregtech.common.blocks.GT_Block_Ores_Abstract;

 import gregtech.common.blocks.GT_TileEntity_Ores;

 import net.minecraft.block.Block;

+import net.minecraft.block.BlockLiquid;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.init.Blocks;

 import net.minecraft.item.ItemStack;

@@ -39,68 +40,70 @@ public class Behaviour_Prospecting
         if (aWorld.isRemote) {

             return false;

         }

-        Block aBlock = aWorld.getBlock(aX, aY, aZ);

-        if (aBlock == null) {

-            return false;

-        }

-        byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ);

-

-

+      Block aBlock = aWorld.getBlock(aX, aY, aZ);

+      if (aBlock == null) {

+          return false;

+      }

+      byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ);

         ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta));

-        if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {

-            GT_Utility.sendChatToPlayer(aPlayer, "This is " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore.");

-            GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(1)), 1.0F, -1.0F, aX, aY, aZ);

-            return true;

-        }

-        if ((aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone)) || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites)) || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.netherrack)) || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.end_stone))) {

-            if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {

-                GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(1)), 1.0F, -1.0F, aX, aY, aZ);

-                int tX = aX;

-                int tY = aY;

-                int tZ = aZ;

-                int tMetaID = 0;

-                int tQuality = (aItem instanceof GT_MetaGenerated_Tool) ? ((GT_MetaGenerated_Tool) aItem).getHarvestLevel(aStack, "") : 0;

-

-                int i = 0;

-                for (int j = 6 + tQuality; i < j; i++) {

-                    tX -= ForgeDirection.getOrientation(aSide).offsetX;

-                    tY -= ForgeDirection.getOrientation(aSide).offsetY;

-                    tZ -= ForgeDirection.getOrientation(aSide).offsetZ;

-

-                    Block tBlock = aWorld.getBlock(tX, tY, tZ);

-                    if ((tBlock == Blocks.lava) || (tBlock == Blocks.flowing_lava)) {

-                        GT_Utility.sendChatToPlayer(aPlayer, "There is Lava behind this Rock.");

-                        break;

-                    }

-                    if ((tBlock == Blocks.water) || (tBlock == Blocks.flowing_water) || ((tBlock instanceof IFluidBlock))) {

-                        GT_Utility.sendChatToPlayer(aPlayer, "There is a Liquid behind this Rock.");

-                        break;

-                    }

-                    if ((tBlock == Blocks.monster_egg) || (!GT_Utility.hasBlockHitBox(aWorld, tX, tY, tZ))) {

-                        GT_Utility.sendChatToPlayer(aPlayer, "There is an Air Pocket behind this Rock.");

-                        break;

-                    }

-                    if (tBlock != aBlock) {

-                        if (i >= 4) {

-                            break;

-                        }

-                        GT_Utility.sendChatToPlayer(aPlayer, "Material is changing behind this Rock.");

-                        break;

-                    }

-                }

-                Random tRandom = new XSTR(aX ^ aY ^ aZ ^ aSide);

-                i = 0;

-                for (int j = 9 + 2 * tQuality; i < j; i++) {

-                    tX = aX - 4 - tQuality + tRandom.nextInt(j);

-                    tY = aY - 4 - tQuality + tRandom.nextInt(j);

-                    tZ = aZ - 4 - tQuality + tRandom.nextInt(j);

-                    Block tBlock = aWorld.getBlock(tX, tY, tZ);

+        if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))){

+        	GT_Utility.sendChatToPlayer(aPlayer, trans("100","This is ") + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + trans("101"," Ore."));

+        	GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(1)), 1.0F, -1.0F, aX, aY, aZ);	

+        	return true;

+	    	}

+	    	

+		    if (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone) || 

+		    	aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.netherrack) || 

+		    	aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.end_stone) ||

+		    	aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockStones) ||

+		    	aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites) ||

+		    	(aBlock == GregTech_API.sBlockOresUb1)  || 

+		    	(aBlock == GregTech_API.sBlockOresUb2)  ||  

+		    	(aBlock == GregTech_API.sBlockOresUb3)  || 

+		    	(aBlock == GregTech_API.sBlockOres1)  ||

+		    	(aBlock == GregTech_API.sBlockOresGC)){

+	            if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {

+              GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(1)), 1.0F, -1.0F, aX, aY, aZ);

+              int tMetaID = 0;

+              int tQuality = (aItem instanceof GT_MetaGenerated_Tool) ? ((GT_MetaGenerated_Tool) aItem).getHarvestLevel(aStack, "") : 0;

+		    	int tX = aX, tY = aY, tZ = aZ;

+				Block tBlock;

+		        for (int i = 0, j = (int)(6 + tQuality); i < j; i++) {

+                  tX -= ForgeDirection.getOrientation(aSide).offsetX;

+                  tY -= ForgeDirection.getOrientation(aSide).offsetY;

+                  tZ -= ForgeDirection.getOrientation(aSide).offsetZ;

+		        	

+					tBlock = aWorld.getBlock(tX, tY, tZ);

+			    	if (tBlock == Blocks.lava || tBlock == Blocks.flowing_lava) {

+			    		GT_Utility.sendChatToPlayer(aPlayer, trans("102","There is Lava behind this Rock."));

+				    	break;

+			    	}

+			    	if (tBlock instanceof BlockLiquid || tBlock instanceof IFluidBlock) {

+			    		GT_Utility.sendChatToPlayer(aPlayer, trans("103","There is a Liquid behind this Rock."));

+				    	break;

+					}

+			    	if (tBlock == Blocks.monster_egg || !GT_Utility.hasBlockHitBox(aWorld, tX, tY, tZ)) {

+			    		GT_Utility.sendChatToPlayer(aPlayer, trans("104","There is an Air Pocket behind this Rock."));

+				    	break;

+			    	}

+			    	if (tBlock != aBlock) {

+			    		if (i < 4) GT_Utility.sendChatToPlayer(aPlayer, trans("105","Material is changing behind this Rock."));

+				    	break;

+			    	}

+			    }

+		        

+				Random tRandom = new XSTR(aX^aY^aZ^aSide);

+				for (int i = 0, j = (int)(9+2*tQuality); i < j; i++) {

+					tX = aX-4-tQuality+tRandom.nextInt(j);

+					tY = aY-4-tQuality+tRandom.nextInt(j);

+					tZ = aZ-4-tQuality+tRandom.nextInt(j);

+					tBlock = aWorld.getBlock(tX, tY, tZ);

                     if ((tBlock instanceof GT_Block_Ores_Abstract)) {

                         TileEntity tTileEntity = aWorld.getTileEntity(tX, tY, tZ);

                         if ((tTileEntity instanceof GT_TileEntity_Ores)) {

                             Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData % 1000)];

                             if ((tMaterial != null) && (tMaterial != Materials._NULL)) {

-                                GT_Utility.sendChatToPlayer(aPlayer, "Found traces of " + tMaterial.mDefaultLocalName + " Ore.");

+                                GT_Utility.sendChatToPlayer(aPlayer, trans("106","Found traces of ") + tMaterial.mDefaultLocalName + trans("101"," Ore."));

                                 return true;

                             }

                         }

@@ -108,16 +111,16 @@ public class Behaviour_Prospecting
                         tMetaID = aWorld.getBlockMetadata(tX, tY, tZ);

                         tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));

                         if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {

-                            GT_Utility.sendChatToPlayer(aPlayer, "Found traces of " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore.");

+                            GT_Utility.sendChatToPlayer(aPlayer, trans("106","Found traces of ") + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + trans("101"," Ore."));

                             return true;

                         }

                     }

-                }

-                GT_Utility.sendChatToPlayer(aPlayer, "No Ores found.");

-            }

-            return true;

+				}

+				GT_Utility.sendChatToPlayer(aPlayer, trans("107","No Ores found."));

+	    		return true;

+		    }

         }

-        return false;

+	return false;

     }

 

     public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {

diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
index b16986fffd..c725634030 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
@@ -148,7 +148,7 @@ public class GT_MetaTileEntity_Boiler_Bronze
                 this.mTemperature += 1;
             }
             if (this.mProcessingEnergy > 0 && (aTick % 20L == 0L)) {
-                GT_Pollution.addPollution(this.getBaseMetaTileEntity().getWorld(), new ChunkPosition(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()), 20);
+                GT_Pollution.addPollution(getBaseMetaTileEntity(), 20);
             }
             aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);
         }
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
index 3e5afedba2..8aef783b6b 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
@@ -127,7 +127,7 @@ public class GT_MetaTileEntity_Boiler_Lava
             }

 

             if (this.mProcessingEnergy > 0 && (aTick % 20L == 0L)) {

-                GT_Pollution.addPollution(this.getBaseMetaTileEntity().getWorld(), new ChunkPosition(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()), 20);

+                GT_Pollution.addPollution(getBaseMetaTileEntity(), 20);

             }

             aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);

         }

diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
index 5d7ec97401..208c4d4e91 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
@@ -25,7 +25,7 @@ public class GT_MetaTileEntity_Boiler_Steel
         super(aID, aName, aNameRegional, new String[]{

                 "Faster than the Bronze Boiler",

                 "Produces 300L of Steam per second",

-                "Causes 20 Pollution per second"});

+                "Causes 30 Pollution per second"});

     }

 

     public GT_MetaTileEntity_Boiler_Steel(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {

@@ -153,7 +153,7 @@ public class GT_MetaTileEntity_Boiler_Steel
                 this.mTemperature += 1;

             }

             if (this.mProcessingEnergy > 0 && (aTick % 20L == 0L)) {

-                GT_Pollution.addPollution(this.getBaseMetaTileEntity().getWorld(), new ChunkPosition(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()), 20);

+                GT_Pollution.addPollution(getBaseMetaTileEntity(), 30);

             }

             aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);

         }

diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_LightningRod.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_LightningRod.java
index 7501924f69..2ae23a0d80 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_LightningRod.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_LightningRod.java
@@ -29,7 +29,7 @@ public class GT_MetaTileEntity_LightningRod extends GT_MetaTileEntity_TieredMach
 
     @Override
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
-        return new ITexture[]{aActive ? new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW) : new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
+        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],aSide==1?(aActive ? new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW) : new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)):Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier]};
     }
 
     @Override
@@ -46,7 +46,12 @@ public class GT_MetaTileEntity_LightningRod extends GT_MetaTileEntity_TieredMach
         World aWorld = aBaseMetaTileEntity.getWorld();
         XSTR aXSTR = new XSTR();
         if (!aWorld.isRemote) {
-        	if(aBaseMetaTileEntity.getStoredEU()>0)aBaseMetaTileEntity.decreaseStoredEnergyUnits(aBaseMetaTileEntity.getStoredEU()/100+1, false);
+        	if(aBaseMetaTileEntity.getStoredEU()>0){
+                aBaseMetaTileEntity.setActive(true);
+        	    aBaseMetaTileEntity.decreaseStoredEnergyUnits(aBaseMetaTileEntity.getStoredEU()/100+1, false);
+            }else {
+                aBaseMetaTileEntity.setActive(false);
+            }
         	
             if (aTick % 256 == 0 && (aWorld.isThundering() || (aWorld.isRaining() && aXSTR.nextInt(10) == 0))) {
                 int aRodValue = 0;
@@ -68,10 +73,8 @@ public class GT_MetaTileEntity_LightningRod extends GT_MetaTileEntity_TieredMach
                 }
                 if (!aWorld.isThundering() && ((aY + aRodValue) < 128)) aRodValue = 0;
                 if (aXSTR.nextInt(4 * aWorld.getHeight()) < (aRodValue * (aY + aRodValue))) {
-                    aBaseMetaTileEntity.setActive(true);
                     aBaseMetaTileEntity.increaseStoredEnergyUnits(maxEUStore() - aBaseMetaTileEntity.getStoredEU(), false);
                     aWorld.addWeatherEffect(new EntityLightningBolt(aWorld, aX, aY + aRodValue, aZ));
-                    aBaseMetaTileEntity.setActive(false);
                 }
             }
         }
@@ -94,7 +97,7 @@ public class GT_MetaTileEntity_LightningRod extends GT_MetaTileEntity_TieredMach
 
     @Override
     public boolean isFacingValid(byte aFacing) {
-        return true;
+        return aFacing==1;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
index 270fef65e3..24eaf87292 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
@@ -22,6 +22,7 @@ import gregtech.api.objects.ItemData;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
+import gregtech.common.GT_UndergroundOil;
 import gregtech.common.blocks.GT_Block_Ores_Abstract;
 import gregtech.common.blocks.GT_TileEntity_Ores;
 import ic2.core.Ic2Items;
@@ -31,6 +32,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.ChunkPosition;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -141,25 +143,24 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
         int tLeftZBound = GT_Utility.getScaleCoordinates(this.getBaseMetaTileEntity().getZCoord() - radius, 16);
         int tRightZBound = GT_Utility.getScaleCoordinates(this.getBaseMetaTileEntity().getZCoord() + radius, 16);
 
-        HashMap<ChunkPosition, FluidStack> tFluids = new HashMap<ChunkPosition, FluidStack>();
+        HashMap<ChunkCoordIntPair, FluidStack> tFluids = new HashMap<>();
 
         try {
             for (int x = tLeftXBound; x <= tRightXBound; ++x)
                 for (int z = tLeftZBound; z <= tRightZBound; ++z) 
                 {
                 	ChunkPosition tPos = new ChunkPosition(GT_Utility.getScaleCoordinates(x*16,96), 0, GT_Utility.getScaleCoordinates(z*16,96));
-                	FluidStack tFluid = GT_Utility.getUndergroundOil(getBaseMetaTileEntity().getWorld(), x*16, z*16);
+                	ChunkCoordIntPair cInts = getBaseMetaTileEntity().getWorld().getChunkFromChunkCoords(tPos.chunkPosX,tPos.chunkPosZ).getChunkCoordIntPair();
+                	FluidStack tFluid = GT_UndergroundOil.undergroundOil(getBaseMetaTileEntity().getWorld().getChunkFromChunkCoords(tPos.chunkPosX,tPos.chunkPosZ),-1);
             		if (tFluid != null)
-	                	if (tFluids.containsKey(tPos))
-	                	{
-	                		if (tFluids.get(tPos).amount<tFluid.amount)
-	                			tFluids.get(tPos).amount = tFluid.amount;
-	                	} else if (tFluid.amount / 5000 > 0)
-	                        tFluids.put(tPos, tFluid);
+	                	if (tFluids.containsKey(cInts)) {
+	                		if (tFluids.get(cInts).amount<tFluid.amount)
+	                			tFluids.get(cInts).amount = tFluid.amount;
+	                	} else tFluids.put(cInts, tFluid);
                 }
 			
-    		for (HashMap.Entry<ChunkPosition, FluidStack> fl : tFluids.entrySet()) {
-    			aOils.put(fl.getKey().chunkPosX + "," + fl.getKey().chunkPosZ + "," + (fl.getValue().amount / 5000) + "," + fl.getValue().getLocalizedName(), fl.getValue().amount / 5000);
+    		for (Map.Entry<ChunkCoordIntPair, FluidStack> fl : tFluids.entrySet()) {
+    			aOils.put(fl.getKey().chunkXPos + "," + fl.getKey().chunkZPos + "," + fl.getValue().amount + "," + fl.getValue().getLocalizedName(), fl.getValue().amount);
     		}
 		} catch (Exception e) {
 			// TODO: handle exception
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
index a60ed1daed..859dd0a6e1 100644
--- 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
@@ -111,7 +111,8 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt
         mPassiveEnergyUse = aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.PassiveEnergy", true);
     }
 
-    public void onFirstTick() {
+    @Override
+    public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
         if (getBaseMetaTileEntity().isServerSide()) {
             if ((this.mTargetX == 0) && (this.mTargetY == 0) && (this.mTargetZ == 0) && (this.mTargetD == 0)) {
                 this.mTargetX = getBaseMetaTileEntity().getXCoord();
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
index b088e10d69..85defad0cb 100644
--- 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
@@ -12,6 +12,7 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
+import gregtech.common.GT_UndergroundOil;
 import gregtech.common.blocks.GT_Block_Ores_Abstract;
 import gregtech.common.blocks.GT_TileEntity_Ores;
 import ic2.core.Ic2Items;
@@ -102,7 +103,7 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic
                     }
                 }
                 if(tStringList.size()<1){tStringList.add("No Ores found.");}
-                FluidStack tFluid = GT_Utility.getUndergroundOil(getBaseMetaTileEntity().getWorld(), getBaseMetaTileEntity().getXCoord(), getBaseMetaTileEntity().getZCoord());
+                FluidStack tFluid = GT_UndergroundOil.undergroundOil(getBaseMetaTileEntity(),-1);
                 String[] tStringArray = new String[tStringList.size()];
                 {
                     for (int i = 0; i < tStringArray.length; i++) {
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 a834e48db7..aa4e5645a0 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
@@ -205,7 +205,8 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank {
         sFPowerMultiplyer = sPowerMultiplyer / 100.0;        
     }
 
-    public void onFirstTick() {
+    @Override
+    public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
         if (getBaseMetaTileEntity().isServerSide()) {
             if ((this.mTargetX == 0) && (this.mTargetY == 0) && (this.mTargetZ == 0) && (this.mTargetD == 0)) {
                 this.mTargetX = getBaseMetaTileEntity().getXCoord();
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
deleted file mode 100644
index 08d889b7e4..0000000000
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
+++ /dev/null
@@ -1,342 +0,0 @@
-package gregtech.common.tileentities.machines.multi;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.Textures;
-import gregtech.api.gui.GT_GUIContainer_MultiMachine;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.objects.ItemData;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.GT_Block_Ores_Abstract;
-import gregtech.common.blocks.GT_TileEntity_Ores;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.ChunkPosition;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-
-import java.util.ArrayList;
-
-public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBase {
-
-    private final ArrayList<ChunkPosition> mMineList = new ArrayList();
-
-    public GT_MetaTileEntity_AdvMiner2(int aID, String aName, String aNameRegional) {
-        super(aID, aName, aNameRegional);
-    }
-
-    public GT_MetaTileEntity_AdvMiner2(String aName) {
-        super(aName);
-    }
-
-    public String[] getDescription() {
-        return new String[]{
-                "Controller Block for the Advanced Miner II",
-                "Size(WxHxD): 3x7x3, Controller (Front middle bottom)",
-                "3x1x3 Base of Solid Steel Casings",
-                "1x3x1 Solid Steel Casing pillar (Center of base)",
-                "1x3x1 Steel Frame Boxes (Each Steel pillar side and on top)",
-                "1x Input Hatch (Any bottom layer casing)",
-                "1x Output Bus (Any bottom layer casing)",
-                "1x Maintenance Hatch (Any bottom layer casing)",
-                "1x MV+ Energy Hatch (Any bottom layer casing)"};
-    }
-
-    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
-        if (aSide == aFacing) {
-            return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[16], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_ADVMINER2_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_ADVMINER2)};
-        }
-        return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[16]};
-    }
-
-    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "AdvMiner2.png");
-    }
-
-    @Override
-    public boolean checkRecipe(ItemStack aStack) {
-        if (mInventory[1] == null || (mInventory[1].isItemEqual(GT_ModHandler.getIC2Item("miningPipe", 1L)) && mInventory[1].stackSize < mInventory[1].getMaxStackSize())) {
-            ArrayList<ItemStack> tItems = getStoredInputs();
-            for (ItemStack tStack : tItems) {
-                if (tStack.isItemEqual(GT_ModHandler.getIC2Item("miningPipe", 1L))) {
-                    tStack.stackSize--;
-                    if (tStack.stackSize < 1) {
-                        tStack = null;
-                    }
-                    if (mInventory[1] == null) {
-                        mInventory[1] = GT_ModHandler.getIC2Item("miningPipe", 1L);
-                    } else {
-                        mInventory[1].stackSize++;
-                    }
-                }
-
-            }
-        }
-        if (mInputHatches == null || mInputHatches.get(0).mFluid == null || mInputHatches.get(0).mFluid.getFluid().getID() != ItemList.sDrillingFluid.getID()) {
-            return false;
-        }
-        FluidStack tFluid = mInputHatches.get(0).mFluid.copy();
-        if (tFluid == null) {
-            return false;
-        }
-        if (tFluid.amount < 100) {
-            return false;
-        }
-        tFluid.amount = 100;
-        depleteInput(tFluid);
-        long tVoltage = getMaxInputVoltage();
-        if (getBaseMetaTileEntity().getRandomNumber(20) == 0) {
-            if (mMineList.isEmpty()) {
-                int yLevel = getYOfPumpHead();
-                for (int i = -48; i < 49; i++) {
-                    for (int f = -48; f < 49; f++) {
-                        Block tBlock = getBaseMetaTileEntity().getBlockOffset(i, yLevel - getBaseMetaTileEntity().getYCoord(), f);
-                        int tMetaID = getBaseMetaTileEntity().getMetaIDOffset(i, yLevel - getBaseMetaTileEntity().getYCoord(), f);
-                        if (tBlock instanceof GT_Block_Ores_Abstract) {
-                            TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityOffset(i, yLevel - getBaseMetaTileEntity().getYCoord(), f);
-                            if ((tTileEntity!=null) && (tTileEntity instanceof GT_TileEntity_Ores) && ((GT_TileEntity_Ores) tTileEntity).mNatural == true && !mMineList.contains(new ChunkPosition(i, yLevel - getBaseMetaTileEntity().getYCoord(), f))) {
-                                mMineList.add(new ChunkPosition(i, yLevel - getBaseMetaTileEntity().getYCoord(), f));
-                            }
-                        }
-                        else {
-                            ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
-                            if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {
-                                ChunkPosition cp = new ChunkPosition(i, yLevel - getBaseMetaTileEntity().getYCoord(), f);
-                                if (!mMineList.contains(cp)) {
-                                    mMineList.add(cp);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            if (mMineList.isEmpty()) {
-                if(getBaseMetaTileEntity().getBlockOffset(ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX, getYOfPumpHead() - 1 - getBaseMetaTileEntity().getYCoord(), ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ) != Blocks.bedrock){
-                    if (mEnergyHatches.size() > 0 && mEnergyHatches.get(0).getEUVar() > (512 + getMaxInputVoltage() * 4)) {
-                        if (!moveOneDown())
-                            return false;
-                    }
-                }else{
-                    stopMachine();
-                    return false;
-                }
-            }
-            ArrayList<ItemStack> tDrops = new ArrayList();
-            Block tMineBlock = null;
-            ChunkPosition mle = null;
-            int posX, posY, posZ, offX, offY, offZ;
-            while ((tMineBlock==null || tMineBlock == Blocks.air) && !mMineList.isEmpty()) {
-                mle = mMineList.get(0);
-                mMineList.remove(0);
-                tMineBlock = getBaseMetaTileEntity().getBlockOffset(mle.chunkPosX, mle.chunkPosY, mle.chunkPosZ);
-            }
-            
-            if (tMineBlock!=null && tMineBlock!=Blocks.air) {
-                posX = mle.chunkPosX + getBaseMetaTileEntity().getXCoord();
-                posY = mle.chunkPosY + getBaseMetaTileEntity().getYCoord();
-                posZ = mle.chunkPosZ + getBaseMetaTileEntity().getZCoord();
-                offX = mle.chunkPosX;
-                offY = mle.chunkPosY;
-                offZ = mle.chunkPosZ;
-
-                int metadata = getBaseMetaTileEntity().getMetaIDOffset(offX, offY, offZ);
-                boolean silkTouch = tMineBlock.canSilkHarvest(getBaseMetaTileEntity().getWorld(), null, posX, posY, posZ, metadata);
-                if (silkTouch){
-                    ItemStack IS = new ItemStack(tMineBlock);
-                    IS.setItemDamage(metadata);
-                    IS.stackSize=1;
-                    tDrops.add(IS);
-                }
-                else{
-                    tDrops = tMineBlock.getDrops(getBaseMetaTileEntity().getWorld(), posX, posY, posZ, metadata, 1);
-                }
-
-                getBaseMetaTileEntity().getWorld().setBlockToAir(posX, posY, posZ);
-                if (!tDrops.isEmpty()) {
-                    ItemData tData = GT_OreDictUnificator.getItemData(tDrops.get(0).copy());
-                    if (tData.mPrefix != OrePrefixes.crushed && tData.mMaterial.mMaterial != Materials.Oilsands) {
-
-                        GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.findRecipe(getBaseMetaTileEntity(), false, tVoltage, null, tDrops.get(0).copy());
-                        if (tRecipe != null) {
-                            this.mOutputItems = new ItemStack[tRecipe.mOutputs.length];
-                            for (int g = 0; g < mOutputItems.length; g++) {
-                                mOutputItems[g] = tRecipe.mOutputs[g].copy();
-                                if (getBaseMetaTileEntity().getRandomNumber(10000) < tRecipe.getOutputChance(g)) {
-                                    mOutputItems[g].stackSize *= getBaseMetaTileEntity().getRandomNumber(4) + 1;
-                                }
-                            }
-                        } else {
-                            this.mOutputItems = new ItemStack[tDrops.size()];
-                            for (int g = 0; g < mOutputItems.length; g++) {
-                                mOutputItems[g] = tDrops.get(g).copy();
-                            }
-                        }
-                    } else {
-                        this.mOutputItems = null;
-                        ItemStack[] tStack = new ItemStack[tDrops.size()];
-                        for (int j = 0; j < tDrops.size(); j++) {
-                            tStack[j] = tDrops.get(j).copy();
-                            tStack[j].stackSize = tStack[j].stackSize * (getBaseMetaTileEntity().getRandomNumber(4) + 1);
-                        }
-                        mOutputItems = tStack;
-                    }
-                }
-
-            }
-        }
-
-        byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
-        this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
-        this.mEfficiencyIncrease = 10000;
-        int tEU = 48;
-        int tDuration = 24;
-        if (tEU <= 16) {
-            this.mEUt = (tEU * (1 << tTier - 1) * (1 << tTier - 1));
-            this.mMaxProgresstime = (tDuration / (1 << tTier - 1));
-        } else {
-            this.mEUt = tEU;
-            this.mMaxProgresstime = tDuration;
-            while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) {
-                this.mEUt *= 4;
-                this.mMaxProgresstime /= 2;
-            }
-        }
-        if (this.mEUt > 0) {
-            this.mEUt = (-this.mEUt);
-        }
-        this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
-        return true;
-    }
-
-    private boolean moveOneDown() {
-        if ((this.mInventory[1] == null) || (this.mInventory[1].stackSize < 1)
-                || (!GT_Utility.areStacksEqual(this.mInventory[1], GT_ModHandler.getIC2Item("miningPipe", 1L)))) {
-        	stopMachine();
-            return false;
-        }
-        int xDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX;
-        int zDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ;
-        int yHead = getYOfPumpHead();
-        if (yHead <= 0) {
-        	stopMachine();
-            return false;
-        }
-        if (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord() + xDir, yHead - 1, getBaseMetaTileEntity().getZCoord() + zDir) == Blocks.bedrock) {
-        	stopMachine();
-            return false;
-        }
-        if (!(getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord() + xDir, yHead - 1, getBaseMetaTileEntity().getZCoord() + zDir, GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))))) {
-            stopMachine();
-        	return false;
-        }
-        if (yHead != getBaseMetaTileEntity().getYCoord()) {
-            getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord() + xDir, yHead, getBaseMetaTileEntity().getZCoord() + zDir, GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipe", 1L)));
-        }
-        getBaseMetaTileEntity().decrStackSize(1, 1);
-        return true;
-    }
-
-    private int getYOfPumpHead() {
-        int xDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX;
-        int zDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ;
-        int y = getBaseMetaTileEntity().getYCoord() - 1;
-        while (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord() + xDir, y, getBaseMetaTileEntity().getZCoord() + zDir) == GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipe", 1L))) {
-            y--;
-        }
-        if (y == getBaseMetaTileEntity().getYCoord() - 1) {
-            if (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord() + xDir, y, getBaseMetaTileEntity().getZCoord() + zDir) != GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))) {
-                return y + 1;
-            }
-        } else if (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord() + xDir, y, getBaseMetaTileEntity().getZCoord() + zDir) != GT_Utility
-                .getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L)) && this.mInventory[1] != null && this.mInventory[1].stackSize > 0 && GT_Utility.areStacksEqual(this.mInventory[1], GT_ModHandler.getIC2Item("miningPipe", 1L))) {
-            getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord() + xDir, y, getBaseMetaTileEntity().getZCoord() + zDir,
-                    GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L)));
-            getBaseMetaTileEntity().decrStackSize(0, 1);
-        }
-        return y;
-    }
-
-    @Override
-    public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
-        int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
-        int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
-        for (int i = -1; i < 2; i++) {
-            for (int j = -1; j < 2; j++) {
-                if ((xDir + i != 0) || (zDir + j != 0)) {
-                    IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, 0, zDir + j);
-                    if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16)) && (!addOutputToMachineList(tTileEntity, 16)) && (!addEnergyInputToMachineList(tTileEntity, 16))) {
-                        if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 0, zDir + j) != GregTech_API.sBlockCasings2) {
-                            return false;
-                        }
-                        if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 0, zDir + j) != 0) {
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-        for (int y = 1; y < 4; y++) {
-            if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir) != GregTech_API.sBlockCasings2) {
-                return false;
-            }
-            if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) != GregTech_API.sBlockMachines) {
-                return false;
-            }
-            if (aBaseMetaTileEntity.getBlockOffset(xDir - 1, y, zDir) != GregTech_API.sBlockMachines) {
-                return false;
-            }
-            if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir + 1) != GregTech_API.sBlockMachines) {
-                return false;
-            }
-            if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir - 1) != GregTech_API.sBlockMachines) {
-                return false;
-            }
-            if (aBaseMetaTileEntity.getBlockOffset(xDir, y + 3, zDir) != GregTech_API.sBlockMachines) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public boolean isCorrectMachinePart(ItemStack aStack) {
-        return true;
-    }
-
-    @Override
-    public int getMaxEfficiency(ItemStack aStack) {
-        return 10000;
-    }
-
-    @Override
-    public int getPollutionPerTick(ItemStack aStack) {
-        return 0;
-    }
-
-    @Override
-    public int getDamageToComponent(ItemStack aStack) {
-        return 0;
-    }
-
-    @Override
-    public boolean explodesOnComponentBreak(ItemStack aStack) {
-        return false;
-    }
-
-    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_AdvMiner2(this.mName);
-    }
-
-}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
index 3f619102b4..aee44e4cae 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
@@ -1,6 +1,7 @@
 package gregtech.common.tileentities.machines.multi;
 
 import gregtech.api.GregTech_API;
+import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
@@ -68,8 +69,10 @@ public class GT_MetaTileEntity_AssemblyLine
     }
 
     public boolean checkRecipe(ItemStack aStack) {
+    	if(GT_Values.D1)System.out.println("Start ALine recipe check");
         if (!GT_Utility.isStackValid(mInventory[1]) || !ItemList.Tool_DataStick.isStackEqual(mInventory[1], false, true))
             return false;
+    	if(GT_Values.D1)System.out.println("Stick accepted");
 
         NBTTagCompound tTag = mInventory[1].getTagCompound();
         if (tTag == null) return false;
@@ -79,24 +82,30 @@ public class GT_MetaTileEntity_AssemblyLine
             if (mInputBusses.get(i) == null) return false;
             tStack[i] = GT_Utility.loadItem(tTag, "" + i);
             if (tStack[i] == null) continue;
+        	if(GT_Values.D1)System.out.println("Item "+i+" : "+tStack[i].getUnlocalizedName());
             ItemStack stackInSlot = mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0);
             if (!GT_Utility.areStacksEqual(tStack[i], stackInSlot, true) || tStack[i].stackSize > stackInSlot.stackSize) {
+            	if(GT_Values.D1)System.out.println(i +" not accepted");
                 return false;
             }
+        	if(GT_Values.D1)System.out.println(i+" accepted");
         }
-
+    	if(GT_Values.D1)System.out.println("All Items done, start fluid check");
         FluidStack[] tFluids = new FluidStack[4];
         for (int i = 0; i < 4; i++) {
             if (!tTag.hasKey("f" + i)) continue;
             tFluids[i] = GT_Utility.loadFluid(tTag, "f" + i);
             if (tFluids[i] == null) continue;
+        	if(GT_Values.D1)System.out.println("Fluid "+i+" "+tFluids[i].getUnlocalizedName());
             if (mInputHatches.get(i) == null) return false;
             FluidStack fluidInHatch = mInputHatches.get(i).mFluid;
             if (fluidInHatch == null || !GT_Utility.areFluidsEqual(fluidInHatch, tFluids[i], true) || fluidInHatch.amount < tFluids[i].amount) {
+            	if(GT_Values.D1)System.out.println(i+" not accepted");
                 return false;
             }
+        	if(GT_Values.D1)System.out.println(i+" accepted");
         }
-
+    	if(GT_Values.D1)System.out.println("Input accepted, check other values");
         if (!tTag.hasKey("output")) return false;
         mOutputItems = new ItemStack[]{GT_Utility.loadItem(tTag, "output")};
         if (mOutputItems[0] == null || !GT_Utility.isStackValid(mOutputItems[0]))
@@ -108,6 +117,7 @@ public class GT_MetaTileEntity_AssemblyLine
 
         if (!tTag.hasKey("eu")) return false;
         mEUt = tTag.getInteger("eu");
+    	if(GT_Values.D1)System.out.println("All checked start consuming inputs");
         for (int i = 0; i < 15; i++) {
             if (tStack[i] == null) continue;
             ItemStack stackInSlot = mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0);
@@ -121,6 +131,7 @@ public class GT_MetaTileEntity_AssemblyLine
                 mInputHatches.get(i).mFluid = null;
             }
         }
+    	if(GT_Values.D1)System.out.println("Check overclock");
 
         byte tTier = (byte) Math.max(1, GT_Utility.getTier(getMaxInputVoltage()));
         this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
@@ -139,6 +150,7 @@ public class GT_MetaTileEntity_AssemblyLine
         }
         this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
         updateSlots();
+    	if(GT_Values.D1)System.out.println("Recipe sucessfull");
         return true;
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
index ea8eb2f7ba..3b287d9ca4 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
@@ -23,6 +23,7 @@ import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

 import net.minecraft.world.ChunkPosition;

+import net.minecraft.world.World;

 import net.minecraftforge.common.util.ForgeDirection;

 

 public class GT_MetaTileEntity_BronzeBlastFurnace

@@ -187,10 +188,6 @@ public class GT_MetaTileEntity_BronzeBlastFurnace
     }

 

     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {

-        if ((aBaseMetaTileEntity.isClientSide()) &&

-                (aBaseMetaTileEntity.isActive())) {

-            aBaseMetaTileEntity.getWorld().spawnParticle("largesmoke", aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1) + (new XSTR()).nextFloat(), aBaseMetaTileEntity.getOffsetY(aBaseMetaTileEntity.getBackFacing(), 1), aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1) + (new XSTR()).nextFloat(), 0.0D, 0.3D, 0.0D);

-        }

         if (aBaseMetaTileEntity.isServerSide()) {

             if (this.mUpdate-- == 0) {

                 this.mMachine = checkMachine();

@@ -210,7 +207,7 @@ public class GT_MetaTileEntity_BronzeBlastFurnace
                 }

             }

             if(this.mMaxProgresstime>0 && (aTimer % 20L == 0L)){

-            	GT_Pollution.addPollution(this.getBaseMetaTileEntity().getWorld(), new ChunkPosition(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()), 50);

+            	GT_Pollution.addPollution(getBaseMetaTileEntity(), 50);

             }

             

             aBaseMetaTileEntity.setActive((this.mMaxProgresstime > 0) && (this.mMachine));

@@ -233,8 +230,20 @@ public class GT_MetaTileEntity_BronzeBlastFurnace
                     this.mUpdate = 1;

                 }

             }

+        }else if(aBaseMetaTileEntity.isActive()){

+            World aWorld=aBaseMetaTileEntity.getWorld();

+            double xPos=aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1);

+            double yPos=aBaseMetaTileEntity.getOffsetY(aBaseMetaTileEntity.getBackFacing(), 1)+0.05F;

+            double zPos=aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1);

+            XSTR floatGen=new XSTR();

+            aWorld.spawnParticle("largesmoke", xPos + floatGen.nextFloat(), yPos, zPos + floatGen.nextFloat(), 0.0D, 0.3D, 0.0D);

+            //Pollution particles intensify

+            if(GT_Pollution.getPollution(getBaseMetaTileEntity())>GT_Mod.gregtechproxy.mPollutionSmogLimit){

+                aWorld.spawnParticle("largesmoke", xPos + floatGen.nextFloat(), yPos, zPos + floatGen.nextFloat(), 0.0D, 0.45D, 0.0D);

+                aWorld.spawnParticle("largesmoke", xPos + floatGen.nextFloat(), yPos, zPos + floatGen.nextFloat(), 0.0D, 0.6D, 0.0D);

+            }

         }

-    }

+}

 

     private void addOutputProducts() {

         if (this.mOutputItem1 != null) {

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
index 11c0fd109a..ff3af18e53 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
@@ -87,7 +87,7 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_MultiBlock
             this.mEfficiency = 10000;
             this.mEfficiencyIncrease = 10000;
             this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
-            GT_Pollution.addPollution(this.getBaseMetaTileEntity().getWorld(), new ChunkPosition(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()), mMaxProgresstime*5);
+            GT_Pollution.addPollution(getBaseMetaTileEntity(), mMaxProgresstime*5);
             return true;
         } else {
             this.mEfficiency = 0;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
index ac7f7729d0..d68383272c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
@@ -33,12 +33,13 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
     public String[] getDescription() {
         return new String[]{
                 "Controller Block for the Cleanroom",
-                "Min(WxHxD): 3x3x3 (Hollow), Max(WxHxD): 15x15x15 (Hollow)",
-                "Controller (Top center), Walls Plascrete",
+                "Min(WxHxD): 3x4x3 (Hollow), Max(WxHxD): 15x15x15 (Hollow)",
+                "Controller (Top center)",
                 "Top besides contoller and edges Filter Machine Casings",
-                "1x Reinforced Door",
+                "1 Reinforced Door (keep closed for 100% efficency",
                 "1x MV+ Energy Hatch, 1x Maintainance Hatch",
-                "up to 10 Machine Hulls to transfer Items & Energy inside"};
+                "Up to 10 Machine Hulls to transfer Items & Energy through walls",
+                "Remaining Blocks Plascrete"};
     }
 
     public boolean checkRecipe(ItemStack aStack) {
@@ -148,9 +149,18 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
         if (doorState) {
             mEfficiency = Math.max(0, mEfficiency - 200);
         }
-
+        for(byte i = 0 ; i<6 ; i++){
+        	byte t = (byte) Math.max(1, (byte)(15/(10000f / mEfficiency)));
+        aBaseMetaTileEntity.setInternalOutputRedstoneSignal(i, t);
+        }
+        
         return true;
     }
+    
+    @Override
+    public boolean allowGeneralRedstoneOutput(){
+    	return true;
+    }
 
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
         if (aSide == 0 || aSide == 1) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
index c7309ef836..018dcb6282 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
@@ -95,7 +95,7 @@ public class GT_MetaTileEntity_DistillationTower
 
         long tVoltage = getMaxInputVoltage();
         byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
-        FluidStack[] tFluids = (FluidStack[]) Arrays.copyOfRange(tFluidList.toArray(new FluidStack[tFluidList.size()]), 0, tFluidList.size());
+        FluidStack[] tFluids = tFluidList.toArray(new FluidStack[tFluidList.size()]);
         if (tFluids.length > 0) {
         	for(int i = 0;i<tFluids.length;i++){
             GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sDistillationRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], new FluidStack[]{tFluids[i]}, new ItemStack[]{});
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
index e0d0ee46d1..0f07a3e743 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
@@ -91,7 +91,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
                 }

             }

         }

-        ItemStack[] tInputs = Arrays.copyOfRange(tInputList.toArray(new ItemStack[tInputList.size()]), 0, 2);

+        ItemStack[] tInputs = tInputList.toArray(new ItemStack[tInputList.size()]);

 

         ArrayList<FluidStack> tFluidList = getStoredFluids();

         int tFluidList_sS = tFluidList.size();

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
index 118a04091a..d91b7efcb5 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
@@ -83,7 +83,7 @@ public class GT_MetaTileEntity_ImplosionCompressor
                 }

             }

         }

-        ItemStack[] tInputs = (ItemStack[]) Arrays.copyOfRange(tInputList.toArray(new ItemStack[tInputList.size()]), 0, 2);

+        ItemStack[] tInputs = tInputList.toArray(new ItemStack[tInputList.size()]);

         if (tInputList.size() > 0) {

             GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sImplosionRecipes.findRecipe(getBaseMetaTileEntity(), false, 9223372036854775807L, null, tInputs);

             if ((tRecipe != null) && (tRecipe.isRecipeInputEqual(true, null, tInputs))) {

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
index ed7100f30a..1c49f4fd9f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
@@ -41,9 +41,9 @@ public abstract class GT_MetaTileEntity_LargeBoiler
                 "Produces " + (getEUt() * 40) * (runtimeBoost(20) / 20f) + "L of Steam with 1 Coal at " + getEUt() * 40 + "L/s",

                 "A programmed circuit in the main block throttles the boiler (-1000L/s per config)",

                 "Size(WxHxD): 3x5x3, Controller (Front middle in Fireboxes)",

-                "3x1x3 of Firebox Casings (Bottom layer, Min 3)",

-                "3x4x3 of Machine Casings/Plated Bricks (Above Fireboxes, hollow, Min 24!)",

-                "1x3x1 of Pipe Casings (Inside the Hollow Machine Casings/Plated Bricks)",

+                "3x1x3 of " +getCasingMaterial()+ " Firebox Casings (Bottom layer, Min 3)",

+                "3x4x3 of " +getCasingMaterial()+ " Machine Casings/Plated Bricks (Above Fireboxes, hollow, Min 24!)",

+                "1x3x1 of " +getCasingMaterial()+ " Pipe Casings (Inside the Hollow Machine Casings/Plated Bricks)",

                 "1x Fuel Input Hatch/Bus (Any Firebox)",

                 "1x Water Input Hatch (Any Firebox)",

                 "1x Steam Output Hatch (Any Casing)",

@@ -53,6 +53,8 @@ public abstract class GT_MetaTileEntity_LargeBoiler
                 String.format("Takes %.2f seconds to heat up", 500.0 / getEfficiencyIncrease()),

                 "Causes up to " + 20 * getPollutionPerTick(null) + " Pollution per second"};

     }

+    

+    public abstract String getCasingMaterial();

 

     public abstract Block getCasingBlock();

 

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java
index 7c5dad3c96..cc494498da 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java
@@ -18,6 +18,10 @@ public class GT_MetaTileEntity_LargeBoiler_Bronze
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

         return new GT_MetaTileEntity_LargeBoiler_Bronze(this.mName);

     }

+    

+    public String getCasingMaterial(){

+    	return "Bronze";

+    }

 

     public Block getCasingBlock() {

         return GregTech_API.sBlockCasings1;

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
index a68c0e6212..984290a3c6 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
@@ -18,6 +18,10 @@ public class GT_MetaTileEntity_LargeBoiler_Steel
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

         return new GT_MetaTileEntity_LargeBoiler_Steel(this.mName);

     }

+    

+    public String getCasingMaterial(){

+    	return "Steel";

+    }

 

     public Block getCasingBlock() {

         return GregTech_API.sBlockCasings2;

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Titanium.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Titanium.java
index 6fc32f8c34..144c44aeed 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Titanium.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Titanium.java
@@ -18,6 +18,10 @@ public class GT_MetaTileEntity_LargeBoiler_Titanium
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
         return new GT_MetaTileEntity_LargeBoiler_Titanium(this.mName);
     }
+    
+    public String getCasingMaterial(){
+    	return "Titanium";
+    }
 
     public Block getCasingBlock() {
         return GregTech_API.sBlockCasings4;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
index 997a176e34..b69bac2f94 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
@@ -18,6 +18,10 @@ public class GT_MetaTileEntity_LargeBoiler_TungstenSteel
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

         return new GT_MetaTileEntity_LargeBoiler_TungstenSteel(this.mName);

     }

+    

+    public String getCasingMaterial(){

+    	return "TungstenSteel";

+    }

 

     public Block getCasingBlock() {

         return GregTech_API.sBlockCasings4;

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
index 3262d4eee7..1a7b444b54 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
@@ -1,195 +1,199 @@
-package gregtech.common.tileentities.machines.multi;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.ITexture;

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

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

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

-import gregtech.api.objects.GT_RenderedTexture;

-import gregtech.api.util.GT_Log;

-import gregtech.api.util.GT_Recipe;

-import gregtech.api.util.GT_Utility;

-import net.minecraft.block.Block;

-import net.minecraft.item.ItemStack;

-import net.minecraftforge.common.util.ForgeDirection;

-import net.minecraftforge.fluids.FluidStack;

-

-public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_MultiBlockBase {

-

-	private static final int CASING_INDEX = 62;

-

-	public GT_MetaTileEntity_LargeChemicalReactor(int aID, String aName, String aNameRegional) {

-		super(aID, aName, aNameRegional);

-	}

-

-	public GT_MetaTileEntity_LargeChemicalReactor(String aName) {

-		super(aName);

-	}

-

-	@Override

-	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

-		return new GT_MetaTileEntity_LargeChemicalReactor(this.mName);

-	}

-

-	@Override

-	public String[] getDescription() {

-		return new String[] {

-				"Controller block for the Large Chemical Reactor",

-				"Has the same recipes as the Chemical Reactor",

-				"Does not lose efficiency when overclocked",

-				"Accepts fluids instead of fluid cells",

-				"Size(WxHxD): 3x3x3",

-				"3x3x3 of Chemically Inert Machine Casings (hollow, min 24!)",

-				"Controller (Front centered)",

-				"1x Cupronickel Coil Block (Bottom centered)",

-				"1x PTFE Pipe Machine Casing (inside the hollow casings)",

-				"1x Input Bus/Hatch (Any inert casing)",

-				"1x Output Bus/Hatch (Any inert casing)",

-				"1x Maintenance Hatch (Any inert casing)",

-				"1x Energy Hatch (Any inert casing)"};

-	}

-

-	@Override

-	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive,

-			boolean aRedstone) {

-		if (aSide == aFacing) {

-			return new ITexture[] {

-					Textures.BlockIcons.CASING_BLOCKS[CASING_INDEX],

-					new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE

-							: Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR) };

-		}

-		return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[CASING_INDEX] };

-	}

-

-	@Override

-	public boolean isCorrectMachinePart(ItemStack aStack) {

-		return true;

-	}

-

-	@Override

-	public boolean checkRecipe(ItemStack aStack) {

-		ArrayList<ItemStack> tInputList = getStoredInputs();

-		int tInputList_sS = tInputList.size();

-		for (int i = 0; i < tInputList_sS - 1; i++) {

-			for (int j = i + 1; j < tInputList_sS; j++) {

-				if (GT_Utility.areStacksEqual((ItemStack) tInputList.get(i), (ItemStack) tInputList.get(j))) {

-					if (((ItemStack) tInputList.get(i)).stackSize >= ((ItemStack) tInputList.get(j)).stackSize) {

-						tInputList.remove(j--);

-						tInputList_sS = tInputList.size();

-					} else {

-						tInputList.remove(i--);

-						tInputList_sS = tInputList.size();

-						break;

-					}

-				}

-			}

-		}

-		ItemStack[] inputs = tInputList.toArray(new ItemStack[tInputList.size()]);

-

-		ArrayList<FluidStack> tFluidList = getStoredFluids();

-		int tFluidList_sS = tFluidList.size();

-		for (int i = 0; i < tFluidList_sS - 1; i++) {

-			for (int j = i + 1; j < tFluidList_sS; j++) {

-				if (GT_Utility.areFluidsEqual(tFluidList.get(i), tFluidList.get(j))) {

-					if (tFluidList.get(i).amount >= tFluidList.get(j).amount) {

-						tFluidList.remove(j--);

-						tFluidList_sS = tFluidList.size();

-					} else {

-						tFluidList.remove(i--);

-						tFluidList_sS = tFluidList.size();

-						break;

-					}

-				}

-			}

-		}

-		FluidStack[] fluids = tFluidList.toArray(new FluidStack[tFluidList.size()]);

-

-		if (inputs.length > 0 || fluids.length > 0) {

-			long voltage = getMaxInputVoltage();

-			byte tier = (byte) Math.max(1, GT_Utility.getTier(voltage));

-			GT_Recipe recipe = GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.findRecipe(getBaseMetaTileEntity(), false,

-					gregtech.api.enums.GT_Values.V[tier], fluids, inputs);

-			if (recipe != null && recipe.isRecipeInputEqual(true, fluids, inputs)) {

-				this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);

-				this.mEfficiencyIncrease = 10000;

-

-				int EUt = recipe.mEUt;

-				int maxProgresstime = recipe.mDuration;

-

-				while (EUt <= gregtech.api.enums.GT_Values.V[tier - 1] && maxProgresstime > 1) {

-					EUt *= 4;

-					maxProgresstime /= 4;

-				}

-

-				this.mEUt = -EUt;

-				this.mMaxProgresstime = maxProgresstime;

-				this.mOutputItems = recipe.mOutputs;

-				this.mOutputFluids = recipe.mFluidOutputs;

-				return true;

-			}

-		}

-		return false;

-	}

-

-	@Override

-	public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {

-		int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;

-		int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;

-		int casingAmount = 0;

-		// x=width, z=depth, y=height

-		for (int x = -1 + xDir; x <= xDir + 1; x++) {

-			for (int z = -1 + zDir; z <= zDir + 1; z++) {

-				for (int y = -1; y <= 1; y++) {

-					IGregTechTileEntity tileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(x, y, z);

-					Block block = aBaseMetaTileEntity.getBlockOffset(x, y, z);

-					if (x == xDir && z == zDir && y <= 0) {

-						if ((y == -1)

-								&& (block != GregTech_API.sBlockCasings5 || aBaseMetaTileEntity.getMetaIDOffset(x, y, z) != 0)) {

-							return false;

-						} else if (y == 0 && (block != GregTech_API.sBlockCasings4 || aBaseMetaTileEntity.getMetaIDOffset(x, y, z) != 15)) {

-							return false;

-						}

-					} else if (x != 0 || y != 0 || z != 0) {

-						if (!addInputToMachineList(tileEntity, CASING_INDEX) && !addOutputToMachineList(tileEntity, CASING_INDEX)

-								&& !addMaintenanceToMachineList(tileEntity, CASING_INDEX)

-								&& !addEnergyInputToMachineList(tileEntity, CASING_INDEX)) {

-							if (block == GregTech_API.sBlockCasings4 && aBaseMetaTileEntity.getMetaIDOffset(x, y, z) == 14) {

-								casingAmount++;

-							} else {

-								return false;

-							}

-						}

-					}

-

-				}

-			}

-

-		}

-		return casingAmount >= 8;

-	}

-

-	@Override

-	public int getMaxEfficiency(ItemStack aStack) {

-		return 10000;

-	}

-

-	@Override

-	public int getPollutionPerTick(ItemStack aStack) {

-		return 0;

-	}

-

-	@Override

-	public int getDamageToComponent(ItemStack aStack) {

-		return 0;

-	}

-

-	@Override

-	public boolean explodesOnComponentBreak(ItemStack aStack) {

-		return false;

-	}

-

-}

+package gregtech.common.tileentities.machines.multi;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Log;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+
+public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_MultiBlockBase {
+
+	private static final int CASING_INDEX = 52;
+
+	public GT_MetaTileEntity_LargeChemicalReactor(int aID, String aName, String aNameRegional) {
+		super(aID, aName, aNameRegional);
+	}
+
+	public GT_MetaTileEntity_LargeChemicalReactor(String aName) {
+		super(aName);
+	}
+
+	@Override
+	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+		return new GT_MetaTileEntity_LargeChemicalReactor(this.mName);
+	}
+
+	@Override
+	public String[] getDescription() {
+		return new String[] {
+				"Controller block for the Large Chemical Reactor",
+				"Has the same recipes as the Chemical Reactor",
+				"Does not lose efficiency when overclocked",
+				"Accepts fluids instead of fluid cells",
+				"Size(WxHxD): 3x3x3",
+				"3x3x3 of Chemically Inert Machine Casings (hollow, min 8!)",
+				"Controller (Front centered)",
+				"1x Cupronickel Coil Block (Bottom centered)",
+				"1x PTFE Pipe Machine Casing (inside the hollow casings)",
+				"1x Input Bus/Hatch (Any inert casing)",
+				"1x Output Bus/Hatch (Any inert casing)",
+				"1x Maintenance Hatch (Any inert casing)",
+				"1x Energy Hatch (Any inert casing)"};
+	}
+
+	@Override
+	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive,
+			boolean aRedstone) {
+		if (aSide == aFacing) {
+			return new ITexture[] {
+					Textures.BlockIcons.CASING_BLOCKS[CASING_INDEX],
+					new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE
+							: Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR) };
+		}
+		return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[CASING_INDEX] };
+	}
+
+	@Override
+	public boolean isCorrectMachinePart(ItemStack aStack) {
+		return true;
+	}
+
+	@Override
+	public boolean checkRecipe(ItemStack aStack) {
+		ArrayList<ItemStack> tInputList = getStoredInputs();
+		int tInputList_sS = tInputList.size();
+		for (int i = 0; i < tInputList_sS - 1; i++) {
+			for (int j = i + 1; j < tInputList_sS; j++) {
+				if (GT_Utility.areStacksEqual((ItemStack) tInputList.get(i), (ItemStack) tInputList.get(j))) {
+					if (((ItemStack) tInputList.get(i)).stackSize >= ((ItemStack) tInputList.get(j)).stackSize) {
+						tInputList.remove(j--);
+						tInputList_sS = tInputList.size();
+					} else {
+						tInputList.remove(i--);
+						tInputList_sS = tInputList.size();
+						break;
+					}
+				}
+			}
+		}
+		ItemStack[] inputs = tInputList.toArray(new ItemStack[tInputList.size()]);
+
+		ArrayList<FluidStack> tFluidList = getStoredFluids();
+		int tFluidList_sS = tFluidList.size();
+		for (int i = 0; i < tFluidList_sS - 1; i++) {
+			for (int j = i + 1; j < tFluidList_sS; j++) {
+				if (GT_Utility.areFluidsEqual(tFluidList.get(i), tFluidList.get(j))) {
+					if (tFluidList.get(i).amount >= tFluidList.get(j).amount) {
+						tFluidList.remove(j--);
+						tFluidList_sS = tFluidList.size();
+					} else {
+						tFluidList.remove(i--);
+						tFluidList_sS = tFluidList.size();
+						break;
+					}
+				}
+			}
+		}
+		FluidStack[] fluids = tFluidList.toArray(new FluidStack[tFluidList.size()]);
+
+		if (inputs.length > 0 || fluids.length > 0) {
+			long voltage = getMaxInputVoltage();
+			byte tier = (byte) Math.max(1, GT_Utility.getTier(voltage));
+			GT_Recipe recipe = GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.findRecipe(getBaseMetaTileEntity(), false,
+					gregtech.api.enums.GT_Values.V[tier], fluids, inputs);
+			if (recipe != null && recipe.isRecipeInputEqual(true, fluids, inputs)) {
+				this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
+				this.mEfficiencyIncrease = 10000;
+
+				int EUt = recipe.mEUt;
+				int maxProgresstime = recipe.mDuration;
+
+				while (EUt <= gregtech.api.enums.GT_Values.V[tier - 1] && maxProgresstime > 2) {
+					EUt *= 4;
+					maxProgresstime /= 4;
+				}
+				if (maxProgresstime < 2) {
+					maxProgresstime = 2;
+					EUt = recipe.mEUt * recipe.mDuration / 2;
+				}
+				
+				this.mEUt = -EUt;
+				this.mMaxProgresstime = maxProgresstime;
+				this.mOutputItems = recipe.mOutputs;
+				this.mOutputFluids = recipe.mFluidOutputs;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
+		int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
+		int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
+		int casingAmount = 0;
+		// x=width, z=depth, y=height
+		for (int x = -1 + xDir; x <= xDir + 1; x++) {
+			for (int z = -1 + zDir; z <= zDir + 1; z++) {
+				for (int y = -1; y <= 1; y++) {
+					IGregTechTileEntity tileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(x, y, z);
+					Block block = aBaseMetaTileEntity.getBlockOffset(x, y, z);
+					if (x == xDir && z == zDir && y <= 0) {
+						if ((y == -1)
+								&& (block != GregTech_API.sBlockCasings5 || aBaseMetaTileEntity.getMetaIDOffset(x, y, z) != 0)) {
+							return false;
+						} else if (y == 0 && (block != GregTech_API.sBlockCasings4 || aBaseMetaTileEntity.getMetaIDOffset(x, y, z) != 5)) {
+							return false;
+						}
+					} else if (x != 0 || y != 0 || z != 0) {
+						if (!addInputToMachineList(tileEntity, CASING_INDEX) && !addOutputToMachineList(tileEntity, CASING_INDEX)
+								&& !addMaintenanceToMachineList(tileEntity, CASING_INDEX)
+								&& !addEnergyInputToMachineList(tileEntity, CASING_INDEX)) {
+							if (block == GregTech_API.sBlockCasings4 && aBaseMetaTileEntity.getMetaIDOffset(x, y, z) == 4) {
+								casingAmount++;
+							} else {
+								return false;
+							}
+						}
+					}
+
+				}
+			}
+
+		}
+		return casingAmount >= 8;
+	}
+
+	@Override
+	public int getMaxEfficiency(ItemStack aStack) {
+		return 10000;
+	}
+
+	@Override
+	public int getPollutionPerTick(ItemStack aStack) {
+		return 0;
+	}
+
+	@Override
+	public int getDamageToComponent(ItemStack aStack) {
+		return 0;
+	}
+
+	@Override
+	public boolean explodesOnComponentBreak(ItemStack aStack) {
+		return false;
+	}
+
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java
index ec901e0dfc..7d6fe5935c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java
@@ -18,6 +18,8 @@ import net.minecraftforge.fluids.FluidStack;
 
 import java.util.ArrayList;
 
+import static gregtech.common.GT_UndergroundOil.undergroundOil;
+
 public class GT_MetaTileEntity_OilDrill extends GT_MetaTileEntity_MultiBlockBase {
 
     private boolean completedCycle = false;
@@ -73,12 +75,13 @@ public class GT_MetaTileEntity_OilDrill extends GT_MetaTileEntity_MultiBlockBase
                 }
             }
         }
-        FluidStack tFluid = GT_Utility.getUndergroundOil(getBaseMetaTileEntity().getWorld(), getBaseMetaTileEntity().getXCoord(), getBaseMetaTileEntity().getZCoord(), true);
+        FluidStack tFluid = undergroundOil(getBaseMetaTileEntity(),.5F+(getInputTier()*.25F));
         if (tFluid == null) {
         	stopMachine();
             return false;
         }
         if (getYOfPumpHead() > 0 && getBaseMetaTileEntity().getBlockOffset(ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX, getYOfPumpHead() - 1 - getBaseMetaTileEntity().getYCoord(), ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ) != Blocks.bedrock) {
+
             if (completedCycle) {
                 moveOneDown();
             }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java
new file mode 100644
index 0000000000..25e4e3eb5d
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java
@@ -0,0 +1,51 @@
+package gregtech.common.tileentities.machines.multi;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+public class GT_MetaTileEntity_OreDrillingPlant1 extends GT_MetaTileEntity_OreDrillingPlantBase {
+    public GT_MetaTileEntity_OreDrillingPlant1(int aID, String aName, String aNameRegional) {
+        super(aID, aName, aNameRegional);
+    }
+
+    public GT_MetaTileEntity_OreDrillingPlant1(String aName) {
+        super(aName);
+    }
+
+    @Override
+    public String[] getDescription() {
+        return getDescriptionInternal("I");
+    }
+
+    @Override
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_OreDrillingPlant1(mName);
+    }
+
+    @Override
+    protected ItemList getCasingBlockItem() {
+        return ItemList.Casing_SolidSteel;
+    }
+
+    @Override
+    protected Materials getFrameMaterial() {
+        return Materials.Steel;
+    }
+
+    @Override
+    protected int getCasingTextureIndex() {
+        return 16;
+    }
+
+    @Override
+    protected int getRadiusInChunks() {
+        return 3;
+    }
+
+    @Override
+    protected int getMinTier() {
+        return 2;
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant2.java
new file mode 100644
index 0000000000..2b161fe471
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant2.java
@@ -0,0 +1,51 @@
+package gregtech.common.tileentities.machines.multi;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+public class GT_MetaTileEntity_OreDrillingPlant2 extends GT_MetaTileEntity_OreDrillingPlantBase {
+    public GT_MetaTileEntity_OreDrillingPlant2(int aID, String aName, String aNameRegional) {
+        super(aID, aName, aNameRegional);
+    }
+
+    public GT_MetaTileEntity_OreDrillingPlant2(String aName) {
+        super(aName);
+    }
+
+    @Override
+    public String[] getDescription() {
+        return getDescriptionInternal("II");
+    }
+
+    @Override
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_OreDrillingPlant2(mName);
+    }
+
+    @Override
+    protected ItemList getCasingBlockItem() {
+        return ItemList.Casing_StableTitanium;
+    }
+
+    @Override
+    protected Materials getFrameMaterial() {
+        return Materials.Titanium;
+    }
+
+    @Override
+    protected int getCasingTextureIndex() {
+        return 50;
+    }
+
+    @Override
+    protected int getRadiusInChunks() {
+        return 4;
+    }
+
+    @Override
+    protected int getMinTier() {
+        return 3;
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant3.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant3.java
new file mode 100644
index 0000000000..1be6391f7a
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant3.java
@@ -0,0 +1,51 @@
+package gregtech.common.tileentities.machines.multi;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+public class GT_MetaTileEntity_OreDrillingPlant3 extends GT_MetaTileEntity_OreDrillingPlantBase {
+    public GT_MetaTileEntity_OreDrillingPlant3(int aID, String aName, String aNameRegional) {
+        super(aID, aName, aNameRegional);
+    }
+
+    public GT_MetaTileEntity_OreDrillingPlant3(String aName) {
+        super(aName);
+    }
+
+    @Override
+    public String[] getDescription() {
+        return getDescriptionInternal("III");
+    }
+
+    @Override
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_OreDrillingPlant3(mName);
+    }
+
+    @Override
+    protected ItemList getCasingBlockItem() {
+        return ItemList.Casing_RobustTungstenSteel;
+    }
+
+    @Override
+    protected Materials getFrameMaterial() {
+        return Materials.TungstenSteel;
+    }
+
+    @Override
+    protected int getCasingTextureIndex() {
+        return 48;
+    }
+
+    @Override
+    protected int getRadiusInChunks() {
+        return 6;
+    }
+
+    @Override
+    protected int getMinTier() {
+        return 4;
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java
new file mode 100644
index 0000000000..55fc1ef7e0
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java
@@ -0,0 +1,51 @@
+package gregtech.common.tileentities.machines.multi;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+public class GT_MetaTileEntity_OreDrillingPlant4 extends GT_MetaTileEntity_OreDrillingPlantBase {
+    public GT_MetaTileEntity_OreDrillingPlant4(int aID, String aName, String aNameRegional) {
+        super(aID, aName, aNameRegional);
+    }
+
+    public GT_MetaTileEntity_OreDrillingPlant4(String aName) {
+        super(aName);
+    }
+
+    @Override
+    public String[] getDescription() {
+        return getDescriptionInternal("IV");
+    }
+
+    @Override
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_OreDrillingPlant4(mName);
+    }
+
+    @Override
+    protected ItemList getCasingBlockItem() {
+        return ItemList.Casing_MiningOsmiridium;
+    }
+
+    @Override
+    protected Materials getFrameMaterial() {
+        return Materials.Osmiridium;
+    }
+
+    @Override
+    protected int getCasingTextureIndex() {
+        return 62;
+    }
+
+    @Override
+    protected int getRadiusInChunks() {
+        return 9;
+    }
+
+    @Override
+    protected int getMinTier() {
+        return 5;
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
new file mode 100644
index 0000000000..f25d2d304c
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
@@ -0,0 +1,425 @@
+package gregtech.common.tileentities.machines.multi;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.Textures;
+import gregtech.api.gui.GT_GUIContainer_MultiMachine;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.ItemData;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.blocks.GT_Block_Ores_Abstract;
+import gregtech.common.blocks.GT_TileEntity_Ores;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.ChunkPosition;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+
+import java.util.ArrayList;
+
+import static gregtech.api.enums.GT_Values.*;
+
+public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTileEntity_MultiBlockBase {
+    private static final ItemStack miningPipe = GT_ModHandler.getIC2Item("miningPipe", 0);
+    private static final ItemStack miningPipeTip = GT_ModHandler.getIC2Item("miningPipeTip", 0);
+    private static final Block miningPipeBlock = GT_Utility.getBlockFromStack(miningPipe);
+    private static final Block miningPipeTipBlock = GT_Utility.getBlockFromStack(miningPipeTip);
+
+    private final ArrayList<ChunkPosition> oreBlockPositions = new ArrayList<>();
+
+    private Block casingBlock;
+    private int casingMeta;
+    private int frameMeta;
+    private int casingTextureIndex;
+
+    private ForgeDirection back;
+    private int xDrill, yDrill, zDrill, xCenter, zCenter, yHead;
+
+    private boolean isPickingPipes;
+
+    public GT_MetaTileEntity_OreDrillingPlantBase(int aID, String aName, String aNameRegional) {
+        super(aID, aName, aNameRegional);
+        initFields();
+    }
+
+    public GT_MetaTileEntity_OreDrillingPlantBase(String aName) {
+        super(aName);
+        initFields();
+    }
+
+    private void initFields() {
+        casingBlock = getCasingBlockItem().getBlock();
+        casingMeta = getCasingBlockItem().get(0).getItemDamage();
+        int frameId = 4096 + getFrameMaterial().mMetaItemSubID;
+        frameMeta = GregTech_API.METATILEENTITIES[frameId] != null ? GregTech_API.METATILEENTITIES[frameId].getTileEntityBaseType() : W;
+        casingTextureIndex = getCasingTextureIndex();
+        isPickingPipes = false;
+    }
+
+    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+        if (aSide == aFacing)
+            return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[casingTextureIndex],new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_ORE_DRILL_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_ORE_DRILL)};
+        return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[casingTextureIndex]};
+    }
+
+    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+        return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "OreDrillingPlant.png");
+    }
+
+    @Override
+    public void saveNBTData(NBTTagCompound aNBT) {
+        super.saveNBTData(aNBT);
+        aNBT.setBoolean("isPickingPipe", isPickingPipes);
+    }
+
+    @Override
+    public void loadNBTData(NBTTagCompound aNBT) {
+        super.loadNBTData(aNBT);
+        isPickingPipes = aNBT.getBoolean("isPickingPipes");
+    }
+
+    @Override
+    public boolean checkRecipe(ItemStack aStack) {
+        setElectricityStats();
+        int oldYHead = yHead;
+        if (!checkPipesAndSetYHead() || !isEnergyEnough()) {
+            stopMachine();
+            return false;
+        }
+        if (yHead != oldYHead) oreBlockPositions.clear();
+        if (isPickingPipes) {
+            if (tryPickPipe()) {
+                mOutputItems = new ItemStack[] {GT_Utility.copyAmount(1, miningPipe)};
+                return true;
+            } else {
+                isPickingPipes = false;
+                stopMachine();
+                return false;
+            }
+        }
+
+        putMiningPipesFromInputsInController();
+        if (!tryConsumeDrillingFluid()) return false;
+
+        fillMineListIfEmpty();
+        if (oreBlockPositions.isEmpty()) {
+            if (!tryLowerPipe()) {
+                isPickingPipes = true;
+                return true;
+            }
+            //new layer - fill again
+            fillMineListIfEmpty();
+        }
+
+        ChunkPosition oreBlockPos = null;
+        Block oreBlock = null;
+
+        while ((oreBlock == null || oreBlock == Blocks.air) && !oreBlockPositions.isEmpty()) {
+            oreBlockPos = oreBlockPositions.remove(0);
+            oreBlock = getBaseMetaTileEntity().getBlock(oreBlockPos.chunkPosX, oreBlockPos.chunkPosY, oreBlockPos.chunkPosZ);
+        }
+
+        if (oreBlock != null && oreBlock != Blocks.air) {
+            ArrayList<ItemStack> oreBlockDrops = getBlockDrops(oreBlock, oreBlockPos.chunkPosX, oreBlockPos.chunkPosY, oreBlockPos.chunkPosZ);
+            getBaseMetaTileEntity().getWorld().setBlockToAir(oreBlockPos.chunkPosX, oreBlockPos.chunkPosY, oreBlockPos.chunkPosZ);
+            mOutputItems = getOutputByDrops(oreBlockDrops);
+        }
+
+        return true;
+    }
+
+    private boolean isEnergyEnough() {
+        long requiredEnergy = 512 + getMaxInputVoltage() * 4;
+        for (GT_MetaTileEntity_Hatch_Energy energyHatch : mEnergyHatches) {
+            requiredEnergy -= energyHatch.getEUVar();
+            if (requiredEnergy <= 0) return true;
+        }
+        return false;
+    }
+
+    private boolean tryPickPipe() {
+        if (yHead == yDrill) return false;
+        if (checkBlockAndMeta(xCenter, yHead + 1, zCenter, miningPipeBlock, W))
+            getBaseMetaTileEntity().getWorld().setBlock(xCenter, yHead + 1, zCenter, miningPipeTipBlock);
+        getBaseMetaTileEntity().getWorld().setBlockToAir(xCenter, yHead, zCenter);
+        return true;
+    }
+
+    private void setElectricityStats() {
+        this.mEfficiency = getCurrentEfficiency(null);
+        this.mEfficiencyIncrease = 10000;
+        //T1 = 12; T2 = 48; T3 = 192; T4 = 768
+        this.mEUt = 3 * (1 << (getMinTier() << 1));
+        //T1 = 960; T2 = 480; T3 = 240; T4 = 120
+        this.mMaxProgresstime = (isPickingPipes ? 80 : 1920) / (1 << getMinTier());
+
+        long voltage = getMaxInputVoltage();
+        long overclockEu = V[Math.max(1, GT_Utility.getTier(voltage)) - 1];
+        while (this.mEUt <= overclockEu) {
+            this.mEUt *= 4;
+            this.mMaxProgresstime /= 2;
+        }
+
+        this.mEUt = -this.mEUt;
+        this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
+    }
+
+    private ItemStack[] getOutputByDrops(ArrayList<ItemStack> oreBlockDrops) {
+        long voltage = getMaxInputVoltage();
+        ArrayList<ItemStack> outputItems = new ArrayList<>();
+        while (!oreBlockDrops.isEmpty()) {
+            ItemStack currentItem = oreBlockDrops.remove(0).copy();
+            if (!doUseMaceratorRecipe(currentItem)) {
+                multiplyStackSize(currentItem);
+                outputItems.add(currentItem);
+                continue;
+            }
+
+            GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.findRecipe(getBaseMetaTileEntity(), false, voltage, null, currentItem);
+            if (tRecipe == null) {
+                outputItems.add(currentItem);
+                continue;
+            }
+
+            for (int i = 0; i < tRecipe.mOutputs.length; i++) {
+                ItemStack recipeOutput = tRecipe.mOutputs[i].copy();
+                if (getBaseMetaTileEntity().getRandomNumber(10000) < tRecipe.getOutputChance(i))
+                    multiplyStackSize(recipeOutput);
+                outputItems.add(recipeOutput);
+            }
+        }
+        return outputItems.toArray(new ItemStack[0]);
+    }
+
+    private boolean doUseMaceratorRecipe(ItemStack currentItem) {
+        ItemData itemData = GT_OreDictUnificator.getItemData(currentItem);
+        return itemData == null
+                || itemData.mPrefix != OrePrefixes.crushed
+                && itemData.mPrefix != OrePrefixes.dustImpure
+                && itemData.mPrefix != OrePrefixes.dust
+                && itemData.mMaterial.mMaterial != Materials.Oilsands;
+    }
+
+    private void multiplyStackSize(ItemStack itemStack) {
+        itemStack.stackSize *= getBaseMetaTileEntity().getRandomNumber(4) + 1;
+    }
+
+    private ArrayList<ItemStack> getBlockDrops(final Block oreBlock, int posX, int posY, int posZ) {
+        final int blockMeta = getBaseMetaTileEntity().getMetaID(posX, posY, posZ);
+        if (oreBlock.canSilkHarvest(getBaseMetaTileEntity().getWorld(), null, posX, posY, posZ, blockMeta)) {
+            return new ArrayList<ItemStack>() {{
+                add(new ItemStack(oreBlock, 1, blockMeta));
+            }};
+        } else return oreBlock.getDrops(getBaseMetaTileEntity().getWorld(), posX, posY, posZ, blockMeta, 1);
+    }
+
+    private boolean tryConsumeDrillingFluid() {
+        return depleteInput(new FluidStack(ItemList.sDrillingFluid, 2000));
+    }
+
+    private void putMiningPipesFromInputsInController() {
+        int maxPipes = miningPipe.getMaxStackSize();
+        if (isHasMiningPipes(maxPipes)) return;
+
+        ItemStack pipes = getStackInSlot(1);
+        for (ItemStack storedItem : getStoredInputs()) {
+            if (!storedItem.isItemEqual(miningPipe)) continue;
+
+            if (pipes == null) {
+                setInventorySlotContents(1, GT_Utility.copy(miningPipe));
+                pipes = getStackInSlot(1);
+            }
+
+            if (pipes.stackSize == maxPipes) break;
+
+            int needPipes = maxPipes - pipes.stackSize;
+            int transferPipes = storedItem.stackSize < needPipes ? storedItem.stackSize : needPipes;
+
+            pipes.stackSize += transferPipes;
+            storedItem.stackSize -= transferPipes;
+        }
+        updateSlots();
+    }
+
+    private void fillMineListIfEmpty() {
+        if (!oreBlockPositions.isEmpty()) return;
+
+        tryAddOreBlockToMineList(xCenter, yHead - 1, zCenter);
+        if (yHead == yDrill) return; //skip controller block layer
+
+        int radius = getRadiusInChunks() << 4;
+        for (int xOff = -radius; xOff <= radius; xOff++)
+            for (int zOff = -radius; zOff <= radius; zOff++)
+                tryAddOreBlockToMineList(xDrill + xOff, yHead, zDrill + zOff);
+    }
+
+    private void tryAddOreBlockToMineList(int x, int y, int z) {
+        Block block = getBaseMetaTileEntity().getBlock(x, y, z);
+        int blockMeta = getBaseMetaTileEntity().getMetaID(x, y, z);
+        ChunkPosition blockPos = new ChunkPosition(x, y, z);
+        if (oreBlockPositions.contains(blockPos)) return;
+        if (block instanceof GT_Block_Ores_Abstract) {
+            TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntity(x, y, z);
+            if (tTileEntity != null && tTileEntity instanceof GT_TileEntity_Ores && ((GT_TileEntity_Ores) tTileEntity).mNatural)
+                oreBlockPositions.add(blockPos);
+        } else {
+            ItemData association = GT_OreDictUnificator.getAssociation(new ItemStack(block, 1, blockMeta));
+            if (association != null && association.mPrefix.toString().startsWith("ore"))
+                oreBlockPositions.add(blockPos);
+        }
+    }
+
+    private boolean tryLowerPipe() {
+        if (!isHasMiningPipes()) return false;
+
+        if (yHead <= 0) return false;
+        if (checkBlockAndMeta(xCenter, yHead - 1, zCenter, Blocks.bedrock, W)) return false;
+
+        getBaseMetaTileEntity().getWorld().setBlock(xCenter, yHead - 1, zCenter, miningPipeTipBlock);
+        if (yHead != yDrill) getBaseMetaTileEntity().getWorld().setBlock(xCenter, yHead, zCenter, miningPipeBlock);
+
+        getBaseMetaTileEntity().decrStackSize(1, 1);
+        return true;
+    }
+
+    private boolean isHasMiningPipes() {
+        return isHasMiningPipes(1);
+    }
+
+    private boolean isHasMiningPipes(int minCount) {
+        ItemStack pipe = getStackInSlot(1);
+        return pipe != null && pipe.stackSize > minCount - 1 && pipe.isItemEqual(miningPipe);
+    }
+
+    @Override
+    public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
+        updateCoordinates();
+        //check base layer
+        for (int xOff = -1 + back.offsetX; xOff <= 1 + back.offsetX; xOff++) {
+            for (int zOff = -1 + back.offsetZ; zOff <= 1 + back.offsetZ; zOff++) {
+                if (xOff == 0 && zOff == 0) continue;
+
+                IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xOff, 0, zOff);
+                if (!checkCasingBlock(xOff, 0, zOff)
+                        && !addMaintenanceToMachineList(tTileEntity, casingTextureIndex)
+                        && !addInputToMachineList(tTileEntity, casingTextureIndex)
+                        && !addOutputToMachineList(tTileEntity, casingTextureIndex)
+                        && !addEnergyInputToMachineList(tTileEntity, casingTextureIndex))
+                    return false;
+            }
+        }
+        if (mMaintenanceHatches.isEmpty() || mInputHatches.isEmpty() || mOutputBusses.isEmpty() || mEnergyHatches.isEmpty()) return false;
+        if (GT_Utility.getTier(getMaxInputVoltage()) < getMinTier()) return false;
+        //check tower
+        for (int yOff = 1; yOff < 4; yOff++) {
+            if (!checkCasingBlock(back.offsetX, yOff, back.offsetZ)
+                    || !checkFrameBlock(back.offsetX + 1, yOff, back.offsetZ)
+                    || !checkFrameBlock(back.offsetX - 1, yOff, back.offsetZ)
+                    || !checkFrameBlock(back.offsetX, yOff, back.offsetZ + 1)
+                    || !checkFrameBlock(back.offsetX, yOff, back.offsetZ - 1)
+                    || !checkFrameBlock(back.offsetX, yOff + 3, back.offsetZ))
+                return false;
+        }
+        return true;
+    }
+
+    private void updateCoordinates() {
+        xDrill = getBaseMetaTileEntity().getXCoord();
+        yDrill = getBaseMetaTileEntity().getYCoord();
+        zDrill = getBaseMetaTileEntity().getZCoord();
+        back = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing());
+        xCenter = xDrill + back.offsetX;
+        zCenter = zDrill + back.offsetZ;
+    }
+
+    private boolean checkPipesAndSetYHead() {
+        yHead = yDrill - 1;
+        while (checkBlockAndMeta(xCenter, yHead, zCenter, miningPipeBlock, W)) yHead--; //skip pipes
+        //is pipe tip OR is controller layer
+        if (checkBlockAndMeta(xCenter, yHead, zCenter, miningPipeTipBlock, W) || ++yHead == yDrill) return true;
+        //pipe column is broken - try fix
+        getBaseMetaTileEntity().getWorld().setBlock(xCenter, yHead, zCenter, miningPipeTipBlock);
+        return true;
+    }
+
+    private boolean checkCasingBlock(int xOff, int yOff, int zOff) {
+        return checkBlockAndMetaOffset(xOff, yOff, zOff, casingBlock, casingMeta);
+    }
+    //meta of frame is getTileEntityBaseType; frame should be checked using its drops (possible a high weight operation)
+    private boolean checkFrameBlock(int xOff, int yOff, int zOff) {
+        return checkBlockAndMetaOffset(xOff, yOff, zOff, GregTech_API.sBlockMachines, frameMeta);
+    }
+
+    private boolean checkBlockAndMetaOffset(int xOff, int yOff, int zOff, Block block, int meta) {
+        return checkBlockAndMeta(xDrill + xOff, yDrill + yOff, zDrill + zOff, block, meta);
+    }
+
+    private boolean checkBlockAndMeta(int x, int y, int z, Block block, int meta) {
+        return (meta == W || getBaseMetaTileEntity().getMetaID(x, y, z) == meta)
+                && getBaseMetaTileEntity().getBlock(x, y, z) == block;
+    }
+
+    @Override
+    public boolean isCorrectMachinePart(ItemStack aStack) {
+        return true;
+    }
+
+    @Override
+    public int getMaxEfficiency(ItemStack aStack) {
+        return 10000;
+    }
+
+    @Override
+    public int getPollutionPerTick(ItemStack aStack) {
+        return 0;
+    }
+
+    @Override
+    public int getDamageToComponent(ItemStack aStack) {
+        return 0;
+    }
+
+    @Override
+    public boolean explodesOnComponentBreak(ItemStack aStack) {
+        return false;
+    }
+
+    protected abstract ItemList getCasingBlockItem();
+
+    protected abstract Materials getFrameMaterial();
+
+    protected abstract int getCasingTextureIndex();
+
+    protected abstract int getRadiusInChunks();
+
+    protected abstract int getMinTier();
+
+    protected String[] getDescriptionInternal(String tierSuffix) {
+        String casings = getCasingBlockItem().get(0).getDisplayName();
+        return new String[]{
+                "Controller Block for the Ore Drilling Plant " + (tierSuffix != null ? tierSuffix : ""),
+                "Size(WxHxD): 3x7x3, Controller (Front middle bottom)",
+                "3x1x3 Base of " + casings,
+                "1x3x1 " + casings + " pillar (Center of base)",
+                "1x3x1 " + getFrameMaterial().mName + " Frame Boxes (Each pillar side and on top)",
+                "1x Input Hatch for drilling fluid (Any bottom layer casing)",
+                "1x Input Bus for mining pipes (Any bottom layer casing; not necessary)",
+                "1x Output Bus (Any bottom layer casing)",
+                "1x Maintenance Hatch (Any bottom layer casing)",
+                "1x " + VN[getMinTier()] + "+ Energy Hatch (Any bottom layer casing)",
+                "Radius is " + (getRadiusInChunks() << 4) + " blocks"};
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
index 318d700195..5811743432 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
@@ -1,5 +1,6 @@
 package gregtech.common.tileentities.machines.multi;
 
+import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
@@ -22,6 +23,8 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine.isValidForLowGravity;
+
 public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBlockBase {
 
     GT_Recipe mLastRecipe;
@@ -64,7 +67,7 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
 
     public GT_Recipe.GT_Recipe_Map getRecipeMap() {
         if (mInventory[1] == null) return null;
-        String tmp = mInventory[1].getUnlocalizedName().replaceAll("gt.blockmachines.basicmachine.", "");
+        String tmp = mInventory[1].getUnlocalizedName().replaceAll("gt\\.blockmachines\\.basicmachine\\.", "");
         if (tmp.startsWith("centrifuge")) {
             return GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes;
         } else if (tmp.startsWith("electrolyzer")) {
@@ -131,8 +134,25 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
             return GT_Recipe.GT_Recipe_Map.sPolarizerRecipes;
         } else if(tmp.startsWith("press")){
             return GT_Recipe.GT_Recipe_Map.sPressRecipes;
+        } else if (tmp.startsWith("plasmaarcfurnace")) {
+            return GT_Recipe.GT_Recipe_Map.sPlasmaArcFurnaceRecipes;
+        } else if (tmp.startsWith("printer")) {
+            return GT_Recipe.GT_Recipe_Map.sPrinterRecipes;
+        } else if (tmp.startsWith("press")) {
+            return GT_Recipe.GT_Recipe_Map.sPressRecipes;
+        } else if (tmp.startsWith("fluidcanner")) {
+            return GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes;
+        } else if (tmp.startsWith("fluidheater")) {
+            return GT_Recipe.GT_Recipe_Map.sFluidHeaterRecipes;
+        } else if (tmp.startsWith("distillery")) {
+            return GT_Recipe.GT_Recipe_Map.sDistilleryRecipes;
+        } else if (tmp.startsWith("slicer")) {
+            return GT_Recipe.GT_Recipe_Map.sSlicerRecipes;
+        } else if (tmp.startsWith("amplifier")) {
+            return GT_Recipe.GT_Recipe_Map.sAmplifiers;
+        } else if (tmp.startsWith("circuitassembler")) {
+            return GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes;
         }
-
         return null;
     }
 
@@ -153,9 +173,7 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
             return false;
         }
         GT_Recipe.GT_Recipe_Map map = getRecipeMap();
-        if (map == null) {
-            return false;
-        }
+        if (map == null) return false;
         ArrayList<ItemStack> tInputList = getStoredInputs();
         int tTier = 0;
         if (mInventory[1].getUnlocalizedName().endsWith("1")) {
@@ -186,6 +204,10 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
         if (tInputList.size() > 0 || tFluids.length > 0) {
             GT_Recipe tRecipe = map.findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, gregtech.api.enums.GT_Values.V[tTier], tFluids, tInputs);
             if (tRecipe != null) {
+                if (GT_Mod.gregtechproxy.mLowGravProcessing && tRecipe.mSpecialValue == -100 &&
+                        !isValidForLowGravity(tRecipe,getBaseMetaTileEntity().getWorld().provider.dimensionId))
+                    return false;
+
                 mLastRecipe = tRecipe;
                 this.mEUt = 0;
                 this.mOutputItems = null;
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
index 2bfc81caf4..a17f11d495 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
@@ -61,44 +61,6 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach
         return true;
     }
 
-//	  public void onRightclick(EntityPlayer aPlayer)
-//	  {
-//	    ItemStack tPlayerItem = aPlayer.inventory.getCurrentItem();
-//	    if (tPlayerItem == null)
-//	    {
-//	      if (this.mItemID > 0)
-//	      {
-//	        for (int i = 0; (this.mItemCount < getMaxItemCount()) && (i < aPlayer.field_71071_by.func_70302_i_()); i++)
-//	        {
-//	          if ((aPlayer.field_71071_by.func_70301_a(i) != null) && (aPlayer.field_71071_by.func_70301_a(i).field_77993_c == this.mItemID) && (aPlayer.field_71071_by.func_70301_a(i).func_77960_j() == this.mItemMeta) && (!aPlayer.field_71071_by.func_70301_a(i).func_77942_o()))
-//	          {
-//	            this.mItemCount += aPlayer.field_71071_by.func_70301_a(i).field_77994_a;
-//	            if (aPlayer.field_71071_by.func_70301_a(i).field_77994_a == 111)
-//	            {
-//	              this.mItemCount = (getMaxItemCount() + 192 - (this.mItemCount + (this.mInventory[0] == null ? 0 : this.mInventory[0].field_77994_a) + (this.mInventory[1] == null ? 0 : this.mInventory[1].field_77994_a) + (this.mInventory[2] == null ? 0 : this.mInventory[2].field_77994_a)));
-//	            }
-//	            else if (this.mItemCount > getMaxItemCount())
-//	            {
-//	              aPlayer.field_71071_by.func_70301_a(i).field_77994_a = (this.mItemCount - getMaxItemCount());
-//	              this.mItemCount = getMaxItemCount();
-//	            }
-//	            else
-//	            {
-//	              aPlayer.field_71071_by.func_70301_a(i).field_77994_a = 0;
-//	            }
-//	          }
-//	          if ((aPlayer.field_71071_by.func_70301_a(i) != null) && (aPlayer.field_71071_by.func_70301_a(i).field_77994_a <= 0)) {
-//	            aPlayer.field_71071_by.func_70299_a(i, null);
-//	          }
-//	        }
-//	        GT_Utility.sendChatToPlayer(aPlayer, this.mItemCount + (this.mInventory[0] == null ? 0 : this.mInventory[0].field_77994_a) + (this.mInventory[1] == null ? 0 : this.mInventory[1].field_77994_a) + (this.mInventory[2] == null ? 0 : this.mInventory[2].field_77994_a) + " of " + new ItemStack(this.mItemID, 1, this.mItemMeta).func_82833_r());
-//	      }
-//	    }
-//	    if (aPlayer.field_71069_bz != null) {
-//	      aPlayer.field_71069_bz.func_75142_b();
-//	    }
-//	  }
-
     @Override
     public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
         return new GT_Container_QuantumChest(aPlayerInventory, aBaseMetaTileEntity);
@@ -113,9 +75,6 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {
 
         if (getBaseMetaTileEntity().isServerSide() && getBaseMetaTileEntity().isAllowedToWork()) {
-//            	if(mInventory[0]!=null)System.out.println("input: "+mInventory[0].stackSize);
-//            	System.out.println("store: "+mItemCount);
-//            	if(mInventory[0]!=null)System.out.println("output: "+mInventory[2].stackSize);
             if ((getItemCount() <= 0)) {
                 this.mItemStack = null;
                 this.mItemCount = 0;
diff --git a/src/main/java/gregtech/common/tools/GT_Tool.java b/src/main/java/gregtech/common/tools/GT_Tool.java
index a1596ba93e..5f54f7bdc3 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool.java
@@ -14,6 +14,7 @@ import net.minecraft.stats.AchievementList;
 import net.minecraft.util.DamageSource;

 import net.minecraft.util.EntityDamageSource;

 import net.minecraft.util.IChatComponent;

+import net.minecraft.world.World;

 import net.minecraftforge.event.world.BlockEvent;

 

 import java.util.List;

@@ -145,4 +146,9 @@ public abstract class GT_Tool
     public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) {

         return aOriginalDamage;

     }

+

+	@Override

+	public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World worldObj, int aX, int aY, int aZ) {

+		return aDefault;

+	}

 }

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
index f74aeca505..c536361b1f 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
@@ -12,6 +12,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentText;

 import net.minecraft.util.EnumChatFormatting;

 import net.minecraft.util.IChatComponent;

+import net.minecraft.world.World;

 import net.minecraftforge.event.world.BlockEvent;

 

 import java.util.List;

@@ -96,6 +97,21 @@ public class GT_Tool_Axe
         }

         return rAmount;

     }

+    

+    public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ)

+    {

+      if (aBlock.isWood(aPlayer.worldObj, aX, aY, aZ) && OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData))){

+        float rAmount = 1.0F;float tIncrement = 1.0F;

+        if ((GregTech_API.sTimber) && !aPlayer.isSneaking()){

+          int tY = aY + 1;

+          for (int tH = aPlayer.worldObj.getHeight(); (tY < tH) && (aPlayer.worldObj.getBlock(aX, tY, aZ) == aBlock); tY++){

+            tIncrement += 0.1F;rAmount += tIncrement;

+          }

+        }

+        return 2.0F * aDefault / rAmount;

+      }

+      return (aBlock.getMaterial() == Material.leaves) || (aBlock.getMaterial() == Material.vine) || (aBlock.getMaterial() == Material.plants) || (aBlock.getMaterial() == Material.gourd) ? aDefault / 4.0F : aDefault;

+    }

 

     public ItemStack getBrokenItem(ItemStack aStack) {

         return null;

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
index a1acbf100b..93722c52f7 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
@@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentText;

 import net.minecraft.util.EnumChatFormatting;

 import net.minecraft.util.IChatComponent;

+import net.minecraft.world.World;

 import net.minecraftforge.common.IShearable;

 import net.minecraftforge.event.world.BlockEvent;

 

@@ -135,6 +136,21 @@ public class GT_Tool_Chainsaw_LV
         }

         return rAmount;

     }

+    

+    public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ)

+    {

+      if (aBlock.isWood(aPlayer.worldObj, aX, aY, aZ) && OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData))){

+        float rAmount = 1.0F;float tIncrement = 1.0F;

+        if ((GregTech_API.sTimber) && !aPlayer.isSneaking()){

+          int tY = aY + 1;

+          for (int tH = aPlayer.worldObj.getHeight(); (tY < tH) && (aPlayer.worldObj.getBlock(aX, tY, aZ) == aBlock); tY++){

+            tIncrement += 0.1F;rAmount += tIncrement;

+          }

+        }

+        return 2.0F * aDefault / rAmount;

+      }

+      return (aBlock.getMaterial() == Material.leaves) || (aBlock.getMaterial() == Material.vine) || (aBlock.getMaterial() == Material.plants) || (aBlock.getMaterial() == Material.gourd) ? aDefault / 4.0F : aDefault;

+    }

 

     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

         return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_LV;