+ Added several new Materials and Alloys. (Nitinol 60, Adv. Nitinol, Hypogen, Titansteel, Arcanite, Octiron, Tungsten Titanium Carbide, Astral Titanium, Celestial Tungsten, Chronomatic Glass).

+ Added Carbon nanotubes, Carbyne and associated materials required to create them.
+ Added Hypervisor Matrix (Fusion), a core component for the MK4.
% Tweaked recipes for the MK4 Fusion Reactor and components, making it significantly harder.
$ Fixed some base elements not generating correctly due to inverted logic for detection.
$ Fixed rare chance for an invalid compressor recipe to generate.
$ Fixed Voltages and tiering of all materials, resolves many recipe issues within the EBF and ABS.
$ Fixed invalid compound tooltips on all ore materials.

2 files changed, 14 insertions, 12 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
index b3115bbab5..5a985c6151 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
@@ -19,6 +19,7 @@ import gtPlusPlus.core.material.nuclear.NUCLIDE;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import net.minecraftforge.fluids.FluidStack;
 
 public class RecipeGen_BlastSmelter extends RecipeGen_Base {
@@ -78,12 +79,8 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
 			else {
 				duration = (int) Math.max(M.getMass() / 50L, 1L) * 150;
 			}*/
-			
-			int aSlot = M.vTier - 2;
-			if (aSlot < 2) {
-				aSlot = 2;
-			}
-			long aVoltage = GT_Values.V[aSlot >= 2 ? aSlot : 2];
+						
+			long aVoltage = MaterialUtils.getVoltageForTier(M.vTier);
 			
 			
 			//Set a duration - NEW
@@ -94,10 +91,14 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
 			}
 
 			int mMaterialListSize=0;
+			
+			int mTotalPartsCounter = M.smallestStackSizeWhenProcessing;
+			
 			if (M.getComposites() != null){
 				for (final gtPlusPlus.core.material.MaterialStack ternkfsdf : M.getComposites()){
 					if (ternkfsdf != null) {
 						mMaterialListSize++;
+						//mTotalPartsCounter += ternkfsdf.getSmallestStackSizes()[0];
 					}
 				}
 			}
@@ -107,7 +108,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
 
 			if (duration <= 0){
 				final int second = 20;
-				duration = 14*second*mMaterialListSize;
+				duration = 14*second*mMaterialListSize*8;
 			}
 
 			Logger.WARNING("[BAS] Size: "+mMaterialListSize);
@@ -130,7 +131,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
 			//Generate Recipes for all singular materials that can be made molten.
 			if (hasMoreInputThanACircuit){
 				if (M.requiresBlastFurnace()) {
-					if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration, (int) aVoltage)){
+					if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, (duration/mTotalPartsCounter), (int) aVoltage)){
 						Logger.WARNING("[BAS] Success.");
 						Logger.WARNING("[BAS] Success, Also added a Fluid solidifier recipe.");
 						if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration, 120)){
@@ -152,7 +153,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
 				}
 			}
 			else {
-				if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration/2, (int) aVoltage)){
+				if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration/mTotalPartsCounter/2, (int) aVoltage)){
 					Logger.WARNING("[BAS] Success.");
 					if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), M.getFluid(144), M.getIngot(1), duration/2, 60)){
 						Logger.WARNING("[BAS] Success, Also added a Fluid solidifier recipe.");
@@ -207,7 +208,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
 							if (M.getComposites().get(irc) != null){
 								final int r = (int) M.vSmallestRatio[irc];
 								inputStackCount = inputStackCount+r;
-								if ((M.getComposites().get(irc).getStackMaterial().getState() != MaterialState.SOLID) && ((M.getComposites().get(irc).getDustStack(r) == null) || (M.getComposites().get(irc).getDustStack(r) == ItemUtils.getSimpleStack(ModItems.AAA_Broken)))){
+								if ((M.getComposites().get(irc).getStackMaterial().getState() != MaterialState.SOLID) || ((M.getComposites().get(irc).getDustStack(r) == null) || (M.getComposites().get(irc).getDustStack(r) == ItemUtils.getSimpleStack(ModItems.AAA_Broken)))){
 									final int xr = r;
 									if ((xr > 0) && (xr <= 100)){
 										final int mathmatics = (r*1000);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index d4051ff8bf..ebf5aecd99 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -20,6 +20,7 @@ import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -416,11 +417,11 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 			if (aMatInfo.vTier <= 4){
 				timeTaken = 25*aMatInfo.vTier*10;
 			}
-			int aSlot = aMatInfo.vTier - 1;
+			int aSlot = aMatInfo.vTier;
 			if (aSlot < 2) {
 				aSlot = 2;
 			}
-			long aVoltage = GT_Values.V[aSlot >= 2 ? aSlot : 2];
+			long aVoltage = MaterialUtils.getVoltageForTier(aSlot);
 
 			return GT_Values.RA.addBlastRecipe(
 					input1,