diff --git a/src/main/java/biomesoplenty/common/init/ModBiomes.java b/src/main/java/biomesoplenty/common/init/ModBiomes.java
index 93c88f861..2b97e7c57 100644
--- a/src/main/java/biomesoplenty/common/init/ModBiomes.java
+++ b/src/main/java/biomesoplenty/common/init/ModBiomes.java
@@ -355,37 +355,37 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry
     
     public static void initExtendedBiomes()
     {
-        biomeWrapperMap = new HashMap<Integer, IExtendedBiome>();
+        biomeWrapperMap = new HashMap<>();
         
-        end_extension = registerWrappedBiome(new BiomeExtEnd(), "end");
-        mushroom_island_extension = registerWrappedBiome(new BiomeExtMushroomIsland(), "mushroom_island");
-        birch_forest_extension = registerWrappedBiome(new BiomeExtBirchForest(), "birch_forest");
-        birch_forest_hills_extension = registerWrappedBiome(new BiomeExtBirchForestHills(), "birch_forest_hills");
-        cold_taiga_extension = registerWrappedBiome(new BiomeExtColdTaiga(), "cold_taiga");
-        cold_taiga_hills_extension = registerWrappedBiome(new BiomeExtColdTaigaHills(), "cold_taiga_hills");
-        desert_extension = registerWrappedBiome(new BiomeExtDesert(), "desert");
-        desert_hills_extension = registerWrappedBiome(new BiomeExtDesertHills(), "desert_hills");
-        extreme_hills_extension = registerWrappedBiome(new BiomeExtExtremeHills(), "extreme_hills");
-        extreme_hills_plus_extension = registerWrappedBiome(new BiomeExtExtremeHillsPlus(), "extreme_hills+");
-        forest_extension = registerWrappedBiome(new BiomeExtForest(), "forest");
-        forest_hills_extension = registerWrappedBiome(new BiomeExtForestHills(), "forest_hills");
-        ice_plains_extension = registerWrappedBiome(new BiomeExtIcePlains(), "ice_plains");
-        ice_mountains_extension = registerWrappedBiome(new BiomeExtIceMountains(), "ice_mountains");
-        jungle_extension = registerWrappedBiome(new BiomeExtJungle(), "jungle");
-        jungle_hills_extension = registerWrappedBiome(new BiomeExtJungleHills(), "jungle_hills");
-        mega_taiga_extension = registerWrappedBiome(new BiomeExtMegaTaiga(), "mega_taiga");
-        mega_taiga_hills_extension = registerWrappedBiome(new BiomeExtMegaTaigaHills(), "mega_taiga_hills");
-        mesa_extension = registerWrappedBiome(new BiomeExtMesa(), "mesa");
-        mesa_plateau_extension = registerWrappedBiome(new BiomeExtMesaPlateau(), "mesa_plateau");
-        ocean_extension = registerWrappedBiome(new BiomeExtOcean(), "ocean");
-        plains_extension = registerWrappedBiome(new BiomeExtPlains(), "plains");
-        roofed_forest_extension = registerWrappedBiome(new BiomeExtRoofedForest(), "roofed_forest");
-        savanna_extension = registerWrappedBiome(new BiomeExtSavanna(), "savanna");
-        savanna_plateau_extension = registerWrappedBiome(new BiomeExtSavannaPlateau(), "savanna_plateau");
-        swampland_extension = registerWrappedBiome(new BiomeExtSwampland(), "swampland");
-        taiga_extension = registerWrappedBiome(new BiomeExtTaiga(), "taiga");
-        taiga_hills_extension = registerWrappedBiome(new BiomeExtTaigaHills(), "taiga_hills");
-        hell_extension = registerWrappedBiome(new BiomeExtHell(), "hell");
+        end_extension = registerWrappedBiome(new BiomeExtEnd());
+        mushroom_island_extension = registerWrappedBiome(new BiomeExtMushroomIsland());
+        birch_forest_extension = registerWrappedBiome(new BiomeExtBirchForest());
+        birch_forest_hills_extension = registerWrappedBiome(new BiomeExtBirchForestHills());
+        cold_taiga_extension = registerWrappedBiome(new BiomeExtColdTaiga());
+        cold_taiga_hills_extension = registerWrappedBiome(new BiomeExtColdTaigaHills());
+        desert_extension = registerWrappedBiome(new BiomeExtDesert());
+        desert_hills_extension = registerWrappedBiome(new BiomeExtDesertHills());
+        extreme_hills_extension = registerWrappedBiome(new BiomeExtExtremeHills());
+        extreme_hills_plus_extension = registerWrappedBiome(new BiomeExtExtremeHillsPlus());
+        forest_extension = registerWrappedBiome(new BiomeExtForest());
+        forest_hills_extension = registerWrappedBiome(new BiomeExtForestHills());
+        ice_plains_extension = registerWrappedBiome(new BiomeExtIcePlains());
+        ice_mountains_extension = registerWrappedBiome(new BiomeExtIceMountains());
+        jungle_extension = registerWrappedBiome(new BiomeExtJungle());
+        jungle_hills_extension = registerWrappedBiome(new BiomeExtJungleHills());
+        mega_taiga_extension = registerWrappedBiome(new BiomeExtMegaTaiga());
+        mega_taiga_hills_extension = registerWrappedBiome(new BiomeExtMegaTaigaHills());
+        mesa_extension = registerWrappedBiome(new BiomeExtMesa());
+        mesa_plateau_extension = registerWrappedBiome(new BiomeExtMesaPlateau());
+        ocean_extension = registerWrappedBiome(new BiomeExtOcean());
+        plains_extension = registerWrappedBiome(new BiomeExtPlains());
+        roofed_forest_extension = registerWrappedBiome(new BiomeExtRoofedForest());
+        savanna_extension = registerWrappedBiome(new BiomeExtSavanna());
+        savanna_plateau_extension = registerWrappedBiome(new BiomeExtSavannaPlateau());
+        swampland_extension = registerWrappedBiome(new BiomeExtSwampland());
+        taiga_extension = registerWrappedBiome(new BiomeExtTaiga());
+        taiga_hills_extension = registerWrappedBiome(new BiomeExtTaigaHills());
+        hell_extension = registerWrappedBiome(new BiomeExtHell());
     }
     
     private static void registerBiomeDictionaryTags()
@@ -598,12 +598,13 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry
         }
     }
     
-    private static IExtendedBiome registerWrappedBiome(IExtendedBiome extendedBiome, String idName)
+    private static IExtendedBiome registerWrappedBiome(IExtendedBiome extendedBiome)
     {
         //Non-wrapped biomes should not be registered this way
         if (extendedBiome.getBaseBiome() instanceof IExtendedBiome)
             throw new IllegalArgumentException("Biome already implements IExtendedBiome, it should be registered appropriately");
 
+        String idName = extendedBiome.getResourceLocation().getResourcePath();
         extendedBiome.configure(readConfigFile(idName));
         return BOPBiomes.REG_INSTANCE.registerBiome(extendedBiome, idName);
     }
diff --git a/src/main/java/biomesoplenty/common/world/GenerationManager.java b/src/main/java/biomesoplenty/common/world/GenerationManager.java
index 2deb36b11..fa36a48c1 100644
--- a/src/main/java/biomesoplenty/common/world/GenerationManager.java
+++ b/src/main/java/biomesoplenty/common/world/GenerationManager.java
@@ -10,6 +10,7 @@ package biomesoplenty.common.world;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 import com.google.common.collect.ImmutableCollection;
@@ -60,9 +61,12 @@ public class GenerationManager implements IGenerationManager
 
     public void configure(IConfigObj generatorsObj)
     {
+        Iterator<String> genKeysItr = generators.keySet().iterator();
+
         // iterate over all registered generators
-        for (String name : generators.keySet())
+        while (genKeysItr.hasNext())
         {
+            String name = genKeysItr.next();
             IConfigObj currentObj = generatorsObj.getObject(name);
 
             // there was previously no generator of this name - attempt to add it
@@ -80,7 +84,7 @@ public class GenerationManager implements IGenerationManager
                 this.generators.get(name).configure(currentObj);
             } else {
                 // remove this generator
-                this.generators.remove(name);
+                genKeysItr.remove();
             }
         }
     }
diff --git a/src/main/resources/assets/biomesoplenty/lang/pl_PL.lang b/src/main/resources/assets/biomesoplenty/lang/pl_PL.lang
new file mode 100644
index 000000000..58a165b9f
--- /dev/null
+++ b/src/main/resources/assets/biomesoplenty/lang/pl_PL.lang
@@ -0,0 +1,426 @@
+advancements.biomesoplenty.root.title=Biomes O' Plenty
+advancements.biomesoplenty.root.description=Sen odkrywcy...
+advancements.biomesoplenty.sacred_oak_sapling.title=Yggdrasil
+advancements.biomesoplenty.sacred_oak_sapling.description=Zasadź sadzonkę olbrzymiego Świętego Dębu 
+advancements.biomesoplenty.yin_and_yang.title=Yin i Yang
+advancements.biomesoplenty.yin_and_yang.description=Umieść Kwiat blasku w Złowieszczych Lasach i Kwiat Śmierci w Gaju Mistycznym
+advancements.biomesoplenty.miners_delight.title=Życie znajdzie drogę
+advancements.biomesoplenty.miners_delight.description=Znajdź kwiat Radość Górników głęboko w grocie
+advancements.biomesoplenty.harvest_turnip.title=Rynek warzyw
+advancements.biomesoplenty.harvest_turnip.description=Zbierz rzepę
+advancements.biomesoplenty.flesh_and_blood.title=Ciało i krew
+advancements.biomesoplenty.flesh_and_blood.description=Zbierz mięso z Visceral Heap
+advancements.biomesoplenty.honey_hell.title=Miód piekielny
+advancements.biomesoplenty.honey_hell.description=Ukradnij nieco słodkiego miodu z ula netherowych os
+advancements.biomesoplenty.terrestrial_artifact.title=Gdy połączysz swe moce
+advancements.biomesoplenty.terrestrial_artifact.description=Znajdź w biomach po jednym z ośmiu cennych klejnotów
+advancements.biomesoplenty.craft_biome_finder.title=Search Party
+advancements.biomesoplenty.craft_biome_finder.description=Stwórz Poszukiwacz biomów, by służył jako przewodnik na Twojej drodze
+advancements.biomesoplenty.all_biomes.title=Wędrowiec
+advancements.biomesoplenty.all_biomes.description=Odkryj każdy biom z zestawu Biomes O 'Plenty
+
+biome_finder.searching=Searching for %s
+biome_finder.found=Found %s!
+biome_finder.not_found=Not found, maybe %s is too far away
+
+config.category.convenienceSettings.title=Ustawienia udogodnień
+config.category.guiSettings.title=Ustawienia GUI
+config.category.textureSettings.title=Ustawienia tekstur
+config.category.trailSettings.title=Ustawienia tras
+config.category.convenienceSettings.tooltip=Ustawienia wygodnej obsługi.
+config.category.guiSettings.tooltip=Ustawienia związane z GUI.
+config.category.textureSettings.tooltip=Ustawienia związane z teksturami.
+config.category.trailSettings.tooltip=Ustawienia modyfikujące widoczność szlaku.
+
+commands.biomesoplenty.usage=/biomesoplenty <tpbiome|biomename|stripchunk> [args]
+commands.biomesoplenty.biomename.usage=/biomesoplenty biomename [biomeId]
+commands.biomesoplenty.biomename.success=Biome ID %s is associated with %s
+commands.biomesoplenty.tpbiome.usage=/biomesoplenty tpbiome [biomeId]
+commands.biomesoplenty.tpbiome.success=Teleported %s to biome %s at (%s, %s, %s)
+commands.biomesoplenty.tpbiome.error=Couldn't find biome %s!
+commands.biomesoplenty.stats.blocks=Blocks: %s
+commands.biomesoplenty.stats.items=Items: %s
+commands.biomesoplenty.stats.entities=Entities: %s
+commands.biomesoplenty.stats.biomes=Biomes: %s
+commands.biomesoplenty.stripchunk.usage=/biomesoplenty stripchunk [radius] <include|exclude> [block] [metadata]
+
+container.flower_basket=Kosz na kwiaty
+
+generator.BIOMESOP=Biomes O' Plenty
+generator.BIOMESOP.info=Notice: Biomes O 'Plenty 1.12-7.0.0.2291-uniwersalne
+
+itemGroup.tabBiomesOPlenty=Biomes O' Plenty
+
+fluid.blood=z krwią
+fluid.honey=z netherowym miodem
+fluid.hot_spring_water=z wodą z gorących źródeł
+fluid.poison=z trucizną
+fluid.sand=z ruchomymi piaskami
+
+item.forge.bucketFilled.name=Wiadro %s
+
+item.ambrosia.name=Ambrozja
+item.ash.name=Kupka popiołu
+item.berries.name=Jagoda
+item.biome_essence.name=Esencja biomu
+item.biome_finder.name=Poszukiwacz biomów
+item.black_dye.name=Czarny barwnik
+item.blue_dye.name=Niebieski barwnik
+item.brown_dye.name=Brązowy barwnik
+item.cherry_door.name=Wiśniowe drzwi
+item.crystal_shard.name=Niebiański kryształowy fragment
+item.terrestrial_artifact.name=Ziemski artefakt
+item.ebony_door.name=Hebanowe drzwi
+item.ethereal_door.name=Eteryczne drzwi
+item.eucalyptus_door.name=Eukaliptusowe drzwi
+item.filled_honeycomb.name=Wypełniony plaster netherowego miodu
+item.fir_door.name=Jodłowe drzwi
+item.fleshchunk.name=Kawałek mięsa
+item.flower_basket.name=Kosz na kwiaty
+item.gem_amber.name=Bursztyn
+item.gem_amethyst.name=Ametyst Endera
+item.gem_malachite.name=Malachit
+item.gem_peridot.name=Oliwin
+item.gem_ruby.name=Rubin
+item.gem_sapphire.name=Szafir
+item.gem_tanzanite.name=Tanzanit
+item.gem_topaz.name=Topaz
+item.green_dye.name=Zielony barwnik
+item.hellbark_door.name=Drzwi z piekielnego drewna
+item.honeycomb.name=Pusty plaster netherowego miodu
+item.jacaranda_door.name=Jakarandowe drzwi
+item.jar_empty.name=Pusty słoik
+item.jar_filled_honey.name=Słoik netherowego miodu
+item.jar_filled_pixie.name=Słoik z wróżką
+item.magic_door.name=Drzwi z magicznego drewna
+item.mahogany_door.name=Mahoniowe drzwi
+item.mangrove_door.name=Namorzynowe drzwi
+item.mudball.name=Kula mułu
+item.mud_brick.name=Cegły mułowe
+item.palm_door.name=Palmowe drzwi
+item.persimmon.name=Persymona
+item.peach.name=Brzoskwinia
+item.pear.name=Gruszka
+item.pinecone.name=Szyszka
+item.pine_door.name=Sosnowe drzwi
+item.pixie_dust.name=Pyłek wróżki
+item.record_wanderer.name=Płyta muzyczna
+item.record.wanderer.desc=Tim Rurkowski - Wanderer
+item.redwood_door.name=Cedrowe drzwi
+item.ricebowl.name=Miska ryżu
+item.sacred_oak_door.name=Drzwi ze Świętego Dębu
+item.saladfruit.name=Sałatka owocowa
+item.saladveggie.name=Sałatka wegetariańska
+item.saladshroom.name=Sałatka z muchomorów
+item.shroompowder.name=Proszek z muchomorów
+item.turnip.name=Rzepa
+item.turnip_seeds.name=Sadzonka rzepy
+item.umbran_door.name=Umbrowe drzwi
+item.white_dye.name=Biały barwnik
+item.willow_door.name=Wierzbowe drzwi
+
+tile.ash_block.name=Blok popiołu
+tile.bamboo.name=Bambus
+tile.bamboo_thatching.name=Sprasowany bambus
+tile.biome_block.name=Ruda esencji biomu
+tile.cherry_fence.name=Wiśniowy płot
+tile.cherry_fence_gate.name=Wiśniowa furtka
+tile.cherry_wood_slab.name=Wiśniowa płyta
+tile.cherry_stairs.name=Wiśniowe schody
+tile.coral.pink_coral.name=Różowy koral
+tile.coral.orange_coral.name=Pomarańczowy koral
+tile.coral.blue_coral.name=Niebieski koral
+tile.coral.glowing_coral.name=Rozżarzony koral
+tile.coral.algae.name=Algi
+tile.dirt.loamy_dirt.name=Iłowe błoto
+tile.dirt.sandy_dirt.name=Piaskowe błoto
+tile.dirt.silty_dirt.name=Mułowe błoto
+tile.dirt.coarse_loamy_dirt.name=Szorstkie iłowe błoto
+tile.dirt.coarse_sandy_dirt.name=Szorstkie piaskowe błoto
+tile.dirt.coarse_silty_dirt.name=Szorstkie mułowe błoto
+tile.double_plant.flax.name=Len
+tile.double_plant.tall_cattail.name=Wysokie zarośla
+tile.double_plant.eyebulb.name=Bulwy oczne
+tile.ebony_fence.name=Hebanowy płot
+tile.ebony_fence_gate.name=Hebanowa furtka
+tile.ebony_wood_slab.name=Hebanowa płyta
+tile.ebony_stairs.name=Hebanowe schody
+tile.ethereal_fence.name=Eteryczny płot
+tile.ethereal_fence_gate.name=Eteryczna furtka
+tile.ethereal_wood_slab.name=Eteryczna płyta
+tile.ethereal_stairs.name=Eteryczne schody
+tile.eucalyptus_fence.name=Eukaliptusowy płot
+tile.eucalyptus_fence_gate.name=Eukaliptusowa furtka
+tile.eucalyptus_wood_slab.name=Eukaliptusowa płyta
+tile.eucalyptus_stairs.name=Eukaliptusowe schody
+tile.farmland_0.loamy_farmland.name=Iłowe grunty rolne
+tile.farmland_0.sandy_farmland.name=Piaszczyste grunty rolne
+tile.farmland_1.silty_farmland.name=Mułowe grunty rolne
+tile.fir_fence.name=Jodłowy płot
+tile.fir_fence_gate.name=Jodłowa furtka
+tile.fir_wood_slab.name=Jodłowa płyta
+tile.fir_stairs.name=Jodłowe schody
+tile.flesh.name=Blok mięsa
+tile.flower_0.clover.name=Koniczyna
+tile.flower_0.swampflower.name=Kwiat bagienny
+tile.flower_0.deathbloom.name=Kwiat śmierci
+tile.flower_0.glowflower.name=Kwiat blasku
+tile.flower_0.blue_hydrangea.name=Niebieska hortensja
+tile.flower_0.orange_cosmos.name=Kosmos siarkowy
+tile.flower_0.pink_daffodil.name=Różowy żonkil
+tile.flower_0.wildflower.name=Łubin
+tile.flower_0.violet.name=Fiołek
+tile.flower_0.white_anemone.name=Biały anemon
+tile.flower_0.enderlotus.name=Enderlotus
+tile.flower_0.bromeliad.name=Bromelia
+tile.flower_0.wilted_lily.name=Zwiędła lilia
+tile.flower_0.pink_hibiscus.name=Różowa ketmia
+tile.flower_0.lily_of_the_valley.name=Konwalia majowa
+tile.flower_0.burning_blossom.name=Płonący kwiat
+tile.flower_1.lavender.name=Lawenda
+tile.flower_1.goldenrod.name=Nawłoć
+tile.flower_1.bluebells.name=Hiacynt
+tile.flower_1.miners_delight.name=Radość Górników
+tile.flower_1.icy_iris.name=Lodowy irys
+tile.flower_1.rose.name=Róża
+tile.flower_vine.name=Kwiecista winorośl
+tile.gem_block.amethyst_block.name=Blok ametystu
+tile.gem_block.ruby_block.name=Blok rubinu
+tile.gem_block.peridot_block.name=Blok oliwinu
+tile.gem_block.topaz_block.name=Blok topazu
+tile.gem_block.tanzanite_block.name=Blok tanzanitu
+tile.gem_block.malachite_block.name=Blok malachitu
+tile.gem_block.sapphire_block.name=Blok szafiru
+tile.gem_block.amber_block.name=Blok bursztynu
+tile.gem_ore.amethyst_ore.name=Ruda ametystu Endera
+tile.gem_ore.ruby_ore.name=Ruda rubinu
+tile.gem_ore.peridot_ore.name=Ruda oliwinu
+tile.gem_ore.topaz_ore.name=Ruda topazu
+tile.gem_ore.tanzanite_ore.name=Ruda tanzanitu
+tile.gem_ore.malachite_ore.name=Ruda malachitu
+tile.gem_ore.sapphire_ore.name=Ruda szafiru
+tile.gem_ore.amber_ore.name=Ruda bursztynu
+tile.grass.daisy_grass_block.name=Blok kwiecistej trawy
+tile.grass.spectral_moss.name=Widmowy mech
+tile.grass.overgrown_stone.name=Porośnięty kamień
+tile.grass.loamy_grass_block.name=Blok iłu z trawą
+tile.grass.sandy_grass_block.name=Blok piasku z trawą
+tile.grass.silty_grass_block.name=Blok mułowy z trawą
+tile.grass.origin_grass_block.name=Blok originu z trawą
+tile.grass.overgrown_netherrack.name=Zarośnięty netherrack
+tile.grass.mycelial_netherrack.name=Grzybnia na netherracku
+tile.grass_path.grass_loamy_path.name=Ścieżka w trawie iłowej
+tile.grass_path.grass_sandy_path.name=Ścieżka w trawie piaskowej
+tile.grass_path.grass_silty_path.name=Ścieżka w trawie mułowej
+tile.hellbark_fence.name=Płot z piekielnego drewna
+tile.hellbark_fence_gate.name=Furtka z piekielnego drewna
+tile.hellbark_wood_slab.name=Płyta z piekielnego drewna
+tile.hellbark_stairs.name=Schody z piekielnego drewna
+tile.hive.hive_block.name=Blok netherowego ula
+tile.hive.honeycomb_block.name=Blok plastra netherowego miodu
+tile.hive.empty_honeycomb_block.name=Blok pustego plastra netherowego miodu
+tile.hive.filled_honeycomb_block.name=Blok wypełnionego plastra netherowego miodu
+tile.honey_block.name=Blok netherowego miodu
+tile.ivy.name=Bluszcz
+tile.jacaranda_fence.name=Jakarandowy płot
+tile.jacaranda_fence_gate.name=Jakarandowa furtka
+tile.jacaranda_wood_slab.name=Jakarandowa płyta
+tile.jacaranda_stairs.name=Jakarandowe schody
+tile.jelled_poison.name=Trująca galarets
+tile.leaves_0.yellow_autumn_leaves.name=Liście żółtej jesieni
+tile.leaves_0.orange_autumn_leaves.name=Liście złotej jesieni
+tile.leaves_0.bamboo_leaves.name=Bambusowe liście
+tile.leaves_0.magic_leaves.name=Liście magicznego drzewa
+tile.leaves_1.umbran_leaves.name=Umbrowe liście
+tile.leaves_1.dead_leaves.name=Martwe liście
+tile.leaves_1.fir_leaves.name=Jodłowe liście
+tile.leaves_1.ethereal_leaves.name=Eteryczne liście
+tile.leaves_2.origin_leaves.name=Liście originu
+tile.leaves_2.pink_cherry_leaves.name=Liście różowej wiśni
+tile.leaves_2.white_cherry_leaves.name=Liście białej wiśni
+tile.leaves_2.maple_leaves.name=Klonowe liście
+tile.leaves_3.hellbark_leaves.name=Piekielne liście
+tile.leaves_3.flowering_leaves.name=Liście kwitnącego dębu
+tile.leaves_3.jacaranda_leaves.name=Jakarandowe liście
+tile.leaves_3.sacred_oak_leaves.name=Liście Świętego Dębu
+tile.leaves_4.mangrove_leaves.name=Namorzynowe liście
+tile.leaves_4.palm_leaves.name=Palmowe liście
+tile.leaves_4.redwood_leaves.name=Cedrowe liście
+tile.leaves_4.willow_leaves.name=Wierzbowe liście
+tile.leaves_5.pine_leaves.name=Sosnowe liście
+tile.leaves_5.mahogany_leaves.name=Mahoniowe liście
+tile.leaves_5.ebony_leaves.name=Hebanowe liście
+tile.leaves_5.eucalyptus_leaves.name=Eukaliptusowe liście
+tile.leaves_6.red_big_flower_petal.name=Czerwony płatek olbrzymiego kwiatu
+tile.leaves_6.yellow_big_flower_petal.name=Żółty płatek olbrzymiego kwiatu
+tile.log_0.sacred_oak_log.name=Drewno Świętego Dębu
+tile.log_0.cherry_log.name=Wiśniowe drewno
+tile.log_0.umbran_log.name=Umbrowe drewno
+tile.log_0.fir_log.name=Jodłowe drewno
+tile.log_1.ethereal_log.name=Eteryczne drewno
+tile.log_1.magic_log.name=Drewno magicznego drzewa
+tile.log_1.mangrove_log.name=Namorzynowe drewno
+tile.log_1.palm_log.name=Palmowe drewno
+tile.log_2.redwood_log.name=Cedrowe drewno
+tile.log_2.willow_log.name=Wierzbowe drewno
+tile.log_2.pine_log.name=Sosnowe drewno
+tile.log_2.hellbark_log.name=Piekielne drewno
+tile.log_3.jacaranda_log.name=Jakarandowe drewno
+tile.log_3.mahogany_log.name=Mahoniowe drewno
+tile.log_3.ebony_log.name=Hebanowe drewno
+tile.log_3.eucalyptus_log.name=Eukaliptusowe drewno
+tile.log_4.giant_flower_stem.name=Łodyga olbrzymiego kwiatu
+tile.log_4.dead_log.name=Martwe drewno
+tile.magic_fence.name=Płot z magicznego drewna
+tile.magic_fence_gate.name=Furtka z magicznego drewna
+tile.magic_wood_slab.name=Płyta z magicznego drewna
+tile.magic_stairs.name=Schody z magicznego drewna
+tile.mahogany_fence.name=Mahoniowy płot
+tile.mahogany_fence_gate.name=Mahoniowa furtka
+tile.mahogany_wood_slab.name=Mahoniowa płyta
+tile.mahogany_stairs.name=Mahoniowe schody
+tile.mangrove_fence.name=Namorzynowy płot
+tile.mangrove_fence_gate.name=Namorzynowa furtka
+tile.mangrove_wood_slab.name=Namorzynowa płyta
+tile.mangrove_stairs.name=Namorzynowe schody
+tile.mud.mud.name=Muł
+tile.mud_brick_block.name=Mułowe cegły
+tile.mud_brick_slab.name=Płyta z mułowych cegieł
+tile.mud_brick_stairs.name=Schody z mułowych cegieł
+tile.mushroom.toadstool.name=Muchomor
+tile.mushroom.portobello.name=Pieczarka portobello
+tile.mushroom.blue_milk_cap.name=Mleczaj niebieski
+tile.mushroom.glowshroom.name=Świecący grzyb
+tile.mushroom.flat_mushroom.name=Płaski grzyb
+tile.mushroom.shadow_shroom.name=Mroczny grzyb
+tile.palm_fence.name=Palmowy płot
+tile.palm_fence_gate.name=Palmowa furtka
+tile.palm_wood_slab.name=Palmowa płyta
+tile.palm_stairs.name=Palmowe schody
+tile.pine_fence.name=Sosnowy płot
+tile.pine_fence_gate.name=Sosnowa furtka
+tile.pine_wood_slab.name=Sosnowa płyta
+tile.pine_stairs.name=Sosnowe schody
+tile.planks_0.sacred_oak_planks.name=Deski ze Świętego Dębu
+tile.planks_0.cherry_planks.name=Wiśniowe deski
+tile.planks_0.umbran_planks.name=Umbrowe deski
+tile.planks_0.fir_planks.name=Jodłowe deski
+tile.planks_0.ethereal_planks.name=Eteryczne deski
+tile.planks_0.magic_planks.name=Deski z magicznego drewna
+tile.planks_0.mangrove_planks.name=Namorzynowe deski
+tile.planks_0.palm_planks.name=Palmowe deski
+tile.planks_0.redwood_planks.name=Cedrowe deski
+tile.planks_0.willow_planks.name=Wierzbowe deski
+tile.planks_0.bamboo_thatching.name=Sprasowany bambus
+tile.planks_0.pine_planks.name=Sosnowe deski
+tile.planks_0.hellbark_planks.name=Deski z piekielnego drewna
+tile.planks_0.jacaranda_planks.name=Jakarandowe deski
+tile.planks_0.mahogany_planks.name=Mahoniowe deski
+tile.planks_0.ebony_planks.name=Hebanowe deski
+tile.planks_0.eucalyptus_planks.name=Eukaliptusowe deski
+tile.plant_0.shortgrass.name=Niska trawa
+tile.plant_0.mediumgrass.name=Średnia trawa
+tile.plant_0.bush.name=Krzak
+tile.plant_0.sprout.name=Latorośl
+tile.plant_0.poisonivy.name=Trujący bluszcz
+tile.plant_0.berrybush.name=Krzak jagodowy
+tile.plant_0.shrub.name=Krzew
+tile.plant_0.wheatgrass.name=Dzika pszenica
+tile.plant_0.dampgrass.name=Wilgotna trawa
+tile.plant_0.koru.name=Paproć Koru
+tile.plant_0.cloverpatch.name=Poletko koniczyny
+tile.plant_0.leafpile.name=Stos liści
+tile.plant_0.deadleafpile.name=Stos martwych liści
+tile.plant_0.deadgrass.name=Martwa trawa
+tile.plant_0.desertgrass.name=Pustynna trawa
+tile.plant_0.desertsprouts.name=Pustynne kapusty
+tile.plant_1.dunegrass.name=Wydmowa trawa
+tile.plant_1.spectralfern.name=Widmowa paproć
+tile.plant_1.thorn.name=Ciernie
+tile.plant_1.wildrice.name=Dziki ryż
+tile.plant_1.cattail.name=Pałka
+tile.plant_1.rivercane.name=Trzcina cukrowa
+tile.plant_1.tinycactus.name=Malutki kaktus
+tile.plant_1.devilweed.name=Diabelski chwast
+tile.plant_1.reed.name=Trzcina
+tile.plant_1.root.name=Korzeń
+tile.plant_1.rafflesia.name=Bukietnica
+tile.redwood_fence.name=Cedrowy płot
+tile.redwood_fence_gate.name=Cedrowa furtka
+tile.redwood_wood_slab.name=Cedrowa płyta
+tile.redwood_stairs.name=Cedrowe schody
+tile.sacred_oak_fence.name=Płot ze Świętego Dębu
+tile.sacred_oak_fence_gate.name=Furtka ze Świętego Dębu
+tile.sacred_oak_wood_slab.name=Płyta ze Świętego Dębu
+tile.sacred_oak_stairs.name=Schody ze Świętego Dębu
+tile.sapling_0.yellow_autumn_sapling.name=Sadzonka żółtej jesieni
+tile.sapling_0.orange_autumn_sapling.name=Sadzonka złotej jesieni
+tile.sapling_0.bamboo_sapling.name=Sadzonka bambusa
+tile.sapling_0.magic_sapling.name=Sadzonka magicznego drzewa
+tile.sapling_0.umbran_sapling.name=Sadzonka umbru
+tile.sapling_0.dead_sapling.name=Martwa sadzonka
+tile.sapling_0.fir_sapling.name=Sadzonka jodły
+tile.sapling_0.ethereal_sapling.name=Sadzonka eterycznego drzewa
+tile.sapling_1.origin_sapling.name=Sadzonka Originu
+tile.sapling_1.pink_cherry_sapling.name=Sadzonka różowej wiśni
+tile.sapling_1.white_cherry_sapling.name=Sadzonka białej wiśni
+tile.sapling_1.maple_sapling.name=Sadzonka klonu
+tile.sapling_1.hellbark_sapling.name=Sadzonka piekielnego drzewa
+tile.sapling_1.flowering_sapling.name=Sadzonka kwitnącego dębu
+tile.sapling_1.jacaranda_sapling.name=Sadzonka jakarandy
+tile.sapling_1.sacred_oak_sapling.name=Sadzonka Świętego Dębu
+tile.sapling_2.mangrove_sapling.name=Sadzonka namorzynu
+tile.sapling_2.palm_sapling.name=Sadzonka palmy
+tile.sapling_2.redwood_sapling.name=Sadzonka cedru
+tile.sapling_2.willow_sapling.name=Sadzonka wierzby
+tile.sapling_2.pine_sapling.name=Sadzonka sosny
+tile.sapling_2.mahogany_sapling.name=Sadzonka mahoniu
+tile.sapling_2.ebony_sapling.name=Sadzonka hebanu
+tile.sapling_2.eucalyptus_sapling.name=Sadzonka eukaliptusa
+tile.seaweed.kelp.name=Wodorosty
+tile.stone_formations.stone_formation.name=Formacja skalna
+tile.terrarium.terrarium_fern.name=Paprociowe Terrarium
+tile.terrarium.terrarium_mushroom.name=Grzybowe terrarium
+tile.terrarium.terrarium_cactus.name=Kaktusowe terrarium
+tile.terrarium.terrarium_flax.name=Lniane terrarium
+tile.terrarium.terrarium_flower.name=Kwietne terrarium
+tile.terrarium.terrarium_koru.name=Koru terrarium
+tile.terrarium.terrarium_bamboo.name=Bambusowe terrarium
+tile.terrarium.terrarium_sapling.name=Drzewne terrarium
+tile.terrarium.terrarium_glowshroom.name=Terrarium świecących grzybów
+tile.terrarium.terrarium_dead.name=Martwe terrarium
+tile.terrarium.terrarium_mystic.name=Mistyczne terrarium
+tile.terrarium.terrarium_ominous.name=Złowieszcze terrarium
+tile.terrarium.terrarium_wasteland.name=Nieużytkowe terrarium
+tile.terrarium.terrarium_origin.name=Originowe terrarium
+tile.terrarium.terrarium_nether.name=Netherowe terrarium
+tile.terrarium.terrarium_ender.name=Enderowe terrarium
+tile.tree_moss.name=Umbrowe pnącza
+tile.turnip_block.name=Rzepa
+tile.umbran_fence.name=Umbrowy płot
+tile.umbran_fence_gate.name=Umbrowa furtka
+tile.umbran_wood_slab.name=Umbrowa płyta
+tile.umbran_stairs.name=Umbrowe schody
+tile.waterlily.lily_medium.name=Średni liść lilii wodnej
+tile.waterlily.lily_small.name=Małe liście lilii wodnej
+tile.waterlily.lily_tiny.name=Malutkie liście lilii wodnej
+tile.waterlily.lily_flower.name=Kwiatowa lilia wodna 
+tile.white_sand.name=Biały piasek
+tile.white_sandstone.white_sandstone.name=Biały piaskowiec
+tile.white_sandstone.chiseled_white_sandstone.name=Rzeźbiony biały piaskowiec
+tile.white_sandstone.smooth_white_sandstone.name=Gładki biały piaskowiec
+tile.white_sandstone_slab.name=Płyta z białego piaskowca
+tile.white_sandstone_stairs.name=Schody z białego piaskowca
+tile.willow_fence.name=Wierzbowy płot
+tile.willow_fence_gate.name=Wierzbowa furtka
+tile.willow_wood_slab.name=Wierzbowa płyta
+tile.willow_stairs.name=Wierzbowe schody
+tile.willow_vine.name=Wierzbowe pnącza
+tile.hard_ice.name=Utwardzony lód
+tile.dried_sand.name=Brudny piach
+tile.mud_brick.name=Mułowe cegły
+tile.crystal.name=Celestial Crystal
+
+entity.biomesoplenty.mudball.name=Kula mułu
+entity.biomesoplenty.pixie.name=Wróżka
+entity.biomesoplenty.wasp.name=Netherowa osa
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/lang/zh_CN.lang b/src/main/resources/assets/biomesoplenty/lang/zh_CN.lang
index 78417b472..8a77b0068 100644
--- a/src/main/resources/assets/biomesoplenty/lang/zh_CN.lang
+++ b/src/main/resources/assets/biomesoplenty/lang/zh_CN.lang
@@ -1,51 +1,27 @@
-#Translate by PeakXing from gxy17886,Adubbz,TartaricAcid
-
-achievement.obtain_flowers=幼小的花朵
-achievement.obtain_flowers.desc=找到一朵花！
-achievement.obtain_berry=美味的浆果
-achievement.obtain_berry.desc=从浆果丛中采集一颗浆果
-achievement.obtain_coral=完整的珊瑚!
-achievement.obtain_coral.desc=潜入深海寻找珊瑚
-achievement.obtain_miners_delight=生命会自己寻找出路
-achievement.obtain_miners_delight.desc=在洞穴里面找到一株乐矿花
-achievement.eat_shroom_powder=轻快的舞蹈
-achievement.eat_shroom_powder.desc=品尝一些拥有魔力的蘑菇粉
-achievement.obtain_turnip=块茎植物的市场
-achievement.obtain_turnip.desc=采集一颗芜菁
-achievement.grow_sacred_oak=世界之树
-achievement.grow_sacred_oak.desc=种植一株神圣橡树树苗
-achievement.craft_flax_string=亚麻色的乐趣
-achievement.craft_flax_string.desc=把亚麻做成麻线
-achievement.craft_muddy_pickaxe=获得降级
-achievement.craft_muddy_pickaxe.desc=制作一把...泥巴稿...?
-achievement.obtain_thorn=相当的棘手
-achievement.obtain_thorn.desc=采集荆棘！
-achievement.obtain_deathbloom=我成为了死神
-achievement.obtain_deathbloom.desc=获取致命的死亡之花
-achievement.obtain_honeycomb=大蜂窝
-achievement.obtain_honeycomb.desc=从地狱偷取一个填满的蜂窝
-achievement.obtain_soul=寻找灵魂
-achievement.obtain_soul.desc=取回失落之魂
-achievement.obtain_wilted_lily=天赐之福
-achievement.obtain_wilted_lily.desc=拯救一株枯萎的百合花
-achievement.obtain_pixie_dust=不要吸入它
-achievement.obtain_pixie_dust.desc=杀死精灵并获得精灵之尘
-achievement.obtain_celestial_crystal=遥远的地方...
-achievement.obtain_celestial_crystal.desc=在末地采集仙域水晶碎片
-achievement.craft_terrestrial_artifact=能量兼并
-achievement.craft_terrestrial_artifact.desc=融和八个生物群系特有的矿石
-achievement.craft_ambrosia=上帝的美酒
-achievement.craft_ambrosia.desc=糖，水，蜂蜜，浆果，根，海带，脓血，精灵之尘，还有仙域水晶碎片!
-achievement.explore_all_biomes=孤独的流浪者
-achievement.explore_all_biomes.desc=发现所有的生物群系
-achievement.use_enderporter=回家吧
-achievement.use_enderporter.desc=用末地传送器回到出生点
-achievement.use_biome_finder=搜索小队
-achievement.use_biome_finder.desc=使用生物群系雷达定位一个生物群系
+advancements.biomesoplenty.root.title=超多生物群系
+advancements.biomesoplenty.root.description=每个探险家的梦想...
+advancements.biomesoplenty.sacred_oak_sapling.title=世界树
+advancements.biomesoplenty.sacred_oak_sapling.description=种植出一颗巨大的神圣橡木
+advancements.biomesoplenty.yin_and_yang.title=阴阳
+advancements.biomesoplenty.yin_and_yang.description=到不详树林中放萤火虫，然后到神秘树林中找到死亡花。
+advancements.biomesoplenty.miners_delight.title=生存法则
+advancements.biomesoplenty.miners_delight.description=在矿洞中找到乐矿花
+advancements.biomesoplenty.harvest_turnip.title=扩充贸易
+advancements.biomesoplenty.harvest_turnip.description=收获萝卜
+advancements.biomesoplenty.flesh_and_blood.title=肮脏的交易
+advancements.biomesoplenty.flesh_and_blood.description=从地狱中获取肉。
+advancements.biomesoplenty.honey_hell.title=甜美与恐惧
+advancements.biomesoplenty.honey_hell.description=从地狱的蜂巢中偷窃一些蜂蜜。
+advancements.biomesoplenty.terrestrial_artifact.title=无限手套的集合？
+advancements.biomesoplenty.terrestrial_artifact.description=获得到每个生物群系特有的宝石。
+advancements.biomesoplenty.craft_biome_finder.title=搜索派对
+advancements.biomesoplenty.craft_biome_finder.description=制作出一个生物群系雷达来引导你。
+advancements.biomesoplenty.all_biomes.title=环球旅行
+advancements.biomesoplenty.all_biomes.description=探索完超多生物群系的每一个群系。
 
 biome_finder.searching=寻找 %s
-biome_finder.found=找到 %s!
-biome_finder.not_found=无法找到, 也许 %s 是距离太遥远
+biome_finder.found=找到 %s！
+biome_finder.not_found=抱歉无法找到，可能是 %s 是距离太遥远！
 
 config.category.convenienceSettings.title=便捷设置
 config.category.guiSettings.title=GUI设置
@@ -53,20 +29,20 @@ config.category.textureSettings.title=材质设置
 config.category.trailSettings.title=足迹设置
 config.category.convenienceSettings.tooltip=需要剪刀才能采集花朵
 config.category.guiSettings.tooltip=设置超多生物群系为默认世界地图
-config.category.textureSettings.tooltip=替换forge的桶的材质而使用我们的材质(这会更棒!)
+config.category.textureSettings.tooltip=替换forge的桶的材质而使用我们的材质
 config.category.trailSettings.tooltip=定义足迹的透明度
 
-commands.biomesoplenty.usage=/biomesoplenty <tpbiome|biomename> [生物群系Id]
-commands.biomesoplenty.biomename.usage=/biomesoplenty biomename [生物群系Id]
+commands.biomesoplenty.usage=/biomesoplenty <tpbiome|biomename> [生物群系ID]
+commands.biomesoplenty.biomename.usage=/biomesoplenty biomename [生物群系ID]
 commands.biomesoplenty.biomename.success=生物群系ID%s已绑定为: %s
-commands.biomesoplenty.tpbiome.usage=/biomesoplenty tpbiome [生物群系Id]
+commands.biomesoplenty.tpbiome.usage=/biomesoplenty tpbiome [生物群系ID]
 commands.biomesoplenty.tpbiome.success=玩家%s传送到生物群系: %s,坐标(%s, %s, %s)
 commands.biomesoplenty.tpbiome.error=未找到生物群系: %s!
 commands.biomesoplenty.stats.blocks=方块: %s
 commands.biomesoplenty.stats.items=物品: %s
 commands.biomesoplenty.stats.entities=实体: %s
 commands.biomesoplenty.stats.biomes=生物群落: %s
-commands.biomesoplenty.stripchunk.usage=/biomesoplenty stripchunk [范围] <include|exclude> [方块Id] [方块附加值]
+commands.biomesoplenty.stripchunk.usage=/biomesoplenty stripchunk [范围] <include|exclude> [方块ID] [方块附加值]
 
 container.flower_basket=花篮
 
@@ -94,18 +70,12 @@ item.brown_dye.name=棕色染料
 item.cherry_door.name=樱花树门
 item.crystal_shard.name=仙域水晶碎片
 item.terrestrial_artifact.name=天地宝晶
-item.flax_string.name=麻线
-item.diamond_scythe.name=钻石镰刀
-item.dull_flower_band.name=沉闷花环
 item.ebony_door.name=檀木门
-item.enderporter.name=末地传送器
 item.ethereal_door.name=天域树门
 item.eucalyptus_door.name=桉树门
-item.exotic_flower_band.name=异国花环
 item.filled_honeycomb.name=充满的蜂窝
 item.fir_door.name=杉树门
 item.fleshchunk.name=肉
-item.flippers.name=脚蹼
 item.flower_basket.name=花篮
 item.gem_amber.name=琥珀
 item.gem_amethyst.name=末影紫晶
@@ -116,32 +86,17 @@ item.gem_sapphire.name=蓝宝石
 item.gem_tanzanite.name=坦桑石
 item.gem_topaz.name=黄玉
 item.green_dye.name=绿色染料
-item.gold_scythe.name=金镰刀
 item.hellbark_door.name=地狱皮树门
 item.honeycomb.name=空蜂窝
-item.ichor.name=脓血
-item.iron_scythe.name=铁镰刀
 item.jacaranda_door.name=蓝花楹门
 item.jar_empty.name=空罐
 item.jar_filled_honey.name=蜂蜜罐
 item.jar_filled_pixie.name=精灵罐
-item.jar_filled_butterfly.name=蝴蝶罐
-item.lush_flower_band.name=繁茂花环
 item.magic_door.name=魔法树门
 item.mahogany_door.name=桃花心木门
 item.mangrove_door.name=红树门
 item.mudball.name=泥巴球
-item.mud_axe.name=泥巴斧
-item.mud_boots.name=泥巴靴子
 item.mud_brick.name=泥砖
-item.mud_chestplate.name=泥巴胸甲
-item.mud_helmet.name=泥巴头盔
-item.mud_hoe.name=泥巴锄
-item.mud_leggings.name=泥巴护腿
-item.mud_pickaxe.name=泥巴镐
-item.mud_scythe.name=泥巴镰刀
-item.mud_shovel.name=泥巴铲
-item.mud_sword.name=泥巴剑
 item.palm_door.name=棕榈树门
 item.persimmon.name=柿子
 item.peach.name=桃子
@@ -149,9 +104,6 @@ item.pear.name=梨
 item.pinecone.name=松果
 item.pine_door.name=松木门
 item.pixie_dust.name=精灵之尘
-item.plain_flower_band.name=平原花环
-item.record_corruption.name=音乐唱片
-item.record.corruption.desc=???
 item.record_wanderer.name=音乐唱片
 item.record.wanderer.desc=Tim Rurkowski - Wanderer
 item.redwood_door.name=红木门
@@ -161,19 +113,11 @@ item.saladfruit.name=水果沙拉
 item.saladveggie.name=蔬菜沙拉
 item.saladshroom.name=蘑菇沙拉
 item.shroompowder.name=蘑菇粉
-item.soul.name=灵魂
-item.spawn_egg_pixie.name=生成 精灵
-item.spawn_egg_wasp.name=生成 黄蜂
-item.spawn_egg_snail.name=生成 蜗牛
-item.spawn_egg_butterfly.name=生成 蝴蝶
-item.stone_scythe.name=石质镰刀
 item.turnip.name=芜菁
 item.turnip_seeds.name=芜菁种子
 item.umbran_door.name=暗影木门
-item.wading_boots.name=涉水靴子
 item.white_dye.name=白色染料
 item.willow_door.name=杨柳木门
-item.wood_scythe.name=木质镰刀
 
 tile.ash_block.name=灰烬块
 tile.bamboo.name=竹子
@@ -264,6 +208,7 @@ tile.grass.sandy_grass_block.name=沙质草方块
 tile.grass.silty_grass_block.name=淤泥草方块
 tile.grass.origin_grass_block.name=原始草方块
 tile.grass.overgrown_netherrack.name=杂草丛生的地狱岩
+tile.grass.mycelial_netherrack.name=菌丝寄生的地狱岩
 tile.grass_path.grass_loamy_path.name=壤质草径
 tile.grass_path.grass_sandy_path.name=沙质草径
 tile.grass_path.grass_silty_path.name=淤泥草径
@@ -475,3 +420,41 @@ tile.dried_sand.name=干砂
 tile.crag_rock.name=峭岩
 tile.mud_brick.name=泥砖
 tile.crystal.name=仙域水晶
+
+entity.mudball.name=泥巴球
+entity.pixie.name=精灵
+entity.wasp.name=下界黄蜂
+
+#以下为新版本已移除物品
+item.flax_string.name=麻线
+item.diamond_scythe.name=钻石镰刀
+item.dull_flower_band.name=沉闷花环
+item.enderporter.name=末地传送器
+item.exotic_flower_band.name=异国花环
+item.flippers.name=脚蹼
+item.gold_scythe.name=金镰刀
+item.ichor.name=脓血
+item.iron_scythe.name=铁镰刀
+item.jar_filled_butterfly.name=蝴蝶罐
+item.lush_flower_band.name=繁茂花环
+item.mud_axe.name=泥巴斧
+item.mud_boots.name=泥巴靴子
+item.mud_chestplate.name=泥巴胸甲
+item.mud_helmet.name=泥巴头盔
+item.mud_hoe.name=泥巴锄
+item.mud_leggings.name=泥巴护腿
+item.mud_pickaxe.name=泥巴镐
+item.mud_scythe.name=泥巴镰刀
+item.mud_shovel.name=泥巴铲
+item.mud_sword.name=泥巴剑
+item.plain_flower_band.name=平原花环
+item.record_corruption.name=音乐唱片
+item.record.corruption.desc=？？？
+item.soul.name=灵魂
+item.spawn_egg_pixie.name=生成 精灵
+item.spawn_egg_wasp.name=生成 黄蜂
+item.spawn_egg_snail.name=生成 蜗牛
+item.spawn_egg_butterfly.name=生成 蝴蝶
+item.stone_scythe.name=石质镰刀
+item.wading_boots.name=涉水靴子
+item.wood_scythe.name=木质镰刀