+ 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, 23 insertions, 6 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index b77abe1ef1..04470b3554 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -385,19 +385,19 @@ public final class ModItems {
 			 * Try generate dusts for missing rare earth materials if they don't exist
 			 */
 
-			if (ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGadolinium", 1))){
+			if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGadolinium", 1))){
 				ItemUtils.generateSpecialUseDusts("Gadolinium", "Gadolinium", Materials.Gadolinium.mElement.name(), Utils.rgbtoHexValue(226, 172, 9));
 			}
-			if (ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustYtterbium", 1))){
+			if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustYtterbium", 1))){
 				ItemUtils.generateSpecialUseDusts("Ytterbium", "Ytterbium", Materials.Ytterbium.mElement.name(), Utils.rgbtoHexValue(Materials.Yttrium.mRGBa[0]-60, Materials.Yttrium.mRGBa[1]-60, Materials.Yttrium.mRGBa[2]-60));
 			}
-			if (ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustSamarium", 1))){
+			if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustSamarium", 1))){
 				ItemUtils.generateSpecialUseDusts("Samarium", "Samarium", Materials.Samarium.mElement.name(), Utils.rgbtoHexValue(161, 168, 114));
 			}
-			if (ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLanthanum", 1))){
+			if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLanthanum", 1))){
 				ItemUtils.generateSpecialUseDusts("Lanthanum", "Lanthanum", Materials.Lanthanum.mElement.name(), Utils.rgbtoHexValue(106, 127, 163));
 			}
-			if (ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGermanium", 1))){
+			if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGermanium", 1))){
 		    	ItemUtils.generateSpecialUseDusts("Germanium", "Germanium", "Ge", ELEMENT.getInstance().GERMANIUM.getRgbAsHex());
 			}
 
@@ -461,6 +461,14 @@ public final class ModItems {
 			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().STRONTIUM90, false);
 			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM210, false);
 			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().AMERICIUM241, false);
+			
+			
+			//Custom Materials that will have standalone refinery processes
+			MaterialGenerator.generate(ELEMENT.STANDALONE.ADVANCED_NITINOL, false);
+			MaterialGenerator.generate(ELEMENT.STANDALONE.ASTRAL_TITANIUM);
+			MaterialGenerator.generate(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN);
+			MaterialGenerator.generate(ELEMENT.STANDALONE.HYPOGEN);
+			MaterialGenerator.generate(ELEMENT.STANDALONE.CHRONOMATIC_GLASS);
 
 
 			//Carbides - Tungsten Carbide exists in .09 so don't generate it. - Should still come before alloys though
@@ -471,6 +479,7 @@ public final class ModItems {
 			MaterialGenerator.generate(ALLOY.ZIRCONIUM_CARBIDE);
 			MaterialGenerator.generate(ALLOY.TANTALUM_CARBIDE);
 			MaterialGenerator.generate(ALLOY.NIOBIUM_CARBIDE);
+			MaterialGenerator.generate(ALLOY.TUNGSTEN_TITANIUM_CARBIDE);
 
 			//LFTR Fuel components
 			MaterialGenerator.generate(FLUORIDES.HYDROXIDE); //LFTR fuel component
@@ -528,6 +537,8 @@ public final class ModItems {
 			MaterialGenerator.generate(ALLOY.MARAGING300);
 			MaterialGenerator.generate(ALLOY.MARAGING350);
 
+			MaterialGenerator.generate(ALLOY.NITINOL_60);
+
 			//Composite Alloys
 			MaterialGenerator.generate(ALLOY.STELLITE);
 			MaterialGenerator.generate(ALLOY.TALONITE);
@@ -565,6 +576,11 @@ public final class ModItems {
 			MaterialGenerator.generate(ALLOY.PIKYONIUM);
 			MaterialGenerator.generate(ALLOY.ABYSSAL);
 			
+
+			MaterialGenerator.generate(ALLOY.TITANSTEEL, false);
+			MaterialGenerator.generate(ALLOY.ARCANITE);
+			MaterialGenerator.generate(ALLOY.OCTIRON);			
+			
 			//Must be the final Alloy to Generate
 			MaterialGenerator.generate(ALLOY.QUANTUM);
 
diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
index 78013e9c70..5f0254bc51 100644
--- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
@@ -6,6 +6,7 @@ import gregtech.api.util.GT_ModHandler;
 
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class BaseItemIngot extends BaseItemComponent{
 
@@ -28,7 +29,7 @@ public class BaseItemIngot extends BaseItemComponent{
 	private void generateCompressorRecipe(){
 		final ItemStack tempStack = componentMaterial.getIngot(9);
 		final ItemStack tempOutput = componentMaterial.getBlock(1);
-		if (tempStack != null && tempOutput != null){
+		if (ItemUtils.checkForInvalidItems(new ItemStack[] {tempStack, tempOutput})){
 			GT_ModHandler.addCompressionRecipe(tempStack, tempOutput);
 		}
 	}