aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-08-24 18:36:58 +0100
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-08-24 18:36:58 +0100
commit7403427bbb0026962665c2f46d4108ae5777814d (patch)
tree44534214b7514605acffa8f86301e60d5b0431a9 /src
parentd0dd650d08c842205a6541bde0e457ff58367590 (diff)
downloadGT5-Unofficial-7403427bbb0026962665c2f46d4108ae5777814d.tar.gz
GT5-Unofficial-7403427bbb0026962665c2f46d4108ae5777814d.tar.bz2
GT5-Unofficial-7403427bbb0026962665c2f46d4108ae5777814d.zip
+ 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.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java75
-rw-r--r--src/Java/gtPlusPlus/core/material/Material.java4
-rw-r--r--src/Java/gtPlusPlus/core/material/ORES.java28
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java22
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java104
-rw-r--r--src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java1
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java7
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java19
-rw-r--r--src/resources/assets/miscutils/lang/en_US.lang58
9 files changed, 281 insertions, 37 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(
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 7a69cb44f5..a481ff17bf 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -17,7 +17,6 @@ import gregtech.api.util.GT_Utility;
import gregtech.api.util.HotFuel;
import gregtech.api.util.ThermalFuel;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.chemistry.GenericChem;
@@ -30,8 +29,6 @@ import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.material.MISC_MATERIALS;
-import gtPlusPlus.core.material.MaterialStack;
-import gtPlusPlus.core.material.NONMATERIAL;
import gtPlusPlus.core.material.ORES;
import gtPlusPlus.core.material.Particle;
import gtPlusPlus.core.material.nuclear.FLUORIDES;
@@ -102,6 +99,7 @@ public class RECIPES_GREGTECH {
* Special Recipe handlers
*/
RECIPES_SeleniumProcessing.init();
+ RECIPES_RareEarthProcessing.init();
@@ -2286,24 +2284,6 @@ public class RECIPES_GREGTECH {
private static void sifterRecipes() {
- // Rare Earth Processing
- GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustRareEarth", 1),
- new ItemStack[] {
- ELEMENT.getInstance().YTTRIUM.getSmallDust(1),
- ELEMENT.getInstance().NEODYMIUM.getSmallDust(1),
- ELEMENT.getInstance().LANTHANUM.getSmallDust(1),
- ELEMENT.getInstance().CERIUM.getSmallDust(1),
- ELEMENT.getInstance().CADMIUM.getSmallDust(1),
- ELEMENT.getInstance().CAESIUM.getSmallDust(1),
- ORES.SAMARSKITE_YB.getSmallDust(1),
- ORES.FLORENCITE.getSmallDust(1),
- ORES.FLUORCAPHITE.getSmallDust(1),
- //ELEMENT.getInstance().YTTERBIUM.getTinyDust(1),
- //ELEMENT.getInstance().SAMARIUM.getTinyDust(1),
- //ELEMENT.getInstance().GADOLINIUM.getTinyDust(1)
- },
- new int[] { 2000, 2000, 2000, 2000, 2000, 2000, 2000, 2000, 2000 }, 20 * 30, 500);
-
// Zirconium
GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedIlmenite", 1),
new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1),
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
new file mode 100644
index 0000000000..f8059f8217
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
@@ -0,0 +1,104 @@
+package gtPlusPlus.core.recipe;
+
+import static gtPlusPlus.core.material.MISC_MATERIALS.RARE_EARTH_HIGH;
+import static gtPlusPlus.core.material.MISC_MATERIALS.RARE_EARTH_LOW;
+import static gtPlusPlus.core.material.MISC_MATERIALS.RARE_EARTH_MID;
+
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.material.MaterialGenerator;
+import gtPlusPlus.core.material.ORES;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+
+public class RECIPES_RareEarthProcessing {
+
+ public static void init() {
+
+ // Set Material Tiers correctly
+ ORES.GREENOCKITE.vTier = 1;
+ RARE_EARTH_LOW.vTier = 1;
+ RARE_EARTH_MID.vTier = 3;
+ RARE_EARTH_HIGH.vTier = 5;
+
+ // Set Material Voltages correctly
+ ORES.GREENOCKITE.vVoltageMultiplier = 30;
+ RARE_EARTH_LOW.vVoltageMultiplier = 30;
+ RARE_EARTH_MID.vVoltageMultiplier = 480;
+ RARE_EARTH_HIGH.vVoltageMultiplier = 7680;
+
+ // Generate Ore Materials
+ MaterialGenerator.generateOreMaterial(RARE_EARTH_LOW);
+ MaterialGenerator.generateOreMaterial(RARE_EARTH_MID);
+ MaterialGenerator.generateOreMaterial(RARE_EARTH_HIGH);
+
+ ItemStack aRareEarth = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 1L);
+
+ Fluid aSulfuric = FluidUtils.getFluidStack("sulfuricacid", 1).getFluid();
+ Fluid aHydrocholric = FluidUtils.getFluidStack("hydrochloricacid_gt5u", 1).getFluid();
+ Fluid aNitric = FluidUtils.getFluidStack("nitricacid", 1).getFluid();
+
+ // LV Rare Earth
+ GT_Values.RA.addChemicalBathRecipe(
+ ItemUtils.getSimpleStack(aRareEarth, 3),
+ FluidUtils.getFluidStack(aSulfuric, 1000),
+ RARE_EARTH_LOW.getCrushed(1),
+ RARE_EARTH_LOW.getCrushed(1),
+ RARE_EARTH_LOW.getCrushed(1),
+ new int[] {10000, 10000, 9000},
+ 20 * 30,
+ (int) GT_Values.V[1]);
+
+ // HV Rare Earth
+ GT_Values.RA.addChemicalBathRecipe(
+ ItemUtils.getSimpleStack(aRareEarth, 6),
+ FluidUtils.getFluidStack(aHydrocholric, 3000),
+ RARE_EARTH_MID.getCrushed(2),
+ RARE_EARTH_MID.getCrushed(2),
+ RARE_EARTH_MID.getCrushed(2),
+ new int[] {10000, 9000, 8000},
+ 20 * 60,
+ (int) GT_Values.V[3]);
+
+ // IV Rare Earth
+ GT_Values.RA.addChemicalBathRecipe(
+ ItemUtils.getSimpleStack(aRareEarth, 9),
+ FluidUtils.getFluidStack(aNitric, 6000),
+ RARE_EARTH_HIGH.getCrushed(3),
+ RARE_EARTH_HIGH.getCrushed(3),
+ RARE_EARTH_HIGH.getCrushed(3),
+ new int[] {9000, 8000, 7000},
+ 20 * 90,
+ (int) GT_Values.V[5]);
+
+
+ }
+
+
+ public static void processCopperRecipes() {
+
+ // Rare Earth Processing
+ /*GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustRareEarth", 1),
+ new ItemStack[] {
+ ELEMENT.getInstance().YTTRIUM.getSmallDust(1),
+ ELEMENT.getInstance().NEODYMIUM.getSmallDust(1),
+ ELEMENT.getInstance().LANTHANUM.getSmallDust(1),
+ ELEMENT.getInstance().CERIUM.getSmallDust(1),
+ ELEMENT.getInstance().CADMIUM.getSmallDust(1),
+ ELEMENT.getInstance().CAESIUM.getSmallDust(1),
+ ORES.SAMARSKITE_YB.getSmallDust(1),
+ ORES.FLORENCITE.getSmallDust(1),
+ ORES.FLUORCAPHITE.getSmallDust(1),
+ //ELEMENT.getInstance().YTTERBIUM.getTinyDust(1),
+ //ELEMENT.getInstance().SAMARIUM.getTinyDust(1),
+ //ELEMENT.getInstance().GADOLINIUM.getTinyDust(1)
+ },
+ new int[] { 2000, 2000, 2000, 2000, 2000, 2000, 2000, 2000, 2000 }, 20 * 30, 500);*/
+
+ }
+
+}
diff --git a/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java
index 698a5ec80a..6c8a790037 100644
--- a/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java
+++ b/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java
@@ -115,6 +115,7 @@ public class GTplusplus_Everglades implements ActionListener {
MaterialGenerator.generateOreMaterial(ORES.MIESSIITE);
MaterialGenerator.generateOreMaterial(ORES.KASHINITE);
MaterialGenerator.generateOreMaterial(ORES.IRARSITE);
+ MaterialGenerator.generateOreMaterial(ORES.GREENOCKITE);
MaterialGenerator.generateOreMaterial(ORES.RADIOBARITE);
MaterialGenerator.generateOreMaterial(ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
index 1cb999241a..52f7ab24f3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
@@ -55,9 +55,6 @@ public class RecipeGen_Ore extends RecipeGen_Base {
//if (material.getMaterialComposites().length > 1){
Logger.MATERIALS("[Recipe Generator Debug] ["+material.getLocalizedName()+"]");
int tVoltageMultiplier = MaterialUtils.getVoltageForTier(material.vTier);
- if (tVoltageMultiplier < 120) {
- tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 480 : 120;
- }
final ItemStack dustStone = ItemUtils.getItemStackOfAmountFromOreDict("dustStone", 1);
Material bonusA = null; //Ni
@@ -362,7 +359,7 @@ public class RecipeGen_Ore extends RecipeGen_Base {
mInternalOutputs[4],
mInternalOutputs[5],
mChances,
- 20*1*(tVoltageMultiplier/10),
+ (int) Math.max(material.getMass() * 3L * 1, 1),
tVoltageMultiplier)){
Logger.MATERIALS("[Electrolyzer] Generated Electrolyzer recipe for "+matDust.getDisplayName());
}
@@ -445,7 +442,7 @@ public class RecipeGen_Ore extends RecipeGen_Base {
null,
mInternalOutputs,
mChances,
- 20*1*(tVoltageMultiplier/10),
+ (int) Math.max(material.getMass() * 4L * 1, 1),
tVoltageMultiplier)){
Logger.MATERIALS("[Dehydrator] Generated Dehydrator recipe for "+matDust.getDisplayName());
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java
index 06373c9e1d..35714aee26 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java
@@ -1,10 +1,10 @@
package gtPlusPlus.xmod.gregtech.recipes;
-import gregtech.api.enums.Materials;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.Recipe_GT;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.ORES;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
@@ -28,7 +28,7 @@ public class RecipesToRemove {
Logger.INFO("Removed vanilla GT Rare Earth processing.");
//Set the Chemical Symbol for Rare Earth now that we are giving it custom outputs
//Best not to set this unless the original recipe is removed.
- Materials.RareEarth.mChemicalFormula = "("
+ /*Materials.RareEarth.mChemicalFormula = "("
+ELEMENT.getInstance().YTTRIUM.vChemicalSymbol
+ELEMENT.getInstance().NEODYMIUM.vChemicalSymbol
+ELEMENT.getInstance().LANTHANUM.vChemicalSymbol
@@ -38,7 +38,18 @@ public class RecipesToRemove {
+ELEMENT.getInstance().YTTERBIUM.vChemicalSymbol
+ELEMENT.getInstance().SAMARIUM.vChemicalSymbol
+ELEMENT.getInstance().GADOLINIUM.vChemicalSymbol+
- ")";
+ ")";*/
+
+ Material[] aLowTierOutputMaterials = new Material[] {
+ ORES.GREENOCKITE
+ };
+
+
+
+
+
+
+
}
}
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index bc4b170654..193df880f0 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -2969,4 +2969,60 @@ item.itemCactusCharcoal.name=Cactus Charcoal
item.itemCactusCoke.name=Cactus Coke
item.itemSugarCharcoal.name=Sugar Charcoal
item.itemSugarCoke.name=Sugar Coke
-item.LiquidHydrogen.name=Liquid Hydrogen Cell [LOH] \ No newline at end of file
+item.LiquidHydrogen.name=Liquid Hydrogen Cell [LOH]
+
+
+
+//Added 24/8/19
+//Debug Labels
+tile.blockDoorAlloy.name=Reinforced Door
+tile.blockInhibitorObelisk.name=Inhibitor Obelisk
+tile.Battlesign.name=Battlesign
+tile.blockMagicBox.name=Magic Box
+tile.blockManaPod.name=Mana Pod Stem
+tile.buildToolBlock.name=Tool Block
+tile.blockRedPlasma.name=Red Plasma Block
+tile.pipeBlock.name=Pipe
+item.null.name=REPORT ERROR TO ALKALUS
+
+
+//Added 24/8/19
+tile.OreGreenockite.name=Greenockite Ore
+item.crushedGreenockite.name=Crushed Greenockite Ore
+item.crushedCentrifugedGreenockite.name=Centrifuged Crushed Greenockite Ore
+item.crushedPurifiedGreenockite.name=Purified Crushed Greenockite Ore
+item.dustImpureGreenockite.name=Impure Greenockite Dust
+item.dustPureGreenockite.name=Purified Greenockite Dust
+item.itemDustGreenockite.name=Greenockite Dust
+item.itemDustTinyGreenockite.name=Tiny Pile of Greenockite Dust
+item.itemDustSmallGreenockite.name=Small Pile of Greenockite Dust
+
+tile.OreRareEarthI.name=Rare Earth (I) Ore
+item.crushedRareEarthI.name=Crushed Rare Earth (I) Ore
+item.crushedCentrifugedRareEarthI.name=Centrifuged Crushed Rare Earth (I) Ore
+item.crushedPurifiedRareEarthI.name=Purified Crushed Rare Earth (I) Ore
+item.dustImpureRareEarthI.name=Impure Rare Earth (I) Dust
+item.dustPureRareEarthI.name=Purified Rare Earth (I) Dust
+item.itemDustRareEarthI.name=Rare Earth (I) Dust
+item.itemDustTinyRareEarthI.name=Tiny Pile of Rare Earth (I) Dust
+item.itemDustSmallRareEarthI.name=Small Pile of Rare Earth (I) Dust
+
+tile.OreRareEarthII.name=Rare Earth (II) Ore
+item.crushedRareEarthII.name=Crushed Rare Earth (II) Ore
+item.crushedCentrifugedRareEarthII.name=Centrifuged Crushed Rare Earth (II) Ore
+item.crushedPurifiedRareEarthII.name=Purified Crushed Rare Earth (II) Ore
+item.dustImpureRareEarthII.name=Impure Rare Earth (II) Dust
+item.dustPureRareEarthII.name=Purified Rare Earth (II) Dust
+item.itemDustRareEarthII.name=Rare Earth (II) Dust
+item.itemDustTinyRareEarthII.name=Tiny Pile of Rare Earth (II) Dust
+item.itemDustSmallRareEarthII.name=Small Pile of Rare Earth (II) Dust
+
+tile.OreRareEarthIII.name=Rare Earth (III) Ore
+item.crushedRareEarthIII.name=Crushed Rare Earth (III) Ore
+item.crushedCentrifugedRareEarthIII.name=Centrifuged Crushed Rare Earth (III) Ore
+item.crushedPurifiedRareEarthIII.name=Purified Crushed Rare Earth (III) Ore
+item.dustImpureRareEarthIII.name=Impure Rare Earth (III) Dust
+item.dustPureRareEarthIII.name=Purified Rare Earth (III) Dust
+item.itemDustRareEarthIII.name=Rare Earth (III) Dust
+item.itemDustTinyRareEarthIII.name=Tiny Pile of Rare Earth (III) Dust
+item.itemDustSmallRareEarthIII.name=Small Pile of Rare Earth (III) Dust \ No newline at end of file