+ Added new processing chain for Rare Earth. 3 different processing chains can be used to obtain various resources. Closes #530.

% Adjusted some auto-generated recipe processing times for Ore materials.
% Adjusted some material components of a few Ore materials.
$ Added some placeholder names for unnamed blocks from other mods.

3 files changed, 101 insertions, 6 deletions

diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index bf6e0ef9e7..236af1b060 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -1,6 +1,8 @@
 package gtPlusPlus.core.material;
 
+import gregtech.api.enums.Materials;
 import gregtech.api.enums.TextureSet;
+import gtPlusPlus.core.client.CustomTextureSet.TextureSets;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
@@ -114,6 +116,79 @@ public final class MISC_MATERIALS {
 					new MaterialStack(ELEMENT.getInstance().CARBON, 1),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)
 			});
+	
+	
+	
+	
+	/*
+	 * Rare Earth Materials
+	 */
+	
+	public static final Material RARE_EARTH_LOW = new Material(
+			"Rare Earth (I)", //Material Name
+			MaterialState.ORE, //State
+			TextureSets.GEM_A.get(), //Texture Set
+			null, //Material Colour
+			1200,
+			2500,
+			-1,
+			-1,
+			-1, //Radiation
+			new MaterialStack[]{
+					new MaterialStack(ORES.GREENOCKITE, 1),
+					new MaterialStack(ORES.LANTHANITE_CE, 1),					
+					new MaterialStack(ORES.AGARDITE_CD, 1),					
+					new MaterialStack(ORES.XENOTIME, 1),
+					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.NetherQuartz), 1),
+					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 1),
+					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite), 1),
+					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Cobaltite), 1),
+					new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1)
+			});
+	
+	public static final Material RARE_EARTH_MID = new Material(
+			"Rare Earth (II)", //Material Name
+			MaterialState.ORE, //State
+			TextureSets.ENRICHED.get(), //Texture Set
+			null, //Material Colour
+			3500,
+			5000,
+			-1,
+			-1,
+			-1, //Radiation
+			new MaterialStack[]{
+					new MaterialStack(ORES.LANTHANITE_ND, 1),
+					new MaterialStack(ORES.AGARDITE_ND, 1),					
+					new MaterialStack(ORES.YTTRIAITE, 1),					
+					new MaterialStack(ORES.CROCROITE, 1),					
+					new MaterialStack(ORES.NICHROMITE, 1),					
+					new MaterialStack(ORES.ZIRCON, 1),
+					new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1),
+					new MaterialStack(ELEMENT.STANDALONE.WHITE_METAL, 1),
+					new MaterialStack(ELEMENT.STANDALONE.RUNITE, 1)			
+			});
+	
+	public static final Material RARE_EARTH_HIGH = new Material(
+			"Rare Earth (III)", //Material Name
+			MaterialState.ORE, //State
+			TextureSets.REFINED.get(), //Texture Set
+			null, //Material Colour
+			5200,
+			7500,
+			-1,
+			-1,
+			-1, //Radiation
+			new MaterialStack[]{
+					new MaterialStack(ORES.GADOLINITE_Y, 1),
+					new MaterialStack(ORES.LEPERSONNITE, 1),
+					new MaterialStack(ORES.FLORENCITE, 1),					
+					new MaterialStack(ORES.FLUORCAPHITE, 1),
+					new MaterialStack(ORES.LAUTARITE, 1),
+					new MaterialStack(ORES.DEMICHELEITE_BR, 1),					
+					new MaterialStack(ORES.ALBURNITE, 1),
+					new MaterialStack(ORES.KASHINITE, 1),
+					new MaterialStack(ORES.AGARDITE_LA, 1),
+			});
 
 
 
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 6e5cd0f8f0..5fca2fb2fe 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -94,8 +94,8 @@ public class Material {
 		this(materialName, defaultState, null, 0, rgba, j, k, l, m, false, "", radiationLevel, false, materialStacks);
 	}
 
-	public Material(String materialName, MaterialState defaultState, final TextureSet set, short[] rgba, int j, int k, int l, int m, int radiationLevel, MaterialStack[] materialStacks){
-		this(materialName, defaultState, set, 0, rgba, j, k, l, m, false, "", radiationLevel, false, materialStacks);
+	public Material(String materialName, MaterialState defaultState, final TextureSet set, short[] rgba, int meltingPoint, int boilingPoint, int protons, int neutrons, int radiationLevel, MaterialStack[] materialStacks){
+		this(materialName, defaultState, set, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, false, "", radiationLevel, false, materialStacks);
 	}
 	
 	public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final MaterialStack... inputs){
diff --git a/src/Java/gtPlusPlus/core/material/ORES.java b/src/Java/gtPlusPlus/core/material/ORES.java
index 0e1691a557..c2556b60f1 100644
--- a/src/Java/gtPlusPlus/core/material/ORES.java
+++ b/src/Java/gtPlusPlus/core/material/ORES.java
@@ -90,9 +90,10 @@ public final class ORES {
 			-1,
 			-1, //Radiation
 			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().LEAD, 1),
-					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 1),
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)
+					new MaterialStack(ELEMENT.getInstance().LEAD, 2),
+					new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
+					new MaterialStack(ELEMENT.getInstance().CAESIUM, 1),
 			});	
 
 	public static final Material NICHROMITE = new Material(
@@ -126,7 +127,10 @@ public final class ORES {
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), //Y not YT/YB
-					new MaterialStack(ELEMENT.getInstance().OXYGEN, 3)
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
+					new MaterialStack(ELEMENT.getInstance().IRON, 4),
+					new MaterialStack(ELEMENT.getInstance().TIN, 1),
+					new MaterialStack(ELEMENT.getInstance().NITROGEN, 2)
 			});	
 
 	//Samarskite_Y
@@ -260,6 +264,7 @@ public final class ORES {
 			-1, //Radiation
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)
 			});
@@ -794,6 +799,21 @@ public final class ORES {
 					new MaterialStack(ELEMENT.getInstance().SULFUR, 16),
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 15)
 			});
+
+	public static final Material GREENOCKITE = new Material(
+			"Greenockite", //Material Name
+			MaterialState.ORE, //State
+			TextureSets.GEM_A.get(), //Texture Set
+			new short[]{110, 193, 25, 0}, //Material Colour
+			-1,
+			-1,
+			-1,
+			-1,
+			-1, //Radiation
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().CADMIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().SULFUR, 2),
+			});
 	
 
 	public static final Material DEEP_EARTH_REACTOR_FUEL_DEPOSIT = new Material(