+ New texture for the slow builders ring.

+ Added the Alkalus Disk.
$ Fixed Frame Box Assembler Recipes.
$ Fixed Missing 7Li material.
$ Fixed Tiered Tanks not showing their capacity in the tooltip.
$ Fixed tooltips for alloys containing Bronze or Steel.
$ Fixed Clay Pipe Extruder Recipes.
- Removed a handful of Plasma cells for misc. materials.
% Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements.
% Cleaned up The Entire Project.

2 files changed, 48 insertions, 50 deletions

diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 2f7352c257..6faf131acb 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.lib;
 
+import java.util.*;
+
 import gregtech.api.GregTech_API;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.gregtech.recipehandlers.GregtechRecipe;
@@ -9,28 +11,25 @@ import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
 import gtPlusPlus.xmod.gregtech.api.objects.XSTR;
 import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator;
-
-import java.util.*;
-
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.config.Configuration;
 
 public class CORE {
-	
+
 	protected CORE(){
 		//import cpw.mods.fml.common.Optional;
 	}
-	
+
 	//Math Related
 	public static final float PI = (float) Math.PI;
 	public static volatile Random RANDOM = new XSTR();
 
-	public static final String name = "GT++";	
+	public static final String name = "GT++";
 	public static final String MODID = "miscutils";
 	public static final String VERSION = "1.4.9.70-alpha";
 	public static final String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
 	public static boolean isModUpToDate = Utils.isModUpToDate();
-	public static boolean DEBUG = false;	
+	public static boolean DEBUG = false;
 	public static final boolean LOAD_ALL_CONTENT = false;
 	public static final int GREG_FIRST_ID = 760;
 	public static Map PlayerCache;
@@ -41,25 +40,25 @@ public class CORE {
 	@Deprecated
 	public static IGregtech_RecipeAdder sRecipeAdder;
 	public static GregtechRecipe GT_Recipe = new GregtechRecipe();
-	
-	public static Configuration Config;	
+
+	public static Configuration Config;
 	public static final String GT_Tooltip = "Added by: " + EnumChatFormatting.DARK_GREEN+"Alkalus "+EnumChatFormatting.GRAY+"- "+EnumChatFormatting.RED+"[GT++]";
 	public static final String GT_Tooltip_Radioactive = EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection.";
 	public static final String noItem = "";
-	
+
 	//Because I want to be lazy.
 	public static boolean GTNH = false;
-	
+
 	/**
 	 * A List containing all the Materials, which are somehow in use by GT and therefor receive a specific Set of Items.
 	 */
 	public static final GT_Materials[] sMU_GeneratedMaterials = new GT_Materials[1000];
-	
+
 	//Tesseract map
-	public static final Map<Integer, GT_MetaTileEntity_TesseractGenerator> sTesseractGenerators = new HashMap<Integer, GT_MetaTileEntity_TesseractGenerator>();
+	public static final Map<Integer, GT_MetaTileEntity_TesseractGenerator> sTesseractGenerators = new HashMap<>();
 
 	//GUIS
-	public enum GUI_ENUM 
+	public enum GUI_ENUM
 	{
 		ENERGYBUFFER, TOOLBUILDER, NULL, NULL1, NULL2
 	}
@@ -68,17 +67,17 @@ public class CORE {
 	 * File Paths and Resource Paths
 	 */
 	public static final String
-	TEX_DIR = "textures/", 
-	TEX_DIR_GUI = TEX_DIR + "gui/", 
-	TEX_DIR_ITEM = TEX_DIR + "items/", 
+	TEX_DIR = "textures/",
+	TEX_DIR_GUI = TEX_DIR + "gui/",
+	TEX_DIR_ITEM = TEX_DIR + "items/",
 	TEX_DIR_BLOCK = TEX_DIR + "blocks/",
-	TEX_DIR_ENTITY = TEX_DIR + "entity/", 
-	TEX_DIR_ASPECTS = TEX_DIR + "aspects/", 
+	TEX_DIR_ENTITY = TEX_DIR + "entity/",
+	TEX_DIR_ASPECTS = TEX_DIR + "aspects/",
 	TEX_DIR_FLUIDS = TEX_DIR_BLOCK + "fluids/",
-	RES_PATH = MODID + ":" + TEX_DIR, 
-	RES_PATH_GUI = MODID + ":" + TEX_DIR_GUI, 
-	RES_PATH_ITEM = MODID + ":" + TEX_DIR_ITEM, 
-	RES_PATH_BLOCK = MODID + ":" + TEX_DIR_BLOCK, 
+	RES_PATH = MODID + ":" + TEX_DIR,
+	RES_PATH_GUI = MODID + ":" + TEX_DIR_GUI,
+	RES_PATH_ITEM = MODID + ":" + TEX_DIR_ITEM,
+	RES_PATH_BLOCK = MODID + ":" + TEX_DIR_BLOCK,
 	RES_PATH_ENTITY = MODID + ":" + TEX_DIR_ENTITY,
 	RES_PATH_ASPECTS = MODID + ":" + TEX_DIR_ASPECTS,
 	RES_PATH_FLUIDS = MODID + ":" + TEX_DIR_FLUIDS;
@@ -92,24 +91,24 @@ public class CORE {
 		//Debug
 		public static boolean disableEnderIOIntegration = false;
 		public static boolean MACHINE_INFO = true;
-		
+
 		//Tools
 		public static boolean enableSkookumChoochers = true;
 		public static boolean enableMultiSizeTools = true;
-		
+
 		//Block Drops
 		public static int chanceToDropDrainedShard = 196;
 		public static int chanceToDropFluoriteOre = 32;
-		
+
 		//Machine Related
 		public static boolean enableAlternativeBatteryAlloy = false;
 		public static boolean enableThaumcraftShardUnification = false;
-		public static boolean disableIC2Recipes = false;	
+		public static boolean disableIC2Recipes = false;
 		public static boolean enableAlternativeDivisionSigilRecipe = false;
-		
+
 		//Feature Related
 		public static boolean enableCustomAlvearyBlocks = false;
-		
+
 		//Single Block Machines
 		public static boolean enableMachine_SolarGenerators = false;
 		public static boolean enableMachine_Safes = true;
@@ -120,7 +119,7 @@ public class CORE {
 		public static boolean enableMachine_GeothermalEngines = true;
 		public static boolean enableCustom_Pipes = true;
 		public static boolean enableCustom_Cables = true;
-		
+
 		//Multiblocks
 		public static boolean enableMultiblock_AlloyBlastSmelter = true;
 		public static boolean enableMultiblock_IndustrialCentrifuge = true;
@@ -136,11 +135,11 @@ public class CORE {
 		public static boolean enableMultiblock_LiquidFluorideThoriumReactor = true;
 		public static boolean enableMultiblock_NuclearFuelRefinery = true;
 		public static boolean enableMultiblock_TreeFarmer = true;
-		
+
 		//Visuals
 		public static boolean enableTreeFarmerParticles = true;
 		public static boolean useGregtechTextures = true;
-		
+
 	}
-	
+
 }
diff --git a/src/Java/gtPlusPlus/core/lib/LoadedMods.java b/src/Java/gtPlusPlus/core/lib/LoadedMods.java
index 8d606f2c1a..055350b997 100644
--- a/src/Java/gtPlusPlus/core/lib/LoadedMods.java
+++ b/src/Java/gtPlusPlus/core/lib/LoadedMods.java
@@ -1,17 +1,16 @@
 package gtPlusPlus.core.lib;
 
+import static gtPlusPlus.core.lib.CORE.GTNH;
+
+import cpw.mods.fml.common.Loader;
 import gtPlusPlus.core.lib.CORE.configSwitches;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechTextures;
 import gtPlusPlus.xmod.gregtech.recipes.GregtechRecipeAdder;
 
-import static gtPlusPlus.core.lib.CORE.GTNH;
-
-import cpw.mods.fml.common.Loader;
-
 public class LoadedMods {
 
-	
+
 	//Initialize Variables
 	public static boolean Gregtech = false;
 	public static boolean PlayerAPI = false;
@@ -42,9 +41,9 @@ public class LoadedMods {
 	public static boolean OpenComputers = false; //OpenComputers
 	public static boolean Computronics = false; //computronics
 	public static boolean DreamCraft = false; //GT: New Horizons
-	
 
-	
+
+
 	private static int totalMods;
 	@SuppressWarnings("deprecation")
 	public static void checkLoaded(){
@@ -59,11 +58,11 @@ public class LoadedMods {
 					GregtechTextures.BlockIcons.VOID.name();
 					GregtechTextures.ItemIcons.VOID.name();
 					Utils.LOG_INFO("Created Gregtech texture handler.");
-				} catch (NullPointerException e){
+				} catch (final NullPointerException e){
 					Utils.LOG_INFO("Could NOT create a Gregtech recipe handler.");
 				}
 			}
-			
+
 			totalMods++;
 		}
 		//
@@ -75,7 +74,7 @@ public class LoadedMods {
 			Utils.LOG_INFO("Components enabled for: GT: New Horizons");
 			totalMods++;
 		}
-		
+
 		if (Loader.isModLoaded("PlayerAPI") == true){
 			PlayerAPI = true;
 			Utils.LOG_INFO("Components enabled for: PlayerAPI");
@@ -86,7 +85,7 @@ public class LoadedMods {
 			Utils.LOG_INFO("Components enabled for: BuildCraft");
 			totalMods++;
 		}
-		if (Loader.isModLoaded("EnderIO") == true && !configSwitches.disableEnderIOIntegration){
+		if ((Loader.isModLoaded("EnderIO") == true) && !configSwitches.disableEnderIOIntegration){
 			EnderIO = true;
 			Utils.LOG_INFO("Components enabled for: EnderIO");
 			totalMods++;
@@ -203,7 +202,7 @@ public class LoadedMods {
 			IHL  = true;
 			Utils.LOG_INFO("Components enabled for: IHL");
 			totalMods++;
-		} 
+		}
 		if (Loader.isModLoaded("Baubles") == true){
 			Baubles  = true;
 			Utils.LOG_INFO("Components enabled for: Baubles");
@@ -219,14 +218,14 @@ public class LoadedMods {
 			Utils.LOG_INFO("Components enabled for: Computronics");
 			totalMods++;
 		}
-	
+
 		Utils.LOG_INFO("Content found for "+totalMods+" mods");
-		
+
 	}
-	
-	public static String getModVersion(String modName){
+
+	public static String getModVersion(final String modName){
 		final String ver = cpw.mods.fml.common.FMLCommonHandler.instance().findContainerFor(modName).getVersion();
 		return ver;
 	}
-	
+
 }