Merge branch 'master' of https://github.com/GTNewHorizons/GTplusplus into gtnh-milling

# Conflicts:
#	build.properties
#	src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java

8 files changed, 221 insertions, 40 deletions

diff --git a/src/Java/gtPlusPlus/core/config/ConfigHandler.java b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
index f5f4d502a1..7c1b584d87 100644
--- a/src/Java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
@@ -188,7 +188,59 @@ public class ConfigHandler {
 				"BlacklistedTileEntiyClassNames", "gregtech",
 				BlacklistedTileEntiyClassNames,
 				"The Canonical Class-Names of TileEntities that should be ignored by the WorldAccelerator");
-	
+
+		//Pollution
+		pollutionPerSecondMultiPackager = config.get("pollution", "pollutionPerSecondMultiPackager", pollutionPerSecondMultiPackager,"pollution rate in gibbl/s for the Amazon warehousing depot").getInt(pollutionPerSecondMultiPackager);
+		pollutionPerSecondMultiIndustrialAlloySmelter = config.get("pollution", "pollutionPerSecondMultiIndustrialAlloySmelter", pollutionPerSecondMultiIndustrialAlloySmelter,"pollution rate in gibbl/s for the Alloy blast smelter").getInt(pollutionPerSecondMultiIndustrialAlloySmelter);
+		pollutionPerSecondMultiIndustrialArcFurnace = config.get("pollution", "pollutionPerSecondMultiIndustrialArcFurnace", pollutionPerSecondMultiIndustrialArcFurnace,"pollution rate in gibbl/s for the High current arc furnace").getInt(pollutionPerSecondMultiIndustrialArcFurnace);
+		pollutionPerSecondMultiIndustrialCentrifuge = config.get("pollution", "pollutionPerSecondMultiIndustrialCentrifuge", pollutionPerSecondMultiIndustrialCentrifuge,"pollution rate in gibbl/s for the Industrial centrifuge").getInt(pollutionPerSecondMultiIndustrialCentrifuge);
+		pollutionPerSecondMultiIndustrialCokeOven = config.get("pollution", "pollutionPerSecondMultiIndustrialCokeOven", pollutionPerSecondMultiIndustrialCokeOven,"pollution rate in gibbl/s for the Industrial coke oven").getInt(pollutionPerSecondMultiIndustrialCokeOven);
+		pollutionPerSecondMultiIndustrialCuttingMachine = config.get("pollution", "pollutionPerSecondMultiIndustrialCuttingMachine", pollutionPerSecondMultiIndustrialCuttingMachine,"pollution rate in gibbl/s for the Cutting factory").getInt(pollutionPerSecondMultiIndustrialCuttingMachine);
+		pollutionPerSecondMultiIndustrialDehydrator = config.get("pollution", "pollutionPerSecondMultiIndustrialDehydrator", pollutionPerSecondMultiIndustrialDehydrator,"pollution rate in gibbl/s for the Utupu-Tanuri").getInt(pollutionPerSecondMultiIndustrialDehydrator);
+		pollutionPerSecondMultiIndustrialElectrolyzer = config.get("pollution", "pollutionPerSecondMultiIndustrialElectrolyzer", pollutionPerSecondMultiIndustrialElectrolyzer,"pollution rate in gibbl/s for the Industrial electrolyzer").getInt(pollutionPerSecondMultiIndustrialElectrolyzer);
+		pollutionPerSecondMultiIndustrialExtruder = config.get("pollution", "pollutionPerSecondMultiIndustrialExtruder", pollutionPerSecondMultiIndustrialExtruder,"pollution rate in gibbl/s for the Industrial extrusion machine").getInt(pollutionPerSecondMultiIndustrialExtruder);
+		pollutionPerSecondMultiIndustrialMacerator = config.get("pollution", "pollutionPerSecondMultiIndustrialMacerator", pollutionPerSecondMultiIndustrialMacerator,"pollution rate in gibbl/s for the Maceration stack").getInt(pollutionPerSecondMultiIndustrialMacerator);
+		pollutionPerSecondMultiIndustrialMixer = config.get("pollution", "pollutionPerSecondMultiIndustrialMixer", pollutionPerSecondMultiIndustrialMixer,"pollution rate in gibbl/s for the Industrial mixing machine").getInt(pollutionPerSecondMultiIndustrialMixer);
+		pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal = config.get("pollution", "pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal", pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal,"pollution rate in gibbl/s for the Large processing factory in metal mode").getInt(pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal);
+		pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid = config.get("pollution", "pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid", pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid,"pollution rate in gibbl/s for the Large processing factory in fluid mode").getInt(pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid);
+		pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc = config.get("pollution", "pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc", pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc,"pollution rate in gibbl/s for the Large processing factory in misc mode").getInt(pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc);
+		pollutionPerSecondMultiIndustrialPlatePress_ModeForming = config.get("pollution", "pollutionPerSecondMultiIndustrialPlatePress_ModeForming", pollutionPerSecondMultiIndustrialPlatePress_ModeForming,"pollution rate in gibbl/s for the Industrial material press in forming mode").getInt(pollutionPerSecondMultiIndustrialPlatePress_ModeForming);
+		pollutionPerSecondMultiIndustrialPlatePress_ModeBending = config.get("pollution", "pollutionPerSecondMultiIndustrialPlatePress_ModeBending", pollutionPerSecondMultiIndustrialPlatePress_ModeBending,"pollution rate in gibbl/s for the Industrial material press in bending mode").getInt(pollutionPerSecondMultiIndustrialPlatePress_ModeBending);
+		pollutionPerSecondMultiIndustrialSifter = config.get("pollution", "pollutionPerSecondMultiIndustrialSifter", pollutionPerSecondMultiIndustrialSifter,"pollution rate in gibbl/s for the Large Sifter").getInt(pollutionPerSecondMultiIndustrialSifter);
+		pollutionPerSecondMultiIndustrialThermalCentrifuge = config.get("pollution", "pollutionPerSecondMultiIndustrialThermalCentrifuge", pollutionPerSecondMultiIndustrialThermalCentrifuge,"pollution rate in gibbl/s for the Large thermal refinery").getInt(pollutionPerSecondMultiIndustrialThermalCentrifuge);
+		pollutionPerSecondMultiIndustrialVacuumFreezer = config.get("pollution", "pollutionPerSecondMultiIndustrialVacuumFreezer", pollutionPerSecondMultiIndustrialVacuumFreezer,"pollution rate in gibbl/s for the Cryogenic freezer").getInt(pollutionPerSecondMultiIndustrialVacuumFreezer);
+		pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath = config.get("pollution", "pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath", pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath,"pollution rate in gibbl/s for the Ore washing plant in chemical bath mode").getInt(pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath);
+		pollutionPerSecondMultiIndustrialWashPlant_ModeWasher = config.get("pollution", "pollutionPerSecondMultiIndustrialWashPlant_ModeWasher", pollutionPerSecondMultiIndustrialWashPlant_ModeWasher,"pollution rate in gibbl/s for the Ore washing plant in ore washer mode").getInt(pollutionPerSecondMultiIndustrialWashPlant_ModeWasher);
+		pollutionPerSecondMultiIndustrialWireMill = config.get("pollution", "pollutionPerSecondMultiIndustrialWireMill", pollutionPerSecondMultiIndustrialWireMill,"pollution rate in gibbl/s for the Wire factory").getInt(pollutionPerSecondMultiIndustrialWireMill);
+		pollutionPerSecondMultiIsaMill = config.get("pollution", "pollutionPerSecondMultiIsaMill", pollutionPerSecondMultiIsaMill,"pollution rate in gibbl/s for the IsaMill grinding machine").getInt(pollutionPerSecondMultiIsaMill);
+		pollutionPerSecondMultiAdvDistillationTower_ModeDistillery = config.get("pollution", "pollutionPerSecondMultiAdvDistillationTower_ModeDistillery", pollutionPerSecondMultiAdvDistillationTower_ModeDistillery,"pollution rate in gibbl/s for the Dangote distillus in distillery mode").getInt(pollutionPerSecondMultiAdvDistillationTower_ModeDistillery);
+		pollutionPerSecondMultiAdvDistillationTower_ModeDT = config.get("pollution", "pollutionPerSecondMultiAdvDistillationTower_ModeDT", pollutionPerSecondMultiAdvDistillationTower_ModeDT,"pollution rate in gibbl/s for the Dangote distillus in distillation tower mode").getInt(pollutionPerSecondMultiAdvDistillationTower_ModeDT);
+		pollutionPerSecondMultiAdvEBF = config.get("pollution", "pollutionPerSecondMultiAdvEBF", pollutionPerSecondMultiAdvEBF,"pollution rate in gibbl/s for the Volcanus").getInt(pollutionPerSecondMultiAdvEBF);
+		pollutionPerSecondMultiAdvImplosion = config.get("pollution", "pollutionPerSecondMultiAdvImplosion", pollutionPerSecondMultiAdvImplosion,"pollution rate in gibbl/s for the Density^2").getInt(pollutionPerSecondMultiAdvImplosion);
+		pollutionPerSecondMultiABS = config.get("pollution", "pollutionPerSecondMultiABS", pollutionPerSecondMultiABS,"pollution rate in gibbl/s for the Alloy blast furnace").getInt(pollutionPerSecondMultiABS);
+		pollutionPerSecondMultiCyclotron = config.get("pollution", "pollutionPerSecondMultiCyclotron", pollutionPerSecondMultiCyclotron,"pollution rate in gibbl/s for the Cyclotron").getInt(pollutionPerSecondMultiCyclotron);
+		pollutionPerSecondMultiIndustrialFishingPond = config.get("pollution", "pollutionPerSecondMultiIndustrialFishingPond", pollutionPerSecondMultiIndustrialFishingPond,"pollution rate in gibbl/s for the Zuhai - fishing port").getInt(pollutionPerSecondMultiIndustrialFishingPond);
+		//pollutionPerSecondMultiLargeRocketEngine;
+		pollutionPerSecondMultiLargeSemiFluidGenerator = config.get("pollution", "pollutionPerSecondMultiLargeSemiFluidGenerator", pollutionPerSecondMultiLargeSemiFluidGenerator,"pollution rate in gibbl/s for the Large semifluid burner").getInt(pollutionPerSecondMultiLargeSemiFluidGenerator);
+		pollutionPerSecondMultiMassFabricator = config.get("pollution", "pollutionPerSecondMultiMassFabricator", pollutionPerSecondMultiMassFabricator,"pollution rate in gibbl/s for the Matter fabrication CPU").getInt(pollutionPerSecondMultiMassFabricator);
+		pollutionPerSecondMultiRefinery = config.get("pollution", "pollutionPerSecondMultiRefinery", pollutionPerSecondMultiRefinery,"pollution rate in gibbl/s for the Reactor fuel processing plant").getInt(pollutionPerSecondMultiRefinery);
+		//pollutionPerSecondMultiGeneratorArray;
+		pollutionPerSecondMultiTreeFarm = config.get("pollution", "pollutionPerSecondMultiTreeFarm", pollutionPerSecondMultiTreeFarm,"pollution rate in gibbl/s for the Tree growth simulator").getInt(pollutionPerSecondMultiTreeFarm);
+		pollutionPerSecondMultiFrothFlotationCell = config.get("pollution", "pollutionPerSecondMultiFrothFlotationCell", pollutionPerSecondMultiFrothFlotationCell,"pollution rate in gibbl/s for the Flotation cell regulator").getInt(pollutionPerSecondMultiFrothFlotationCell);
+		pollutionPerSecondMultiNuclearReactor_ModeBoosted = config.get("pollution", "pollutionPerSecondMultiNuclearReactor_ModeBoosted", pollutionPerSecondMultiNuclearReactor_ModeBoosted,"pollution rate in gibbl/s for the Thorium reactor when boosted").getInt(pollutionPerSecondMultiNuclearReactor_ModeBoosted);
+		pollutionPerSecondMultiNuclearReactor_ModeNormal = config.get("pollution", "pollutionPerSecondMultiNuclearReactor_ModeNormal", pollutionPerSecondMultiNuclearReactor_ModeNormal,"pollution rate in gibbl/s for the Thorium reactor").getInt(pollutionPerSecondMultiNuclearReactor_ModeNormal);
+		pollutionPerSecondMultiAutoCrafter = config.get("pollution", "pollutionPerSecondMultiAutoCrafter", pollutionPerSecondMultiAutoCrafter,"pollution rate in gibbl/s for the Large-Scale auto assembler v1.01").getInt(pollutionPerSecondMultiAutoCrafter);
+		pollutionPerSecondMultiThermalBoiler = config.get("pollution", "pollutionPerSecondMultiThermalBoiler", pollutionPerSecondMultiThermalBoiler,"pollution rate in gibbl/s for the Thermal boiler").getInt(pollutionPerSecondMultiThermalBoiler);
+		pollutionPerSecondMultiAlgaePond = config.get("pollution", "pollutionPerSecondMultiAlgaePond", pollutionPerSecondMultiAlgaePond,"pollution rate in gibbl/s for the Algae farm").getInt(pollutionPerSecondMultiAlgaePond);
+		basePollutionPerSecondSemiFluidGenerator = config.get("pollution", "basePollutionPerSecondSemiFluidGenerator", basePollutionPerSecondSemiFluidGenerator, "base pollution rate in gibbl/s for the single block semi fluid generators").getInt(basePollutionPerSecondSemiFluidGenerator);
+		pollutionReleasedByTierSemiFluidGenerator = config.get("pollution", "pollutionReleasedByTierSemiFluidGenerator", pollutionReleasedByTierSemiFluidGenerator, "coefficient applied to the base rate of the single block semi fluid generators based on its tier (first is tier 0 aka ULV)").getDoubleList();
+		basePollutionPerSecondBoiler = config.get("pollution", "basePollutionPerSecondBoiler", basePollutionPerSecondBoiler,"base pollution rate in gibbl/s for the single block boilers").getInt(basePollutionPerSecondBoiler);
+		pollutionReleasedByTierBoiler = config.get("pollution", "pollutionReleasedByTierBoiler", pollutionReleasedByTierBoiler, "coefficient applied to the base rate of the single block semi fluid generators based on its tier (first is tier 0 aka ULV)").getDoubleList();
+		baseMinPollutionPerSecondRocketFuelGenerator = config.get("pollution", "baseMinPollutionPerSecondRocketFuelGenerator", baseMinPollutionPerSecondRocketFuelGenerator, "minimum base pollution rate in gibbl/s for the single block rocket engines").getInt(baseMinPollutionPerSecondRocketFuelGenerator);
+		baseMaxPollutionPerSecondRocketFuelGenerator = config.get("pollution", "baseMaxPollutionPerSecondRocketFuelGenerator", baseMaxPollutionPerSecondRocketFuelGenerator, "maximum base pollution rate in gibbl/s for the single block rocket engines").getInt(baseMaxPollutionPerSecondRocketFuelGenerator);
+		pollutionReleasedByTierRocketFuelGenerator = config.get("pollution", "pollutionReleasedByTierRocketFuelGenerator", pollutionReleasedByTierRocketFuelGenerator, "coefficient applied to the base rate of the single block rocket engines based on its tier (first is tier 0 aka ULV)").getDoubleList();
+		basePollutionPerSecondGeothermalGenerator = config.get("pollution", "basePollutionPerSecondGeothermalGenerator", basePollutionPerSecondGeothermalGenerator,"base pollution rate in gibbl/s for the geothermal engines").getInt(basePollutionPerSecondGeothermalGenerator);
+		pollutionReleasedByTierGeothermalGenerator = config.get("pollution", "pollutionReleasedByTierGeothermalGenerator", pollutionReleasedByTierGeothermalGenerator, "coefficient applied to the base rate of the single block geothermal engines based on its tier (first is tier 0 aka ULV)").getDoubleList();
 		config.save();
 	}
 
diff --git a/src/Java/gtPlusPlus/core/fluids/FluidFactory.java b/src/Java/gtPlusPlus/core/fluids/FluidFactory.java
index dffd7f55e9..da23824c78 100644
--- a/src/Java/gtPlusPlus/core/fluids/FluidFactory.java
+++ b/src/Java/gtPlusPlus/core/fluids/FluidFactory.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.fluids;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.eventhandler.Event.Result;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -122,7 +123,7 @@ public class FluidFactory {
 			try {
 				throw new GregtechException("Cannot generate Fluid Packages outside of Pre-Init!");
 			} catch (GregtechException e) {
-				System.exit(0);
+				FMLCommonHandler.instance().exitJava(0, true);
 			}
 		}
 		
diff --git a/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java b/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
index d41fccb3ed..680068402b 100644
--- a/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
+++ b/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 
 import cpw.mods.fml.common.eventhandler.Event;
+import cpw.mods.fml.common.FMLCommonHandler;
 import gtPlusPlus.api.objects.GregtechException;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
@@ -44,7 +45,7 @@ public class ItemGenericFluidBucket extends ItemBucket {
 			try {
 				throw new GregtechException(""+aID+" is already registered! Unable to register fluid: "+FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName());
 			} catch (GregtechException e) {
-				System.exit(0);
+				FMLCommonHandler.instance().exitJava(0, true);
 			}
 		}		
 		mInternalFluidCache.put(FluidFactory.mMetaToBlockMap.get(aID));
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
index ed17f8547a..9a00b49342 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
@@ -159,8 +159,6 @@ public class ItemGenericChemBase extends Item {
     public String getUnlocalizedName(ItemStack stack) {
 		return super.getUnlocalizedName() + "." + stack.getItemDamage();
     }
-	
-
 
 	@Override
 	public double getDurabilityForDisplay(ItemStack aStack) {
@@ -169,16 +167,14 @@ public class ItemGenericChemBase extends Item {
 				createMillingBallNBT(aStack);
 	        }
 			double currentDamage = getMillingBallDamage(aStack);
-			double durabilitypercent = currentDamage / 100;		
-	        return  durabilitypercent;
+			return currentDamage / getMaxBallDurability(aStack);
 		}
 		else if (ItemUtils.isCatalyst(aStack)) {			
 			if (aStack.getTagCompound() == null || aStack.getTagCompound().hasNoTags()){
 				createCatalystNBT(aStack);
 	        }
 			double currentDamage = getCatalystDamage(aStack);
-			double durabilitypercent = currentDamage / 100;		
-	        return  durabilitypercent;
+			return currentDamage / getCatalystMaxDamage(aStack);
 		}
 		else {
 			return 1D;
@@ -208,10 +204,7 @@ public class ItemGenericChemBase extends Item {
 			aHasSpecialTooltips = true;
 		}
 		if (aHasSpecialTooltips) {			
-			if (aDam > aDamageSegment * 4){
-				durability = EnumChatFormatting.GRAY;
-			}
-			else if (aDam > aDamageSegment * 3){
+			if (aDam > aDamageSegment * 3){
 				durability = EnumChatFormatting.GREEN;
 			}
 			else if (aDam > aDamageSegment * 2){
@@ -220,7 +213,7 @@ public class ItemGenericChemBase extends Item {
 			else if (aDam > aDamageSegment){
 				durability = EnumChatFormatting.GOLD;
 			}
-			else if (aDam > 0){
+			else if (aDam >= 0){
 				durability = EnumChatFormatting.RED;
 			}
 			list.add(durability+""+(aDam)+EnumChatFormatting.GRAY+" / "+aMaxDamage);
@@ -322,6 +315,4 @@ public class ItemGenericChemBase extends Item {
 	public static int getMaxCatalystDurability(ItemStack aStack) {
 		return 50;
 	}
-	
-
 }
diff --git a/src/Java/gtPlusPlus/core/item/circuit/ItemAdvancedChip.java b/src/Java/gtPlusPlus/core/item/circuit/ItemAdvancedChip.java
index c375c32952..17321a0c45 100644
--- a/src/Java/gtPlusPlus/core/item/circuit/ItemAdvancedChip.java
+++ b/src/Java/gtPlusPlus/core/item/circuit/ItemAdvancedChip.java
@@ -1,22 +1,38 @@
 package gtPlusPlus.core.item.circuit;
 
-import java.util.List;
+import java.util.*;
+import java.util.function.BiFunction;
+import java.util.function.Predicate;
 
+import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.gui.GT_GUIDialogSelectItem;
+import gregtech.api.interfaces.INetworkUpdatableItem;
+import gregtech.api.net.GT_Packet_UpdateItem;
+import gregtech.api.objects.XSTR;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.*;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.Constants;
+import net.minecraftforge.common.util.FakePlayer;
+import org.apache.commons.lang3.tuple.Pair;
 
-public class ItemAdvancedChip extends Item {
-
+public class ItemAdvancedChip extends Item implements INetworkUpdatableItem {
+	private static final List<ItemStack> ALL_VARIANTS = new ArrayList<>();
 	protected IIcon base;
 	
 	public ItemAdvancedChip() {
@@ -26,6 +42,11 @@ public class ItemAdvancedChip extends Item {
 		this.setMaxDamage(0);
 		this.setUnlocalizedName("T3RecipeSelector");
 		GameRegistry.registerItem(this, this.getUnlocalizedName());
+		ALL_VARIANTS.add(new ItemStack(this, 0, 0));
+		for (int i = 1; i <= 24; i++) {
+			ItemStack aStack = new ItemStack(this, 0, i);
+			ALL_VARIANTS.add(aStack);
+		}
 	}
 	
 	@Override
@@ -52,6 +73,8 @@ public class ItemAdvancedChip extends Item {
 	public void addInformation(ItemStack aStack, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) {
 		try {
 			aList.add("Configuration == "+aStack.getItemDamage());
+			aList.add(GT_LanguageManager.addStringLocalization(new StringBuilder().append(getUnlocalizedName()).append(".tooltip.0").toString(), "Right click to reconfigure"));
+			aList.add(GT_LanguageManager.addStringLocalization(new StringBuilder().append(getUnlocalizedName()).append(".tooltip.1").toString(), "Needs a screwdriver or circuit programming tool"));
 		}
 		catch (Throwable t) {
 			t.printStackTrace();
@@ -133,6 +156,82 @@ public class ItemAdvancedChip extends Item {
     public String getUnlocalizedName(ItemStack stack) {
 		return super.getUnlocalizedName();
     }
-	
 
+	@Override
+	public boolean receive(ItemStack stack, EntityPlayerMP player, NBTTagCompound tag) {
+		int meta = tag.hasKey("meta", Constants.NBT.TAG_BYTE) ? tag.getByte("meta") : -1;
+		if (meta < 0 || meta > 24)
+			return true;
+
+		if (!player.capabilities.isCreativeMode) {
+			Pair<Integer, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> toolIndex = findConfiguratorInInv(player);
+			if (toolIndex == null) return true;
+
+			ItemStack[] mainInventory = player.inventory.mainInventory;
+			mainInventory[toolIndex.getKey()] = toolIndex.getValue().apply(mainInventory[toolIndex.getKey()], player);
+		}
+		stack.setItemDamage(meta);
+
+		return true;
+	}
+
+	@Override
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) {
+		// nothing on server side or fake player
+		if (player instanceof FakePlayer || !world.isRemote) return false;
+		// check if any screwdriver
+		ItemStack configuratorStack;
+		if (player.capabilities.isCreativeMode) {
+			configuratorStack = null;
+		} else {
+			Pair<Integer, ?> configurator = findConfiguratorInInv(player);
+			if (configurator == null) {
+				int count;
+				try {
+					count = Integer.parseInt(StatCollector.translateToLocal("GT5U.item.programmed_circuit.no_screwdriver.count"));
+				} catch (NumberFormatException e) {
+					player.addChatComponentMessage(new ChatComponentText("Error in translation GT5U.item.programmed_circuit.no_screwdriver.count: " + e.getMessage()));
+					count = 1;
+				}
+				player.addChatComponentMessage(new ChatComponentTranslation("GT5U.item.programmed_circuit.no_screwdriver." + XSTR.XSTR_INSTANCE.nextInt(count)));
+				return false;
+			}
+			configuratorStack = player.inventory.mainInventory[configurator.getKey()];
+		}
+		openSelectorGui(configuratorStack, stack.getItemDamage());
+		return true;
+	}
+
+	private void openSelectorGui(ItemStack configurator, int meta) {
+		FMLCommonHandler.instance().showGuiScreen(new GT_GUIDialogSelectItem(
+				StatCollector.translateToLocal("GT5U.item.programmed_circuit.select.header"),
+				configurator,
+				null,
+				ItemAdvancedChip::onConfigured,
+				ALL_VARIANTS,
+				meta,
+				true
+		));
+	}
+
+	private static void onConfigured(ItemStack stack) {
+		NBTTagCompound tag = new NBTTagCompound();
+		tag.setByte("meta", (byte) stack.getItemDamage());
+		GT_Values.NW.sendToServer(new GT_Packet_UpdateItem(tag));
+	}
+
+	private static Pair<Integer, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> findConfiguratorInInv(EntityPlayer player) {
+		ItemStack[] mainInventory = player.inventory.mainInventory;
+		for (int j = 0, mainInventoryLength = mainInventory.length; j < mainInventoryLength; j++) {
+			ItemStack toolStack = mainInventory[j];
+
+			if (!GT_Utility.isStackValid(toolStack))
+				continue;
+
+			for (Map.Entry<Predicate<ItemStack>, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> p : GregTech_API.sCircuitProgrammerList.entrySet())
+				if (p.getKey().test(toolStack))
+					return Pair.of(j, p.getValue());
+		}
+		return null;
+	}
 }
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 98301e41e8..7510f103a2 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -259,12 +259,59 @@ public class CORE {
 		public static boolean enableTreeFarmerParticles = true;
 		public static boolean useGregtechTextures = true;
 
-
-
-
-
-
-
+		//Pollution
+		public static int pollutionPerSecondMultiPackager = 40;
+		public static int pollutionPerSecondMultiIndustrialAlloySmelter = 300;
+		public static int pollutionPerSecondMultiIndustrialArcFurnace = 2400;
+		public static int pollutionPerSecondMultiIndustrialCentrifuge = 300;
+		public static int pollutionPerSecondMultiIndustrialCokeOven = 80;
+		public static int pollutionPerSecondMultiIndustrialCuttingMachine = 160;
+		public static int pollutionPerSecondMultiIndustrialDehydrator = 500;
+		public static int pollutionPerSecondMultiIndustrialElectrolyzer = 300;
+		public static int pollutionPerSecondMultiIndustrialExtruder = 1000;
+		public static int pollutionPerSecondMultiIndustrialMacerator = 400;
+		public static int pollutionPerSecondMultiIndustrialMixer = 800;
+		public static int pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal = 400;
+		public static int pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid = 400;
+		public static int pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc = 600;
+		public static int pollutionPerSecondMultiIndustrialPlatePress_ModeForming = 240;
+		public static int pollutionPerSecondMultiIndustrialPlatePress_ModeBending = 480;
+		public static int pollutionPerSecondMultiIndustrialSifter = 40;
+		public static int pollutionPerSecondMultiIndustrialThermalCentrifuge = 1000;
+		public static int pollutionPerSecondMultiIndustrialVacuumFreezer = 500;
+		public static int pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath = 400;
+		public static int pollutionPerSecondMultiIndustrialWashPlant_ModeWasher = 100;
+		public static int pollutionPerSecondMultiIndustrialWireMill = 100;
+		public static int pollutionPerSecondMultiIsaMill = 1280;
+		public static int pollutionPerSecondMultiAdvDistillationTower_ModeDistillery = 240;
+		public static int pollutionPerSecondMultiAdvDistillationTower_ModeDT = 480;
+		public static int pollutionPerSecondMultiAdvEBF = 500;
+		public static int pollutionPerSecondMultiAdvImplosion = 5000;
+		public static int pollutionPerSecondMultiABS = 200;
+		public static int pollutionPerSecondMultiCyclotron = 200;
+		public static int pollutionPerSecondMultiIndustrialFishingPond = 20;
+		public static int pollutionPerSecondMultiLargeRocketEngine;
+		public static int pollutionPerSecondMultiLargeSemiFluidGenerator = 1280;
+		public static int pollutionPerSecondMultiMassFabricator = 40;
+		public static int pollutionPerSecondMultiRefinery = 4000;
+		public static int pollutionPerSecondMultiGeneratorArray;
+		public static int pollutionPerSecondMultiTreeFarm = 100;
+		public static int pollutionPerSecondMultiFrothFlotationCell = 0;
+		public static int pollutionPerSecondMultiNuclearReactor_ModeBoosted = 160;
+		public static int pollutionPerSecondMultiNuclearReactor_ModeNormal = 80;
+		public static int pollutionPerSecondMultiAutoCrafter = 500;
+		public static int pollutionPerSecondMultiThermalBoiler = 700;
+		public static int pollutionPerSecondMultiAlgaePond = 0;
+		//pollution single blocks
+		public static int basePollutionPerSecondSemiFluidGenerator = 40;
+		public static double[] pollutionReleasedByTierSemiFluidGenerator = new double[]{0,2.0,4.0,8.0};
+		public static int basePollutionPerSecondBoiler = 35;
+		public static double[] pollutionReleasedByTierBoiler = new double[]{0,1.0,1.43, 1.86};
+		public static int baseMinPollutionPerSecondRocketFuelGenerator = 250;
+		public static int baseMaxPollutionPerSecondRocketFuelGenerator = 2000;
+		public static double[] pollutionReleasedByTierRocketFuelGenerator = new double[]{0,0,0,0,1,2,3};
+		public static int basePollutionPerSecondGeothermalGenerator = 100;
+		public static double[] pollutionReleasedByTierGeothermalGenerator = new double[]{0,0,0,0,1,1,1};
 
 	}
 
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 35d0a0ec07..0a1b762a97 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -529,12 +529,6 @@ public class CI {
 		return ItemUtils.getEmptyCell(i);
 	}
 
-
-
-	/*
-	 * 
-	 */
-
 	private static final Material[] aMaterial_Main = new Material[] {
 			ALLOY.POTIN,
 			ALLOY.TUMBAGA,				
@@ -684,11 +678,6 @@ public class CI {
 
 		Material m = null;
 
-
-
-
-
-
 		if (aPrefix == OrePrefixes.liquid) {
 			int aMatID = (aTier == 0 || aTier == 2 || aTier == 5 || aTier == 8 ? 0 : (aTier == 1 || aTier == 3 || aTier == 6 || aTier == 9 ? 1 : 2));
 			ItemStack aCell = aMaster[aMatID][aTier].getCell(aAmount);
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
index 8c1b6a4c02..ab067d21d8 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
@@ -6,6 +6,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.FMLCommonHandler;
 import gregtech.api.enums.Materials;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.*;
@@ -47,7 +48,7 @@ public static int mInvalidID = 1;
 			Logger.RECIPE(ReflectionUtils.getMethodName(7));
 			Logger.RECIPE(ReflectionUtils.getMethodName(8));
 			Logger.RECIPE(ReflectionUtils.getMethodName(9));
-			System.exit(1);
+			FMLCommonHandler.instance().exitJava(1, true);
 		}*/
 		
 		if (resultItem == null){
@@ -357,7 +358,7 @@ public static int mInvalidID = 1;
 			Logger.RECIPE(ReflectionUtils.getMethodName(7));
 			Logger.RECIPE(ReflectionUtils.getMethodName(8));
 			Logger.RECIPE(ReflectionUtils.getMethodName(9));
-			System.exit(1);
+			FMLCommonHandler.instance().exitJava(1, true);
 		}