diff --git a/.gitignore b/.gitignore index 27501eda..3bdd7bc4 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ gradlew.bat # Linux *~ +*.bat diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 7be109fa..83e4c335 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -139,7 +139,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { TarPitch ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Tar Pitch" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), Serpentine ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 |8 , 255, 255, 255, 0, "Serpentine" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), Flux ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Flux" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), - RedstoneAlloy ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Redstone Alloy" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), + RedstoneAlloy ( 381, TextureSet.SET_METALLIC , 6.0F, 128, 2, 1 |8 |64|128 , 181, 51, 51, 0, "Redstone Alloy" , 0, 0, 500, 0, false, false, 3, 1, 1, Dyes.dyeRed ), OsmiumTetroxide ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Osmium Tetroxide" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), NitricAcid ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 255, 255, 255, 0, "Nitric Acid" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), RubberTreeSap ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 255, 255, 255, 0, "Rubber Tree Sap" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), @@ -150,18 +150,18 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Lumium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Lumium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), PhasedIron ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Phased Iron" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), PhasedGold ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Phased Gold" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), - Soularium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Soularium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), - Endium ( 770, TextureSet.SET_DULL , 1.0F, 0, 2, 1|2 |8 , 165, 220, 250, 0, "Endium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeYellow ), - Prismarine ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |4 , 255, 255, 255, 0, "Prismarine" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), + Soularium ( 379, TextureSet.SET_METALLIC , 12.0F, 256, 2, 1|2 |8 |64|128 , 65, 46, 29, 0, "Soularium" , 0, 0, 1400, 0, false, false, 3, 1, 1, Dyes.dyeBrown ), + Endium ( 770, TextureSet.SET_DULL , 1.0F, 0, 2, 1|2 |8 , 165, 220, 250, 0, "Endium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeYellow ), + Prismarine ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |4 , 255, 255, 255, 0, "Prismarine" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), GraveyardDirt ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Graveyard Dirt" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), - DarkSteel ( 364, TextureSet.SET_DULL , 8.0F, 512, 3, 1|2 |8 |64 , 80, 70, 80, 0, "Dark Steel" , 0, 0, 1811, 0, false, false, 5, 1, 1, Dyes.dyePurple ), - Terrasteel ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Terrasteel" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), - ConductiveIron ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Conductive Iron" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), - ElectricalSteel ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Electrical Steel" , 0, 0, 1811, 1000, true, false, 3, 1, 1, Dyes._NULL ), - EnergeticAlloy ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Energetic Alloy" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), - VibrantAlloy ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Vibrant Alloy" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), - PulsatingIron ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Pulsating Iron" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), - Teslatite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 60, 180, 200, 0, "Teslatite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), + DarkSteel ( 364, TextureSet.SET_DULL , 8.0F, 512, 3, 1|2 |8 |64 , 80, 70, 80, 0, "Dark Steel" , 0, 0, 1811, 0, false, false, 5, 1, 1, Dyes.dyePurple ), + Terrasteel ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Terrasteel" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), + ConductiveIron ( 369, TextureSet.SET_METALLIC , 6.0F, 256, 2, 1|2 |8 |64|128 , 217, 178, 171, 0, "Conductive Iron" , 0, 0, 1811, 0, false, false, 3, 1, 1, Dyes.dyeRed ), + ElectricalSteel ( 365, TextureSet.SET_METALLIC , 6.0F, 512, 2, 1|2 |8 |64|128 , 185, 185, 185, 0, "Electrical Steel" , 0, 0, 1811, 1000, true, false, 5, 1, 1, Dyes.dyeGray ), + EnergeticAlloy ( 366, TextureSet.SET_METALLIC , 12.0F, 64, 2, 1|2 |8 |64|128 , 255, 170, 81, 0, "Energetic Alloy" , 0, 0, 1400, 0, false, false, 3, 1, 1, Dyes.dyeOrange ), + VibrantAlloy ( 367, TextureSet.SET_METALLIC , 18.0F, 128, 2, 1|2 |8 |64|128 , 157, 188, 53, 0, "Vibrant Alloy" , 0, 0, 2000, 0, false, false, 5, 1, 1, Dyes.dyeLime ), + PulsatingIron ( 378, TextureSet.SET_METALLIC , 9.0F, 256, 2, 1|2 |8 |64|128 , 128, 246, 155, 0, "Pulsating Iron" , 0, 0, 1811, 0, false, false, 3, 1, 1, Dyes.dyeLime ), + Teslatite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 60, 180, 200, 0, "Teslatite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), Fluix ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |4 , 255, 255, 255, 0, "Fluix" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), Manasteel ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Manasteel" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), Tennantite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Tennantite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), @@ -182,8 +182,8 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Pokefennium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Pokefennium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), Draconium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Draconium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), DraconiumAwakened ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Awakened Draconium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), - PurpleAlloy ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 100, 180, 255, 0, "Purple Alloy" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), - InfusedTeslatite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 100, 180, 255, 0, "Infused Teslatite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), + PurpleAlloy ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 100, 180, 255, 0, "Purple Alloy" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), + InfusedTeslatite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 100, 180, 255, 0, "Infused Teslatite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), /** * Unknown Material Components. Dead End Section. @@ -235,8 +235,8 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Eclogite ( 860, TextureSet.SET_DULL , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Eclogite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL ), ElectrumFlux ( 320, TextureSet.SET_SHINY , 16.0F, 512, 3, 1|2 |64 , 255, 255, 120, 0, "Fluxed Electrum" , 0, 0, 3000, 3000, true, false, 1, 1, 1, Dyes.dyeYellow ), Emery ( 861, TextureSet.SET_DULL , 1.0F, 0, 2, 1 |8 , 255, 255, 255, 0, "Emery" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL ), - Enderium ( 321, TextureSet.SET_DULL , 8.0F, 256, 3, 1|2 |64 , 89, 145, 135, 0, "Enderium" , 0, 0, 3000, 3000, true, false, 1, 1, 1, Dyes.dyeGreen , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ALIENIS, 1))), - EnderiumBase ( -1, TextureSet.SET_DULL , 8.0F, 256, 3, 1|2 |64 , 89, 145, 135, 0, "Enderium Base" , 0, 0, 3000, 3000, true, false, 1, 1, 1, Dyes.dyeGreen , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ALIENIS, 1))), + Enderium ( 321, TextureSet.SET_DULL , 8.0F, 256, 3, 1|2 |64 , 89, 145, 135, 0, "Enderium" , 0, 0, 3000, 3000, true, false, 1, 1, 1, Dyes.dyeGreen , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ALIENIS, 1))), + EnderiumBase ( 380, TextureSet.SET_DULL , 16.0F, 512, 4, 1|2 |8 |64 , 72, 119, 153, 0, "Enderium Base" , 0, 0, 3000, 3000, true, false, 1, 1, 1, Dyes.dyeGreen , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ALIENIS, 1))), Energized ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 255, 255, 255, 0, "Energized" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL ), Epidote ( 862, TextureSet.SET_DULL , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Epidote" , 0, 0, -1, 0, false, false, 0, 1, 1, Dyes._NULL ), Eximite ( 959, TextureSet.SET_METALLIC , 5.0F, 2560, 3, 1|2 |8 |64 , 124, 90, 150, 0, "Eximite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL ), @@ -410,9 +410,9 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { * TODO: This */ AluminiumBrass ( -1, TextureSet.SET_METALLIC , 6.0F, 64, 2, 1|2 |64 , 255, 255, 255, 0, "Aluminium Brass" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), - Osmiridium ( 317, TextureSet.SET_METALLIC , 7.0F, 1600, 3, 1|2 |64|128 , 100, 100, 255, 0, "Osmiridium" , 0, 0, 3333, 2500, true, false, 1, 1, 1, Dyes.dyeLightBlue , 1, Arrays.asList(new MaterialStack(Iridium, 3), new MaterialStack(Osmium, 1))), - Sunnarium ( 318, TextureSet.SET_SHINY , 1.0F, 0, 1, 1|2 , 255, 255, 0, 0, "Sunnarium" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), - Endstone ( 808, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Endstone" , 0, 0, -1, 0, false, false, 0, 1, 1, Dyes.dyeYellow ), + Osmiridium ( 317, TextureSet.SET_METALLIC , 7.0F, 1600, 3, 1|2 |64|128 , 100, 100, 255, 0, "Osmiridium" , 0, 0, 3500, 3500, true, false, 1, 1, 1, Dyes.dyeLightBlue ), + Sunnarium ( 318, TextureSet.SET_SHINY , 1.0F, 0, 1, 1|2 |64|128 , 255, 255, 0, 0, "Sunnarium" , 0, 0, 3600, 3600, true, false, 1, 1, 1, Dyes.dyeYellow ), + Endstone ( 808, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Endstone" , 0, 0, -1, 0, false, false, 0, 1, 1, Dyes.dyeYellow ), Netherrack ( 807, TextureSet.SET_DULL , 1.0F, 0, 0, 1 , 200, 0, 0, 0, "Netherrack" , 0, 0, -1, 0, false, false, 0, 1, 1, Dyes.dyeRed ), SoulSand ( -1, TextureSet.SET_DULL , 1.0F, 0, 0, 1 , 255, 255, 255, 0, "Soulsand" , 0, 0, -1, 0, false, false, 0, 1, 1, Dyes.dyeBrown ), diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 6d330cf4..6d7088c3 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -12,175 +12,177 @@ item.gregtech:modularelectric2_leggings.name=Modular Nanosuit Leggings item.gregtech:modularelectric2_boots.name=Modular Nanosuit Boots achievement.Naquadah=Find Naquadah Ore -achievement.Naquadah.desc=Height: 10-60, Chance: 10, End +achievement.Naquadah.desc=Height: 10-90, Chance: 10, Asteroids/Venus/Titan/Oberon/Pluto// achievement.NaquadahEnriched=Find NaquadahEnriched Ore -achievement.NaquadahEnriched.desc=Height: 10-60, Chance: 10, End +achievement.NaquadahEnriched.desc=Height: 10-90, Chance: 10, Asteroids/Venus/Titan/Oberon/Pluto// achievement.Lignite=Find Lignite Ore -achievement.Lignite.desc=Height: 50-130, Chance: 160, Overworld +achievement.Lignite.desc=Height: 80-210, Chance: 160, Overworld// achievement.Coal=Find Coal Ore -achievement.Coal.desc=Height: 50-130, Chance: 160, Overworld +achievement.Coal.desc=Height: 30-80, Chance: 160, Overworld/Twilight-Forrest// achievement.Magnetite=Find Magnetite Ore -achievement.Magnetite.desc=Height: 50-120, Chance: 160, Overworld/Nether +achievement.Magnetite.desc=Height: 60-180, Chance: 160, Overworld/Twilight-Forrest/End/End-Asteroids/Mars/Phobos/Deimos/Asteorids/IO/Callisto/Venus/Triton// achievement.Iron=Find Iron Ore -achievement.Iron.desc=Height: 50-120, Chance: 160, Overworld/Nether +achievement.Iron.desc=Height: 10-40, Chance: 120, Overworld/Nether/Twilight-Forrest/End/End-Asteroids/Moon/Mars/Ceres/IO/Ganymed/Callisto/Mecury/Enceladus/Oberon/Proteus/Pluto// achievement.VanadiumMagnetite=Find VanadiumMagnetite Ore -achievement.VanadiumMagnetite.desc=Height: 50-120, Chance: 160, Overworld/Nether +achievement.VanadiumMagnetite.desc=Height: 60-180, Chance: 160, Overworld/Twilight-Forrest/End/End-Asteroids/Mars/Phobos/Asteorids/IO/Callisto/Venus/Triton// achievement.Gold=Find Gold Ore -achievement.Gold.desc=Height: 60-80, Chance: 160, Overworld +achievement.Gold.desc=Height: 30-60, Chance: 160, Overworld/Twilight-Forrest/End/End/End-Asteroids/Mars/Phobos/Asteroids/Callisto/Venus/Triton// achievement.BrownLimonite=Find BrownLimonite Ore -achievement.BrownLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether +achievement.BrownLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto// achievement.YellowLimonite=Find YellowLimonite Ore -achievement.YellowLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether +achievement.YellowLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto// achievement.BandedIron=Find BandedIron Ore -achievement.BandedIron.desc=Height: 10-40, Chance: 120, Overworld/Nether +achievement.BandedIron.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto// achievement.Malachite=Find Malachite Ore -achievement.Malachite.desc=Height: 10-40, Chance: 120, Overworld/Nether +achievement.Malachite.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto// achievement.Tin=Find Tin Ore -achievement.Tin.desc=Height: 40-120, Chance: 50, Overworld/End +achievement.Tin.desc=Height: 60-220, Chance: 50, Overworld/Twilight-Forrest/End/End/End-Asteroids/Moon/IO/Venus// achievement.Cassiterite=Find Cassiterite Ore -achievement.Cassiterite.desc=Height: 40-120, Chance: 50, Overworld/End +achievement.Cassiterite.desc=Height: 60-220, Chance: 50, Overworld/Twilight-Forrest/End/End/End-Asteroids/Moon/IO/Venus/Pluto// achievement.Tetrahedrite=Find Tetrahedrite Ore -achievement.Tetrahedrite.desc=Height: 80-120, Chance: 70, Overworld/Nether +achievement.Tetrahedrite.desc=Height: 80-120, Chance: 70, Nether/Mars/Deimos/Ganymed/Enceladus/Triton// achievement.Copper=Find Copper Ore -achievement.Copper.desc=Height: 80-120, Chance: 70, Overworld/Nether +achievement.Copper.desc=Height: 5-60, Chance: 80, Overworld/Nether/End/End-Asteroids/Moon/Mars/Phobos/Deimos/Ceres/Ganymed/Callisto/Enceladus/Proteus// achievement.Stibnite=Find Stibnite Ore -achievement.Stibnite.desc=Height: 80-120, Chance: 70, Overworld/Nether +achievement.Stibnite.desc=Height: 80-120, Chance: 70, Nether/Mars/Deimos/Ganymed/Enceladus/Triton// achievement.NetherQuartz=Find NetherQuartz Ore -achievement.NetherQuartz.desc=Height: 40-80, Chance: 80, Nether +achievement.NetherQuartz.desc=Height: 40-80, Chance: 80, /Nether// achievement.Sulfur=Find Sulfur Ore -achievement.Sulfur.desc=Height: 5-20, Chance: 100, Nether +achievement.Sulfur.desc=Height: 5-20, Chance: 100, /Nether/Mars/Phobos/Deimos/IO/Venus// achievement.Pyrite=Find Pyrite Ore -achievement.Pyrite.desc=Height: 5-20, Chance: 100, Nether +achievement.Pyrite.desc=Height: 5-60, Chance: 100, Overworld/Nether/End/End-Asteroids/Moon/Ceres/IO/Callisto/Venus/Enceladus/Proteus// achievement.Sphalerite=Find Sphalerite Ore -achievement.Sphalerite.desc=Height: 5-20, Chance: 100, Nether +achievement.Sphalerite.desc=Height: 5-20, Chance: 100, /Nether/Mars/Phobos/Deimos/IO/Venus// achievement.Chalcopyrite=Find Chalcopyrite Ore -achievement.Chalcopyrite.desc=Height: 10-30, Chance: 80, Overworld/Nether +achievement.Chalcopyrite.desc=Height: 5-60, Chance: 80, Overworld/Nether/End/End-Asteroids/Moon/Ceres/Callisto/Enceladus/Proteus// achievement.Bauxite=Find Bauxite Ore -achievement.Bauxite.desc=Height: 50-90, Chance: 80, Overworld +achievement.Bauxite.desc=Height: 10-80, Chance: 80, Moon/Phobos/Asteroids/Ganymed/Mercury/Titan/Proteus/Pluto// achievement.Aluminium=Find Aluminium Ore -achievement.Aluminium.desc=Height: 50-90, Chance: 80, Overworld +achievement.Aluminium.desc=Height: 10-80, Chance: 80, Moon/Phobos/Asteroids/Ganymed/Mercury/Titan/Proteus/Pluto// achievement.Ilmenite=Find Ilmenite Ore -achievement.Ilmenite.desc=Height: 50-90, Chance: 80, Overworld +achievement.Ilmenite.desc=Height: 10-80, Chance: 80, Moon/Phobos/Asteroids/Ganymed/Mercury/Titan/Proteus/Pluto// achievement.RockSalt=Find RockSalt Ore -achievement.RockSalt.desc=Height: 50-60, Chance: 50, Overworld +achievement.RockSalt.desc=Height: 50-70, Chance: 50, Overworld/Twilight-Forrest/Mars// achievement.Salt=Find Salt Ore -achievement.Salt.desc=Height: 50-60, Chance: 50, Overworld +achievement.Salt.desc=Height: 50-70, Chance: 50, Overworld/Twilight-Forrest/Mars// achievement.Lepidolite=Find Lepidolite Ore -achievement.Lepidolite.desc=Height: 50-60, Chance: 50, Overworld +achievement.Lepidolite.desc=Height: 50-70, Chance: 50, Overworld/Twilight-Forrest/Mars// achievement.Spodumene=Find Spodumene Ore -achievement.Spodumene.desc=Height: 50-60, Chance: 50, Overworld +achievement.Spodumene.desc=Height: 50-70, Chance: 50, Overworld/Twilight-Forrest/Mars// achievement.Redstone=Find Redstone Ore -achievement.Redstone.desc=Height: 10-40, Chance: 60, Overworld/Nether +achievement.Redstone.desc=Height: 5-40, Chance: 60, Overworld/Nether/Mars/Ganymed/Venus/Mercury// achievement.Ruby=Find Ruby Ore -achievement.Ruby.desc=Height: 10-40, Chance: 60, Overworld/Nether +achievement.Ruby.desc=Height: 5-40, Chance: 60, Overworld/Nether/Mars/Ganymed/Venus/Mercury// achievement.Cinnabar=Find Cinnabar Ore -achievement.Cinnabar.desc=Height: 10-40, Chance: 60, Overworld/Nether +achievement.Cinnabar.desc=Height: 5-40, Chance: 60, Overworld/Nether/Mars/Ganymed/Venus/Mercury// achievement.Soapstone=Find Soapstone Ore -achievement.Soapstone.desc=Height: 10-40, Chance: 40, Overworld +achievement.Soapstone.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest// achievement.Talc=Find Talc Ore -achievement.Talc.desc=Height: 10-40, Chance: 40, Overworld +achievement.Talc.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest// achievement.Glauconite=Find Glauconite Ore -achievement.Glauconite.desc=Height: 10-40, Chance: 40, Overworld +achievement.Glauconite.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest// achievement.Pentlandite=Find Pentlandite Ore -achievement.Pentlandite.desc=Height: 10-40, Chance: 40, Overworld +achievement.Pentlandite.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest// achievement.Garnierite=Find Garnierite Ore -achievement.Garnierite.desc=Height: 10-40, Chance: 40, Overworld/Nether/End +achievement.Garnierite.desc=Height: 10-40, Chance: 40, Twilight-Forrest/End/End-Asteroids/Mars/Phobos/Deimos/Venus/Titan/Triton// achievement.Nickel=Find Nickel Ore -achievement.Nickel.desc=Height: 10-40, Chance: 40, Overworld/Nether/End +achievement.Nickel.desc=Height: 10-40, Chance: 40, Twilight-Forrest/End/End-Asteroids/Mars/Phobos/Deimos/Venus/Mercury/Enceladus/Titan/Triton/Proteus/Pluto// achievement.Cobaltite=Find Cobaltite Ore -achievement.Cobaltite.desc=Height: 10-40, Chance: 40, Overworld/Nether/End +achievement.Cobaltite.desc=Height: 10-40, Chance: 40, Twilight-Forrest/End/End-Asteroids/Mars/Phobos/Deimos/Venus/Titan/Triton// achievement.Cooperite=Find Cooperite Ore -achievement.Cooperite.desc=Height: 40-50, Chance: 5, Overworld/End +achievement.Cooperite.desc=Height: 40-50, Chance: 5, // achievement.Palladium=Find Palladium Ore -achievement.Palladium.desc=Height: 40-50, Chance: 5, Overworld/End +achievement.Palladium.desc=Height: 5-30, Chance: 10, /Ceres/IO/Ganymed/Callisto/Venus/Mercury/Enceladus/Oberon/Pluto// achievement.Platinum=Find Platinum Ore -achievement.Platinum.desc=Height: 40-50, Chance: 5, Overworld/End +achievement.Platinum.desc=Height: 5-30, Chance: 10, /Ceres/IO/Ganymed/Callisto/Mercury/Oberon/Pluto// achievement.Iridium=Find Iridium Ore -achievement.Iridium.desc=Height: 40-50, Chance: 5, Overworld/End +achievement.Iridium.desc=Height: 5-30, Chance: 10, /Venus/Mercury/Enceladus/Titan/Proteus/Pluto// achievement.Pitchblende=Find Pitchblende Ore -achievement.Pitchblende.desc=Height: 10-40, Chance: 40, Overworld -achievement.Uraninite=Find Uraninite Ore -achievement.Uraninite.desc=Height: 10-40, Chance: 40, Overworld +achievement.Pitchblende.desc=Height: 30-60, Chance: 40, Moon/Phobos/IO/Venus/Oberon// achievement.Uranium=Find Uranium Ore -achievement.Uranium.desc=Height: 20-30, Chance: 20, Overworld +achievement.Uranium.desc=Height: 30-60, Chance: 40, Mars/Phobos/Deimos/Ceres/IO/Gannymed/Venus/Enceladus/Oberon/Proteus// +achievement.Uraninite=Find Uraninite Ore +achievement.Uraninite.desc=Height: 30-60, Chance: 40, Mars/Phobos/Deimos/Ceres/IO/Gannymed/Venus/Enceladus/Oberon/Proteus// +achievement.Plutonium=Find Plutonium Ore +achievement.Plutonium.desc=Height: 5-30, Chance: 10, Phobos/Deimos/Ceres/Gannymed/Enceladus/Proteus// achievement.Bastnasite=Find Bastnasite Ore -achievement.Bastnasite.desc=Height: 20-40, Chance: 30, Overworld +achievement.Bastnasite.desc=Height: 20-40, Chance: 30, Moon/Deimos/IO/Callisto/Venus/Enceladus/Titan/Triton// achievement.Monazite=Find Monazite Ore -achievement.Monazite.desc=Height: 20-40, Chance: 30, Overworld +achievement.Monazite.desc=Height: 20-40, Chance: 30, Moon/Deimos/IO/Callisto/Venus/Enceladus/Titan/Triton// achievement.Neodymium=Find Neodymium Ore -achievement.Neodymium.desc=Height: 20-40, Chance: 30, Overworld +achievement.Neodymium.desc=Height: 20-40, Chance: 30, Moon/Deimos/IO/Callisto/Venus/Enceladus/Titan/Triton// achievement.Wulfenite=Find Wulfenite Ore -achievement.Wulfenite.desc=Height: 20-50, Chance: 5, Overworld/End +achievement.Wulfenite.desc=Height: 20-50, Chance: 5, Nether/Twilight-Forrest/Moon/Phobos/Ceres/Mercury/Titan/Proteus/Pluto// achievement.Molybdenite=Find Molybdenite Ore -achievement.Molybdenite.desc=Height: 20-50, Chance: 5, Overworld/End +achievement.Molybdenite.desc=Height: 20-50, Chance: 5, Nether/Twilight-Forrest/Moon/Phobos/Ceres/Mercury/Titan/Proteus/Pluto// achievement.Molybdenum=Find Molybdenum Ore -achievement.Molybdenum.desc=Height: 20-50, Chance: 5, Overworld/End +achievement.Molybdenum.desc=Height: 20-50, Chance: 5, Nether/Twilight-Forrest/Moon/Phobos/Ceres/Mercury/Titan/Proteus/Pluto// achievement.Powellite=Find Powellite Ore -achievement.Powellite.desc=Height: 20-50, Chance: 5, Overworld/End +achievement.Powellite.desc=Height: 20-50, Chance: 5, Nether/Twilight-Forrest/Moon/Phobos/Ceres/Mercury/Titan/Proteus/Pluto// achievement.Scheelite=Find Scheelite Ore -achievement.Scheelite.desc=Height: 20-50, Chance: 10, Overworld/End +achievement.Scheelite.desc=Height: 20-60, Chance: 10, Mars/Deimos/Asteroids/Ganymed/Callisto/Enceladus/Oberon/Pluto// achievement.Tungstate=Find Tungstate Ore -achievement.Tungstate.desc=Height: 20-50, Chance: 10, Overworld/End +achievement.Tungstate.desc=Height: 20-60, Chance: 10, Mars/Deimos/Asteroids/Ganymed/Callisto/Enceladus/Oberon/Pluto// achievement.Lithium=Find Lithium Ore -achievement.Lithium.desc=Height: 20-50, Chance: 10, Overworld/End +achievement.Lithium.desc=Height: 20-60, Chance: 10, Mars/Deimos/Asteroids/Ganymed/Callisto/Enceladus/Oberon/Pluto// achievement.Almandine=Find Almandine Ore -achievement.Almandine.desc=Height: 10-40, Chance: 60, Overworld +achievement.Almandine.desc=Height: 10-40, Chance: 60, Twilight-Forrest// achievement.Pyrope=Find Pyrope Ore -achievement.Pyrope.desc=Height: 10-40, Chance: 60, Overworld +achievement.Pyrope.desc=Height: 10-40, Chance: 60, Twilight-Forrest// achievement.Sapphire=Find Sapphire Ore -achievement.Sapphire.desc=Height: 10-40, Chance: 60, Overworld +achievement.Sapphire.desc=Height: 10-40, Chance: 60, Twilight-Forrest// achievement.GreenSapphire=Find GreenSapphire Ore -achievement.GreenSapphire.desc=Height: 10-40, Chance: 60, Overworld +achievement.GreenSapphire.desc=Height: 10-40, Chance: 60, Twilight-Forrest// achievement.Grossular=Find Grossular Ore -achievement.Grossular.desc=Height: 20-30, Chance: 20, Overworld/End +achievement.Grossular.desc=Height: 20-30, Chance: 20, Overworld/Nether/Ceres/IO/Titan/Oberon/Triton// achievement.Spessartine=Find Spessartine Ore -achievement.Spessartine.desc=Height: 20-30, Chance: 20, Overworld/End +achievement.Spessartine.desc=Height: 20-30, Chance: 20, Overworld/Nether/Ceres/IO/Titan/Oberon/Triton// achievement.Pyrolusite=Find Pyrolusite Ore -achievement.Pyrolusite.desc=Height: 20-30, Chance: 20, Overworld/End +achievement.Pyrolusite.desc=Height: 20-30, Chance: 20, Overworld/Nether/Ceres/IO/Titan/Oberon/Triton// achievement.Tantalite=Find Tantalite Ore -achievement.Tantalite.desc=Height: 20-30, Chance: 20, Overworld/End +achievement.Tantalite.desc=Height: 20-30, Chance: 20, Overworld/Nether/Ceres/IO/Titan/Oberon/Triton// achievement.Quartzite=Find Quartzite Ore -achievement.Quartzite.desc=Height: 40-80, Chance: 60, Overworld +achievement.Quartzite.desc=Height: 40-80, Chance: 60, Nether/Moon/Mars/Phobos/IO/Venus/Proteus// achievement.Barite=Find Barite Ore -achievement.Barite.desc=Height: 40-80, Chance: 60, Overworld +achievement.Barite.desc=Height: 40-80, Chance: 60, Nether/Moon/Mars/Phobos/IO/Venus/Proteus// achievement.CertusQuartz=Find CertusQuartz Ore -achievement.CertusQuartz.desc=Height: 40-80, Chance: 60, Overworld +achievement.CertusQuartz.desc=Height: 40-80, Chance: 60, Nether/Moon/Mars/Phobos/IO/Venus/Proteus// achievement.Graphite=Find Graphite Ore -achievement.Graphite.desc=Height: 5-20, Chance: 40, Overworld +achievement.Graphite.desc=Height: 5-20, Chance: 40, Overworld/Twilight-Forrest/Phobos/Ganymed/Mercury/Titan/Proteus/Pluto// achievement.Diamond=Find Diamond Ore -achievement.Diamond.desc=Height: 5-20, Chance: 40, Overworld +achievement.Diamond.desc=Height: 5-20, Chance: 40, Overworld/Twilight-Forrest/Phobos/Ganymed/Mercury/Titan/Proteus/Pluto// achievement.Bentonite=Find Bentonite Ore -achievement.Bentonite.desc=Height: 10-40, Chance: 60, Overworld/End +achievement.Bentonite.desc=Height: 10-40, Chance: 60, Twilight-Forrest// achievement.Magnesite=Find Magnesite Ore -achievement.Magnesite.desc=Height: 10-40, Chance: 60, Overworld/End +achievement.Magnesite.desc=Height: 10-40, Chance: 60, Twilight-Forrest// achievement.Olivine=Find Olivine Ore -achievement.Olivine.desc=Height: 10-40, Chance: 60, Overworld/End +achievement.Olivine.desc=Height: 10-40, Chance: 60, Twilight-Forrest// achievement.Apatite=Find Apatite Ore -achievement.Apatite.desc=Height: 40-60, Chance: 60, Overworld +achievement.Apatite.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forrest// achievement.Phosphorus=Find Phosphorus Ore -achievement.Phosphorus.desc=Height: 40-60, Chance: 60, Overworld +achievement.Phosphorus.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forrest// achievement.Phosphate=Find Phosphate Ore -achievement.Phosphate.desc=Height: 40-60, Chance: 60, Overworld +achievement.Phosphate.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forrest// achievement.Galena=Find Galena Ore -achievement.Galena.desc=Height: 30-60, Chance: 40, Overworld +achievement.Galena.desc=Height: 5-45, Chance: 40, Twilight-Forrest/Moon/Mars/Ganymed/Venus/Oberon/Triton// achievement.Silver=Find Silver Ore -achievement.Silver.desc=Height: 30-60, Chance: 40, Overworld +achievement.Silver.desc=Height: 5-45, Chance: 40, Twilight-Forrest/Moon/Mars/Ganymed/Venus/Oberon/Triton// achievement.Lead=Find Lead Ore -achievement.Lead.desc=Height: 30-60, Chance: 40, Overworld +achievement.Lead.desc=Height: 5-45, Chance: 40, Twilight-Forrest/Moon/Mars/Ganymed/Venus/Oberon/Triton// achievement.Lazurite=Find Lazurite Ore -achievement.Lazurite.desc=Height: 20-50, Chance: 40, Overworld/End +achievement.Lazurite.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest/Deimos/Ceres/Enceladus// achievement.Sodalite=Find Sodalite Ore -achievement.Sodalite.desc=Height: 20-50, Chance: 40, Overworld/End +achievement.Sodalite.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest/Deimos/Ceres/Enceladus// achievement.Lapis=Find Lapis Ore -achievement.Lapis.desc=Height: 20-50, Chance: 40, Overworld/End +achievement.Lapis.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest/Deimos/Ceres/Enceladus// achievement.Calcite=Find Calcite Ore -achievement.Calcite.desc=Height: 20-50, Chance: 40, Overworld/End +achievement.Calcite.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest/Deimos/Ceres/Enceladus// achievement.Beryllium=Find Beryllium Ore -achievement.Beryllium.desc=Height: 5-30, Chance: 30, Overworld/End +achievement.Beryllium.desc=Height: 5-30, Chance: 30, Nether/End-Asteroids/Mars/Ceres/Venus/Titan/Pluto// achievement.Emerald=Find Emerald Ore -achievement.Emerald.desc=Height: 5-30, Chance: 30, Overworld/End +achievement.Emerald.desc=Height: 5-30, Chance: 30, Nether/End-Asteroids/Mars/Ceres/Venus/Titan/Pluto// achievement.Thorium=Find Thorium Ore -achievement.Thorium.desc=Height: 5-30, Chance: 30, Overworld/End +achievement.Thorium.desc=Height: 5-30, Chance: 30, Nether/End-Asteroids/Mars/Ceres/Venus/Titan/Pluto// achievement.Oilsands=Find Oilsands Ore achievement.Oilsands.desc=Height: 50-80, Chance: 80, Overworld