+ 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.

7 files changed, 93 insertions, 65 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index 59426aae36..8159519016 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -90,18 +90,18 @@ public interface IGregtech_RecipeAdder {
 	 * @return true if the Recipe got added, otherwise false.
 	 */
 	public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aOutput, int aChance, int aDuration, int aEUt);
-	
-	
+
+
 	public boolean addLFTRRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt);
 	public boolean addLFTRRecipe(ItemStack aInput1, FluidStack aInput2, ItemStack aOutput1, FluidStack aOutput2, int aDuration, int aEUt);
-    public boolean addLFTRRecipe(FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, int aDuration, int aEUt);
-    
-
-    public boolean addFissionFuel(
-    		FluidStack aInput1, FluidStack aInput2, FluidStack aInput3,
-    		FluidStack aInput4, FluidStack aInput5, FluidStack aInput6,
-    		FluidStack aInput7, FluidStack aInput8, FluidStack aInput9,
-    		FluidStack aOutput1, FluidStack aOutput2,
-    		int aDuration, int aEUt);
+	public boolean addLFTRRecipe(FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, int aDuration, int aEUt);
+
+
+	public boolean addFissionFuel(
+			FluidStack aInput1, FluidStack aInput2, FluidStack aInput3,
+			FluidStack aInput4, FluidStack aInput5, FluidStack aInput6,
+			FluidStack aInput7, FluidStack aInput8, FluidStack aInput9,
+			FluidStack aOutput1, FluidStack aOutput2,
+			int aDuration, int aEUt);
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java
index 8e1715caf5..b6c36483af 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java
@@ -4,18 +4,18 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 
 public interface Interface_IconContainer {
-    /**
-     * @return A regular Icon.
-     */
-    public IIcon getIcon();
+	/**
+	 * @return A regular Icon.
+	 */
+	public IIcon getIcon();
 
-    /**
-     * @return Icon of the Overlay (or null if there is no Icon)
-     */
-    public IIcon getOverlayIcon();
+	/**
+	 * @return Icon of the Overlay (or null if there is no Icon)
+	 */
+	public IIcon getOverlayIcon();
 
-    /**
-     * @return the Default Texture File for this Icon.
-     */
-    public ResourceLocation getTextureFile();
+	/**
+	 * @return the Default Texture File for this Icon.
+	 */
+	public ResourceLocation getTextureFile();
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
index 03f7b1bd1e..def74a30c5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
@@ -1,10 +1,9 @@
 package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
 
-import gregtech.api.enums.SubTag;
-import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_Base;
-
 import java.util.List;
 
+import gregtech.api.enums.SubTag;
+import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_Base;
 import net.minecraft.dispenser.IBlockSource;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -15,27 +14,27 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 public interface Interface_ItemBehaviour<E extends Item> {
-    public boolean onLeftClickEntity(E aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity);
+	public boolean onLeftClickEntity(E aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity);
 
-    public boolean onItemUse(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ);
+	public boolean onItemUse(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ);
 
-    public boolean onItemUseFirst(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ);
+	public boolean onItemUseFirst(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ);
 
-    public ItemStack onItemRightClick(E aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer);
+	public ItemStack onItemRightClick(E aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer);
 
-    public List<String> getAdditionalToolTips(E aItem, List<String> aList, ItemStack aStack);
+	public List<String> getAdditionalToolTips(E aItem, List<String> aList, ItemStack aStack);
 
-    public void onUpdate(E aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand);
+	public void onUpdate(E aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand);
 
-    public boolean isItemStackUsable(E aItem, ItemStack aStack);
+	public boolean isItemStackUsable(E aItem, ItemStack aStack);
 
-    public boolean canDispense(E aItem, IBlockSource aSource, ItemStack aStack);
+	public boolean canDispense(E aItem, IBlockSource aSource, ItemStack aStack);
 
-    public ItemStack onDispense(E aItem, IBlockSource aSource, ItemStack aStack);
+	public ItemStack onDispense(E aItem, IBlockSource aSource, ItemStack aStack);
 
-    public boolean hasProjectile(Gregtech_MetaItem_Base aItem, SubTag aProjectileType, ItemStack aStack);
+	public boolean hasProjectile(Gregtech_MetaItem_Base aItem, SubTag aProjectileType, ItemStack aStack);
 
-    public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, double aZ);
+	public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, double aZ);
 
-    public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, float aSpeed);
+	public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, float aSpeed);
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
index d4e37ee476..0aa93e9f21 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
@@ -6,14 +6,14 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.item.ItemStack;
 
 public interface Interface_OreRecipeRegistrator {
-    /**
-     * Contains a Code Fragment, used in the OrePrefix to register Recipes. Better than using a switch/case, like I did before.
-     *
-     * @param aPrefix   always != null
-     * @param aMaterial always != null, and can be == _NULL if the Prefix is Self Referencing or not Material based!
-     * @param aStack    always != null
-     */
-    public void registerOre(GregtechOrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack);
+	/**
+	 * Contains a Code Fragment, used in the OrePrefix to register Recipes. Better than using a switch/case, like I did before.
+	 *
+	 * @param aPrefix   always != null
+	 * @param aMaterial always != null, and can be == _NULL if the Prefix is Self Referencing or not Material based!
+	 * @param aStack    always != null
+	 */
+	public void registerOre(GregtechOrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack);
 
 	public void registerOre(GregtechOrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack copyAmount);
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
index ed276ad3f9..9fd2ca580c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java
@@ -5,12 +5,12 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.item.ItemStack;
 
 public interface Interface_OreRecipeRegistrator_GT {
-    /**
-     * Contains a Code Fragment, used in the OrePrefix to register Recipes. Better than using a switch/case, like I did before.
-     *
-     * @param aPrefix   always != null
-     * @param aMaterial always != null, and can be == _NULL if the Prefix is Self Referencing or not Material based!
-     * @param aStack    always != null
-     */
-    public void registerOre(OrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack);
+	/**
+	 * Contains a Code Fragment, used in the OrePrefix to register Recipes. Better than using a switch/case, like I did before.
+	 *
+	 * @param aPrefix   always != null
+	 * @param aMaterial always != null, and can be == _NULL if the Prefix is Self Referencing or not Material based!
+	 * @param aStack    always != null
+	 */
+	public void registerOre(OrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack);
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java
index 76c5113186..74c996d116 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java
@@ -4,17 +4,17 @@ import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 
 public interface Interface_Texture {
-    public void renderXPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
+	public void renderXPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
 
-    public void renderXNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
+	public void renderXNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
 
-    public void renderYPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
+	public void renderYPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
 
-    public void renderYNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
+	public void renderYNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
 
-    public void renderZPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
+	public void renderZPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
 
-    public void renderZNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
+	public void renderZNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ);
 
-    public boolean isValidTexture();
+	public boolean isValidTexture();
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
index 26b8dc1d3d..fa5ff66310 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
@@ -1,12 +1,11 @@
 package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
 
+import java.util.List;
+
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.IToolStats;
 import gregtech.api.items.GT_MetaGenerated_Tool;
 import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
-
-import java.util.List;
-
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.Entity;
@@ -25,6 +24,7 @@ public interface Interface_ToolStats extends IToolStats{
 	/**
 	 * Called when aPlayer crafts this Tool
 	 */
+	@Override
 	public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer);
 
 	/**
@@ -35,70 +35,88 @@ public interface Interface_ToolStats extends IToolStats{
 	/**
 	 * @return Damage the Tool receives when breaking a Block. 100 is one Damage Point (or 100 EU).
 	 */
+	@Override
 	public int getToolDamagePerBlockBreak();
 
 	/**
 	 * @return Damage the Tool receives when converting the drops of a Block. 100 is one Damage Point (or 100 EU).
 	 */
+	@Override
 	public int getToolDamagePerDropConversion();
 
 	/**
 	 * @return Damage the Tool receives when being used as Container Item. 100 is one use, however it is usually 8 times more than normal.
 	 */
+	@Override
 	public int getToolDamagePerContainerCraft();
 
 	/**
 	 * @return Damage the Tool receives when being used as Weapon, 200 is the normal Value, 100 for actual Weapons.
 	 */
+	@Override
 	public int getToolDamagePerEntityAttack();
 
 	/**
 	 * @return Basic Quality of the Tool, 0 is normal. If increased, it will increase the general quality of all Tools of this Type. Decreasing is also possible.
 	 */
+	@Override
 	public int getBaseQuality();
 
 	/**
 	 * @return The Damage Bonus for this Type of Tool against Mobs. 1.0F is normal punch.
 	 */
+	@Override
 	public float getBaseDamage();
 
 	/**
 	 * @return This gets the Hurt Resistance time for Entities getting hit. (always does 1 as minimum)
 	 */
+	@Override
 	public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity);
 
 	/**
 	 * @return This is a multiplier for the Tool Speed. 1.0F = no special Speed.
 	 */
+	@Override
 	public float getSpeedMultiplier();
 
 	/**
 	 * @return This is a multiplier for the Tool Speed. 1.0F = no special Durability.
 	 */
+	@Override
 	public float getMaxDurabilityMultiplier();
 
+	@Override
 	public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity);
 
+	@Override
 	public String getMiningSound();
 
+	@Override
 	public String getCraftingSound();
 
+	@Override
 	public String getEntityHitSound();
 
+	@Override
 	public String getBreakingSound();
 
+	@Override
 	public Enchantment[] getEnchantments(ItemStack aStack);
 
+	@Override
 	public int[] getEnchantmentLevels(ItemStack aStack);
 
 	/**
 	 * @return If this Tool can be used for blocking Damage like a Sword.
 	 */
+	@Override
 	public boolean canBlock();
 
 	/**
 	 * @return If this Tool can be used as an RC Crowbar.
 	 */
+	@Override
 	public boolean isCrowbar();
 
 	/**
@@ -109,16 +127,19 @@ public interface Interface_ToolStats extends IToolStats{
 	/**
 	 * @return If this Tool can be used as Weapon i.e. if that is the main purpose.
 	 */
+	@Override
 	public boolean isWeapon();
 
 	/**
 	 * @return If this Tool is a Ranged Weapon. Return false at isWeapon unless you have a Blade attached to your Bow/Gun or something
 	 */
+	@Override
 	public boolean isRangedWeapon();
 
 	/**
 	 * @return If this Tool can be used as Weapon i.e. if that is the main purpose.
 	 */
+	@Override
 	public boolean isMiningTool();
 
 	/**
@@ -127,6 +148,7 @@ public interface Interface_ToolStats extends IToolStats{
 	 *
 	 * @return If this is a minable Block. Tool Quality checks (like Diamond Tier or something) are separate from this check.
 	 */
+	@Override
 	public boolean isMinableBlock(Block aBlock, byte aMetaData);
 
 	/**
@@ -134,29 +156,36 @@ public interface Interface_ToolStats extends IToolStats{
 	 *
 	 * @return the Amount of modified Items.
 	 */
+	@Override
 	public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent);
 
 	/**
 	 * @return Returns a broken Version of the Item.
 	 */
+	@Override
 	public ItemStack getBrokenItem(ItemStack aStack);
 
 	/**
 	 * @return the Damage actually done to the Mob.
 	 */
+	@Override
 	public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer);
 
 	/**
 	 * @return the Damage actually done to the Mob.
 	 */
+	@Override
 	public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer);
 
+	@Override
 	public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack);
 
+	@Override
 	public short[] getRGBa(boolean aIsToolHead, ItemStack aStack);
-	
+
 	/**
 	 * Called when this gets added to a Tool Item
 	 */
+	@Override
 	public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID);
 }
\ No newline at end of file