Change composition of Ancient Granite & Lepersonnite to make obtaining Ytterbium possible.

Fix Recipe for Wood's Glass lens.

3 files changed, 30 insertions, 8 deletions

diff --git a/src/main/java/gtPlusPlus/core/material/ELEMENT.java b/src/main/java/gtPlusPlus/core/material/ELEMENT.java
index 54af01ef6e..01d3fd5330 100644
--- a/src/main/java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/main/java/gtPlusPlus/core/material/ELEMENT.java
@@ -236,13 +236,14 @@ public final class ELEMENT {
 				0,
 				false,
 				new MaterialStack[]{
-						new MaterialStack(getInstance().OXYGEN, 30),
-						new MaterialStack(getInstance().IRON, 20),
-						new MaterialStack(getInstance().SILICONDIOXIDE, 20),
-						new MaterialStack(getInstance().ALUMINIUMOXIDE, 10),
-						new MaterialStack(getInstance().POTASSIUM, 10),
-						new MaterialStack(getInstance().CALCIUM, 5),
-						new MaterialStack(getInstance().SODIUM, 5)
+						new MaterialStack(getInstance().OXYGEN, 16),
+						new MaterialStack(getInstance().IRON, 10),
+						new MaterialStack(getInstance().SILICONDIOXIDE, 10),
+						new MaterialStack(getInstance().ALUMINIUMOXIDE, 6),
+						new MaterialStack(getInstance().POTASSIUM, 6),
+						new MaterialStack(getInstance().CALCIUM, 4),
+						new MaterialStack(getInstance().SODIUM, 4),
+						new MaterialStack(getInstance().YTTERBIUM, 2)
 						});//Not a GT Inherited Material
 		
 		public static final Material RUNITE = new Material("Runite", MaterialState.SOLID, TextureSet.SET_FINE, new short[] {60, 200, 190}, 6750, 11550, 73, 87, true, "§", 0);//Not a GT Inherited Material
diff --git a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java
index 19e8499f02..2740f49d71 100644
--- a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -114,6 +114,26 @@ public final class MISC_MATERIALS {
 					new MaterialStack(ELEMENT.getInstance().CARBON, 1),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)
 			});
+	
+	public static final Material WOODS_GLASS = new Material(
+			"Wood's Glass", //Material Name
+			MaterialState.SOLID, //State
+			TextureSets.GEM_A.get(), //Texture Set
+			new short[] {220, 60, 255}, //Material Colour	
+			-1,
+			-1,
+			-1,
+			-1, 
+			false, 
+			"Si4Ba3Na2Ni",
+			0, 
+			false,
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().SILICON, 40),
+					new MaterialStack(ELEMENT.getInstance().BARIUM, 30),
+					new MaterialStack(ELEMENT.getInstance().SODIUM, 20),
+					new MaterialStack(ELEMENT.getInstance().NICKEL, 10),
+			});
 
 
 	/*
diff --git a/src/main/java/gtPlusPlus/core/material/ORES.java b/src/main/java/gtPlusPlus/core/material/ORES.java
index 0186c23a07..82757b2ee6 100644
--- a/src/main/java/gtPlusPlus/core/material/ORES.java
+++ b/src/main/java/gtPlusPlus/core/material/ORES.java
@@ -486,10 +486,11 @@ public final class ORES {
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 3),
 					new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2),
 					new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 2),
 					new MaterialStack(ELEMENT.getInstance().URANIUM235, 2),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN,32),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN,29),
 					new MaterialStack(ELEMENT.getInstance().HYDROGEN, 24)
 			});