experimental branch

82 files changed, 186 insertions, 513 deletions

diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index fda908b854..6d330cf4b6 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -1,175 +1,188 @@
+item.gregtech:modulararmor_helmet.name=Basic Modular Armor Helmet
+item.gregtech:modulararmor_chestplate.name=Basic Modular Armor Chestplate
+item.gregtech:modulararmor_leggings.name=Basic Modular Armor Leggings
+item.gregtech:modulararmor_boots.name=Basic Modular Armor Boots
+item.gregtech:modularelectric1_helmet.name=Modular Exoskeleton Helmet
+item.gregtech:modularelectric1_chestplate.name=Modular Exoskeleton Chestplate
+item.gregtech:modularelectric1_leggings.name=Modular Exoskeleton Leggings
+item.gregtech:modularelectric1_boots.name=Modular Exoskeleton Boots
+item.gregtech:modularelectric2_helmet.name=Modular Nanosuit Helmet
+item.gregtech:modularelectric2_chestplate.name=Modular Nanosuit Chestplate
+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-90, Chance: 10, Asteroids/Venus/Titan/Oberon/Pluto//
+achievement.Naquadah.desc=Height: 10-60, Chance: 10, End
 achievement.NaquadahEnriched=Find NaquadahEnriched Ore
-achievement.NaquadahEnriched.desc=Height: 10-90, Chance: 10, Asteroids/Venus/Titan/Oberon/Pluto//
+achievement.NaquadahEnriched.desc=Height: 10-60, Chance: 10, End
 achievement.Lignite=Find Lignite Ore
-achievement.Lignite.desc=Height: 80-210, Chance: 160, Overworld//
+achievement.Lignite.desc=Height: 50-130, Chance: 160, Overworld
 achievement.Coal=Find Coal Ore
-achievement.Coal.desc=Height: 30-80, Chance: 160, Overworld/Twilight-Forrest//
+achievement.Coal.desc=Height: 50-130, Chance: 160, Overworld
 achievement.Magnetite=Find Magnetite Ore
-achievement.Magnetite.desc=Height: 60-180, Chance: 160, Overworld/Twilight-Forrest/End/End-Asteroids/Mars/Phobos/Deimos/Asteorids/IO/Callisto/Venus/Triton//
+achievement.Magnetite.desc=Height: 50-120, Chance: 160, Overworld/Nether
 achievement.Iron=Find Iron Ore
-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.Iron.desc=Height: 50-120, Chance: 160, Overworld/Nether
 achievement.VanadiumMagnetite=Find VanadiumMagnetite Ore
-achievement.VanadiumMagnetite.desc=Height: 60-180, Chance: 160, Overworld/Twilight-Forrest/End/End-Asteroids/Mars/Phobos/Asteorids/IO/Callisto/Venus/Triton//
+achievement.VanadiumMagnetite.desc=Height: 50-120, Chance: 160, Overworld/Nether
 achievement.Gold=Find Gold Ore
-achievement.Gold.desc=Height: 30-60, Chance: 160, Overworld/Twilight-Forrest/End/End/End-Asteroids/Mars/Phobos/Asteroids/Callisto/Venus/Triton//
+achievement.Gold.desc=Height: 60-80, Chance: 160, Overworld
 achievement.BrownLimonite=Find BrownLimonite Ore
-achievement.BrownLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto//
+achievement.BrownLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether
 achievement.YellowLimonite=Find YellowLimonite Ore
-achievement.YellowLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto//
+achievement.YellowLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether
 achievement.BandedIron=Find BandedIron Ore
-achievement.BandedIron.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto//
+achievement.BandedIron.desc=Height: 10-40, Chance: 120, Overworld/Nether
 achievement.Malachite=Find Malachite Ore
-achievement.Malachite.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto//
+achievement.Malachite.desc=Height: 10-40, Chance: 120, Overworld/Nether
 achievement.Tin=Find Tin Ore
-achievement.Tin.desc=Height: 60-220, Chance: 50, Overworld/Twilight-Forrest/End/End/End-Asteroids/Moon/IO/Venus//
+achievement.Tin.desc=Height: 40-120, Chance: 50, Overworld/End
 achievement.Cassiterite=Find Cassiterite Ore
-achievement.Cassiterite.desc=Height: 60-220, Chance: 50, Overworld/Twilight-Forrest/End/End/End-Asteroids/Moon/IO/Venus/Pluto//
+achievement.Cassiterite.desc=Height: 40-120, Chance: 50, Overworld/End
 achievement.Tetrahedrite=Find Tetrahedrite Ore
-achievement.Tetrahedrite.desc=Height: 80-120, Chance: 70, Nether/Mars/Deimos/Ganymed/Enceladus/Triton//
+achievement.Tetrahedrite.desc=Height: 80-120, Chance: 70, Overworld/Nether
 achievement.Copper=Find Copper Ore
-achievement.Copper.desc=Height: 5-60, Chance: 80, Overworld/Nether/End/End-Asteroids/Moon/Mars/Phobos/Deimos/Ceres/Ganymed/Callisto/Enceladus/Proteus//
+achievement.Copper.desc=Height: 80-120, Chance: 70, Overworld/Nether
 achievement.Stibnite=Find Stibnite Ore
-achievement.Stibnite.desc=Height: 80-120, Chance: 70, Nether/Mars/Deimos/Ganymed/Enceladus/Triton//
+achievement.Stibnite.desc=Height: 80-120, Chance: 70, Overworld/Nether
 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/Mars/Phobos/Deimos/IO/Venus//
+achievement.Sulfur.desc=Height: 5-20, Chance: 100, Nether
 achievement.Pyrite=Find Pyrite Ore
-achievement.Pyrite.desc=Height: 5-60, Chance: 100, Overworld/Nether/End/End-Asteroids/Moon/Ceres/IO/Callisto/Venus/Enceladus/Proteus//
+achievement.Pyrite.desc=Height: 5-20, Chance: 100, Nether
 achievement.Sphalerite=Find Sphalerite Ore
-achievement.Sphalerite.desc=Height: 5-20, Chance: 100, /Nether/Mars/Phobos/Deimos/IO/Venus//
+achievement.Sphalerite.desc=Height: 5-20, Chance: 100, Nether
 achievement.Chalcopyrite=Find Chalcopyrite Ore
-achievement.Chalcopyrite.desc=Height: 5-60, Chance: 80, Overworld/Nether/End/End-Asteroids/Moon/Ceres/Callisto/Enceladus/Proteus//
+achievement.Chalcopyrite.desc=Height: 10-30, Chance: 80, Overworld/Nether
 achievement.Bauxite=Find Bauxite Ore
-achievement.Bauxite.desc=Height: 10-80, Chance: 80, Moon/Phobos/Asteroids/Ganymed/Mercury/Titan/Proteus/Pluto//
+achievement.Bauxite.desc=Height: 50-90, Chance: 80, Overworld
 achievement.Aluminium=Find Aluminium Ore
-achievement.Aluminium.desc=Height: 10-80, Chance: 80, Moon/Phobos/Asteroids/Ganymed/Mercury/Titan/Proteus/Pluto//
+achievement.Aluminium.desc=Height: 50-90, Chance: 80, Overworld
 achievement.Ilmenite=Find Ilmenite Ore
-achievement.Ilmenite.desc=Height: 10-80, Chance: 80, Moon/Phobos/Asteroids/Ganymed/Mercury/Titan/Proteus/Pluto//
+achievement.Ilmenite.desc=Height: 50-90, Chance: 80, Overworld
 achievement.RockSalt=Find RockSalt Ore
-achievement.RockSalt.desc=Height: 50-70, Chance: 50, Overworld/Twilight-Forrest/Mars//
+achievement.RockSalt.desc=Height: 50-60, Chance: 50, Overworld
 achievement.Salt=Find Salt Ore
-achievement.Salt.desc=Height: 50-70, Chance: 50, Overworld/Twilight-Forrest/Mars//
+achievement.Salt.desc=Height: 50-60, Chance: 50, Overworld
 achievement.Lepidolite=Find Lepidolite Ore
-achievement.Lepidolite.desc=Height: 50-70, Chance: 50, Overworld/Twilight-Forrest/Mars//
+achievement.Lepidolite.desc=Height: 50-60, Chance: 50, Overworld
 achievement.Spodumene=Find Spodumene Ore
-achievement.Spodumene.desc=Height: 50-70, Chance: 50, Overworld/Twilight-Forrest/Mars//
+achievement.Spodumene.desc=Height: 50-60, Chance: 50, Overworld
 achievement.Redstone=Find Redstone Ore
-achievement.Redstone.desc=Height: 5-40, Chance: 60, Overworld/Nether/Mars/Ganymed/Venus/Mercury//
+achievement.Redstone.desc=Height: 10-40, Chance: 60, Overworld/Nether
 achievement.Ruby=Find Ruby Ore
-achievement.Ruby.desc=Height: 5-40, Chance: 60, Overworld/Nether/Mars/Ganymed/Venus/Mercury//
+achievement.Ruby.desc=Height: 10-40, Chance: 60, Overworld/Nether
 achievement.Cinnabar=Find Cinnabar Ore
-achievement.Cinnabar.desc=Height: 5-40, Chance: 60, Overworld/Nether/Mars/Ganymed/Venus/Mercury//
+achievement.Cinnabar.desc=Height: 10-40, Chance: 60, Overworld/Nether
 achievement.Soapstone=Find Soapstone Ore
-achievement.Soapstone.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest//
+achievement.Soapstone.desc=Height: 10-40, Chance: 40, Overworld
 achievement.Talc=Find Talc Ore
-achievement.Talc.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest//
+achievement.Talc.desc=Height: 10-40, Chance: 40, Overworld
 achievement.Glauconite=Find Glauconite Ore
-achievement.Glauconite.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest//
+achievement.Glauconite.desc=Height: 10-40, Chance: 40, Overworld
 achievement.Pentlandite=Find Pentlandite Ore
-achievement.Pentlandite.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest//
+achievement.Pentlandite.desc=Height: 10-40, Chance: 40, Overworld
 achievement.Garnierite=Find Garnierite Ore
-achievement.Garnierite.desc=Height: 10-40, Chance: 40, Twilight-Forrest/End/End-Asteroids/Mars/Phobos/Deimos/Venus/Titan/Triton//
+achievement.Garnierite.desc=Height: 10-40, Chance: 40, Overworld/Nether/End
 achievement.Nickel=Find Nickel Ore
-achievement.Nickel.desc=Height: 10-40, Chance: 40, Twilight-Forrest/End/End-Asteroids/Mars/Phobos/Deimos/Venus/Mercury/Enceladus/Titan/Triton/Proteus/Pluto//
+achievement.Nickel.desc=Height: 10-40, Chance: 40, Overworld/Nether/End
 achievement.Cobaltite=Find Cobaltite Ore
-achievement.Cobaltite.desc=Height: 10-40, Chance: 40, Twilight-Forrest/End/End-Asteroids/Mars/Phobos/Deimos/Venus/Titan/Triton//
+achievement.Cobaltite.desc=Height: 10-40, Chance: 40, Overworld/Nether/End
 achievement.Cooperite=Find Cooperite Ore
-achievement.Cooperite.desc=Height: 40-50, Chance: 5, //
+achievement.Cooperite.desc=Height: 40-50, Chance: 5, Overworld/End
 achievement.Palladium=Find Palladium Ore
-achievement.Palladium.desc=Height: 5-30, Chance: 10, /Ceres/IO/Ganymed/Callisto/Venus/Mercury/Enceladus/Oberon/Pluto//
+achievement.Palladium.desc=Height: 40-50, Chance: 5, Overworld/End
 achievement.Platinum=Find Platinum Ore
-achievement.Platinum.desc=Height: 5-30, Chance: 10, /Ceres/IO/Ganymed/Callisto/Mercury/Oberon/Pluto//
+achievement.Platinum.desc=Height: 40-50, Chance: 5, Overworld/End
 achievement.Iridium=Find Iridium Ore
-achievement.Iridium.desc=Height: 5-30, Chance: 10, /Venus/Mercury/Enceladus/Titan/Proteus/Pluto//
+achievement.Iridium.desc=Height: 40-50, Chance: 5, Overworld/End
 achievement.Pitchblende=Find Pitchblende Ore
-achievement.Pitchblende.desc=Height: 30-60, Chance: 40, Moon/Phobos/IO/Venus/Oberon//
-achievement.Uranium=Find Uranium Ore
-achievement.Uranium.desc=Height: 30-60, Chance: 40, Mars/Phobos/Deimos/Ceres/IO/Gannymed/Venus/Enceladus/Oberon/Proteus//
+achievement.Pitchblende.desc=Height: 10-40, Chance: 40, Overworld
 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.Uraninite.desc=Height: 10-40, Chance: 40, Overworld
+achievement.Uranium=Find Uranium Ore
+achievement.Uranium.desc=Height: 20-30, Chance: 20, Overworld
 achievement.Bastnasite=Find Bastnasite Ore
-achievement.Bastnasite.desc=Height: 20-40, Chance: 30, Moon/Deimos/IO/Callisto/Venus/Enceladus/Titan/Triton//
+achievement.Bastnasite.desc=Height: 20-40, Chance: 30, Overworld
 achievement.Monazite=Find Monazite Ore
-achievement.Monazite.desc=Height: 20-40, Chance: 30, Moon/Deimos/IO/Callisto/Venus/Enceladus/Titan/Triton//
+achievement.Monazite.desc=Height: 20-40, Chance: 30, Overworld
 achievement.Neodymium=Find Neodymium Ore
-achievement.Neodymium.desc=Height: 20-40, Chance: 30, Moon/Deimos/IO/Callisto/Venus/Enceladus/Titan/Triton//
+achievement.Neodymium.desc=Height: 20-40, Chance: 30, Overworld
 achievement.Wulfenite=Find Wulfenite Ore
-achievement.Wulfenite.desc=Height: 20-50, Chance: 5, Nether/Twilight-Forrest/Moon/Phobos/Ceres/Mercury/Titan/Proteus/Pluto//
+achievement.Wulfenite.desc=Height: 20-50, Chance: 5, Overworld/End
 achievement.Molybdenite=Find Molybdenite Ore
-achievement.Molybdenite.desc=Height: 20-50, Chance: 5, Nether/Twilight-Forrest/Moon/Phobos/Ceres/Mercury/Titan/Proteus/Pluto//
+achievement.Molybdenite.desc=Height: 20-50, Chance: 5, Overworld/End
 achievement.Molybdenum=Find Molybdenum Ore
-achievement.Molybdenum.desc=Height: 20-50, Chance: 5, Nether/Twilight-Forrest/Moon/Phobos/Ceres/Mercury/Titan/Proteus/Pluto//
+achievement.Molybdenum.desc=Height: 20-50, Chance: 5, Overworld/End
 achievement.Powellite=Find Powellite Ore
-achievement.Powellite.desc=Height: 20-50, Chance: 5, Nether/Twilight-Forrest/Moon/Phobos/Ceres/Mercury/Titan/Proteus/Pluto//
+achievement.Powellite.desc=Height: 20-50, Chance: 5, Overworld/End
 achievement.Scheelite=Find Scheelite Ore
-achievement.Scheelite.desc=Height: 20-60, Chance: 10, Mars/Deimos/Asteroids/Ganymed/Callisto/Enceladus/Oberon/Pluto//
+achievement.Scheelite.desc=Height: 20-50, Chance: 10, Overworld/End
 achievement.Tungstate=Find Tungstate Ore
-achievement.Tungstate.desc=Height: 20-60, Chance: 10, Mars/Deimos/Asteroids/Ganymed/Callisto/Enceladus/Oberon/Pluto//
+achievement.Tungstate.desc=Height: 20-50, Chance: 10, Overworld/End
 achievement.Lithium=Find Lithium Ore
-achievement.Lithium.desc=Height: 20-60, Chance: 10, Mars/Deimos/Asteroids/Ganymed/Callisto/Enceladus/Oberon/Pluto//
+achievement.Lithium.desc=Height: 20-50, Chance: 10, Overworld/End
 achievement.Almandine=Find Almandine Ore
-achievement.Almandine.desc=Height: 10-40, Chance: 60, Twilight-Forrest//
+achievement.Almandine.desc=Height: 10-40, Chance: 60, Overworld
 achievement.Pyrope=Find Pyrope Ore
-achievement.Pyrope.desc=Height: 10-40, Chance: 60, Twilight-Forrest//
+achievement.Pyrope.desc=Height: 10-40, Chance: 60, Overworld
 achievement.Sapphire=Find Sapphire Ore
-achievement.Sapphire.desc=Height: 10-40, Chance: 60, Twilight-Forrest//
+achievement.Sapphire.desc=Height: 10-40, Chance: 60, Overworld
 achievement.GreenSapphire=Find GreenSapphire Ore
-achievement.GreenSapphire.desc=Height: 10-40, Chance: 60, Twilight-Forrest//
+achievement.GreenSapphire.desc=Height: 10-40, Chance: 60, Overworld
 achievement.Grossular=Find Grossular Ore
-achievement.Grossular.desc=Height: 20-30, Chance: 20, Overworld/Nether/Ceres/IO/Titan/Oberon/Triton//
+achievement.Grossular.desc=Height: 20-30, Chance: 20, Overworld/End
 achievement.Spessartine=Find Spessartine Ore
-achievement.Spessartine.desc=Height: 20-30, Chance: 20, Overworld/Nether/Ceres/IO/Titan/Oberon/Triton//
+achievement.Spessartine.desc=Height: 20-30, Chance: 20, Overworld/End
 achievement.Pyrolusite=Find Pyrolusite Ore
-achievement.Pyrolusite.desc=Height: 20-30, Chance: 20, Overworld/Nether/Ceres/IO/Titan/Oberon/Triton//
+achievement.Pyrolusite.desc=Height: 20-30, Chance: 20, Overworld/End
 achievement.Tantalite=Find Tantalite Ore
-achievement.Tantalite.desc=Height: 20-30, Chance: 20, Overworld/Nether/Ceres/IO/Titan/Oberon/Triton//
+achievement.Tantalite.desc=Height: 20-30, Chance: 20, Overworld/End
 achievement.Quartzite=Find Quartzite Ore
-achievement.Quartzite.desc=Height: 40-80, Chance: 60, Nether/Moon/Mars/Phobos/IO/Venus/Proteus//
+achievement.Quartzite.desc=Height: 40-80, Chance: 60, Overworld
 achievement.Barite=Find Barite Ore
-achievement.Barite.desc=Height: 40-80, Chance: 60, Nether/Moon/Mars/Phobos/IO/Venus/Proteus//
+achievement.Barite.desc=Height: 40-80, Chance: 60, Overworld
 achievement.CertusQuartz=Find CertusQuartz Ore
-achievement.CertusQuartz.desc=Height: 40-80, Chance: 60, Nether/Moon/Mars/Phobos/IO/Venus/Proteus//
+achievement.CertusQuartz.desc=Height: 40-80, Chance: 60, Overworld
 achievement.Graphite=Find Graphite Ore
-achievement.Graphite.desc=Height: 5-20, Chance: 40, Overworld/Twilight-Forrest/Phobos/Ganymed/Mercury/Titan/Proteus/Pluto//
+achievement.Graphite.desc=Height: 5-20, Chance: 40, Overworld
 achievement.Diamond=Find Diamond Ore
-achievement.Diamond.desc=Height: 5-20, Chance: 40, Overworld/Twilight-Forrest/Phobos/Ganymed/Mercury/Titan/Proteus/Pluto//
+achievement.Diamond.desc=Height: 5-20, Chance: 40, Overworld
 achievement.Bentonite=Find Bentonite Ore
-achievement.Bentonite.desc=Height: 10-40, Chance: 60, Twilight-Forrest//
+achievement.Bentonite.desc=Height: 10-40, Chance: 60, Overworld/End
 achievement.Magnesite=Find Magnesite Ore
-achievement.Magnesite.desc=Height: 10-40, Chance: 60, Twilight-Forrest//
+achievement.Magnesite.desc=Height: 10-40, Chance: 60, Overworld/End
 achievement.Olivine=Find Olivine Ore
-achievement.Olivine.desc=Height: 10-40, Chance: 60, Twilight-Forrest//
+achievement.Olivine.desc=Height: 10-40, Chance: 60, Overworld/End
 achievement.Apatite=Find Apatite Ore
-achievement.Apatite.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forrest//
+achievement.Apatite.desc=Height: 40-60, Chance: 60, Overworld
 achievement.Phosphorus=Find Phosphorus Ore
-achievement.Phosphorus.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forrest//
+achievement.Phosphorus.desc=Height: 40-60, Chance: 60, Overworld
 achievement.Phosphate=Find Phosphate Ore
-achievement.Phosphate.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forrest//
+achievement.Phosphate.desc=Height: 40-60, Chance: 60, Overworld
 achievement.Galena=Find Galena Ore
-achievement.Galena.desc=Height: 5-45, Chance: 40, Twilight-Forrest/Moon/Mars/Ganymed/Venus/Oberon/Triton//
+achievement.Galena.desc=Height: 30-60, Chance: 40, Overworld
 achievement.Silver=Find Silver Ore
-achievement.Silver.desc=Height: 5-45, Chance: 40, Twilight-Forrest/Moon/Mars/Ganymed/Venus/Oberon/Triton//
+achievement.Silver.desc=Height: 30-60, Chance: 40, Overworld
 achievement.Lead=Find Lead Ore
-achievement.Lead.desc=Height: 5-45, Chance: 40, Twilight-Forrest/Moon/Mars/Ganymed/Venus/Oberon/Triton//
+achievement.Lead.desc=Height: 30-60, Chance: 40, Overworld
 achievement.Lazurite=Find Lazurite Ore
-achievement.Lazurite.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest/Deimos/Ceres/Enceladus//
+achievement.Lazurite.desc=Height: 20-50, Chance: 40, Overworld/End
 achievement.Sodalite=Find Sodalite Ore
-achievement.Sodalite.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest/Deimos/Ceres/Enceladus//
+achievement.Sodalite.desc=Height: 20-50, Chance: 40, Overworld/End
 achievement.Lapis=Find Lapis Ore
-achievement.Lapis.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest/Deimos/Ceres/Enceladus//
+achievement.Lapis.desc=Height: 20-50, Chance: 40, Overworld/End
 achievement.Calcite=Find Calcite Ore
-achievement.Calcite.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest/Deimos/Ceres/Enceladus//
+achievement.Calcite.desc=Height: 20-50, Chance: 40, Overworld/End
 achievement.Beryllium=Find Beryllium Ore
-achievement.Beryllium.desc=Height: 5-30, Chance: 30, Nether/End-Asteroids/Mars/Ceres/Venus/Titan/Pluto//
+achievement.Beryllium.desc=Height: 5-30, Chance: 30, Overworld/End
 achievement.Emerald=Find Emerald Ore
-achievement.Emerald.desc=Height: 5-30, Chance: 30, Nether/End-Asteroids/Mars/Ceres/Venus/Titan/Pluto//
+achievement.Emerald.desc=Height: 5-30, Chance: 30, Overworld/End
 achievement.Thorium=Find Thorium Ore
-achievement.Thorium.desc=Height: 5-30, Chance: 30, Nether/End-Asteroids/Mars/Ceres/Venus/Titan/Pluto//
+achievement.Thorium.desc=Height: 5-30, Chance: 30, Overworld/End
+achievement.Oilsands=Find Oilsands Ore
+achievement.Oilsands.desc=Height: 50-80, Chance: 80, Overworld
 
 achievement.flintpick=First Tools
 achievement.flintpick.desc=Craft a flint pick
@@ -359,3 +372,37 @@ achievement.fullefficiency=Full Efficiency
 achievement.fullefficiency.desc=Craft a Plasma Generator III
 achievement.whatnow=What now?
 achievement.whatnow.desc=Craft a Ultimate Battery
+
+for.bees.species.clay=Clay
+for.bees.species.sli