+ Added some wires from custom materials.

+ Added a new Super Conductor Material for LuV power (HG-1223).
+ Added recipes for all custom material wires and cables.
$ Fixed an issue where materials with a bad RGB array would crash the game.

4 files changed, 60 insertions, 1 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index cfd8fae7b0..99998d588b 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -444,6 +444,10 @@ public final class ModItems {
 
 			//Leagrisium
 			MaterialGenerator.generate(ALLOY.LEAGRISIUM);
+			
+			//Super Conductor
+			MaterialGenerator.generate(ALLOY.HG1223, false);
+			
 
 			//Must be the final Alloy to Generate
 			MaterialGenerator.generate(ALLOY.QUANTUM);
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index 4ea723a164..7488a3e0ae 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -546,7 +546,22 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().CARBON, 1)
 			});
 
-
+	public static final Material HG1223 = new Material(
+			"HG-1223", //Material Name
+			MaterialState.LIQUID, //State
+			new short[]{39,85,159, 0}, //Material Colour
+			-1, //Melting Point in C
+			-1, //Boiling Point in C
+			-1,
+			-1,
+			false, //Uses Blast furnace?
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().MERCURY, 1),
+					new MaterialStack(ELEMENT.getInstance().BARIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().COPPER, 3),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 8)
+			});
 
 
 
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index 00388c4a5c..02045368c8 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -95,8 +95,10 @@ public class MaterialGenerator {
 					}
 				} else {
 					Item temp;
+					if (generateEverything == true){
 					Block tempBlock;
 					tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
+					}
 					temp = new BaseItemIngot(matInfo);
 					temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", materialTier, sRadiation);
 					temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", materialTier, sRadiation);
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index 1ce9a29877..3b2bafe9fb 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -572,6 +572,44 @@ public class Utils {
 		return output;
 
 	}
+	
+	public static int calculateVoltageTier(int Voltage){
+		int V;
+		if (Voltage == 8){
+			V = 0;
+		}
+		else if (Voltage == 32){
+			V = 1;
+		}
+		else if (Voltage == 128){
+			V = 2;
+		}
+		else if (Voltage == 512){
+			V = 3;
+		}
+		else if (Voltage == 2048){
+			V = 4;
+		}
+		else if (Voltage == 8196){
+			V = 5;
+		}
+		else if (Voltage == 32768){
+			V = 6;
+		}
+		else if (Voltage == 131072){
+			V = 7;
+		}
+		else if (Voltage == 524288){
+			V = 8;
+		}
+		else if (Voltage == Integer.MAX_VALUE){
+			V = 9;
+		}
+		else {
+			V = -1;
+		}
+		return V;
+	}
 
 	public static String[] parseVersion(final String version){
 		return parseVersion(version, "//.");