Merge branch 'BOP-1.16.x-11.x.x' of https://github.com/Glitchfiend/BiomesOPlenty into BOP-1.16.x-11.x.x

This commit is contained in:
Forstride 2020-07-17 13:15:31 -04:00
commit 0a08fa9694
3 changed files with 6 additions and 6 deletions

View file

@ -12,7 +12,7 @@
"biome.biomesoplenty.bayou": "Bayou", "biome.biomesoplenty.bayou": "Bayou",
"biome.biomesoplenty.bog": "Turbera", "biome.biomesoplenty.bog": "Turbera",
"biome.biomesoplenty.boreal_forest": "Bosque boreal", "biome.biomesoplenty.boreal_forest": "Bosque boreal",
"biome.biomesoplenty.brushland": "Garriga", "biome.biomesoplenty.brushland": "Brushland",
"biome.biomesoplenty.chaparral": "Chaparral", "biome.biomesoplenty.chaparral": "Chaparral",
"biome.biomesoplenty.cherry_blossom_grove": "Arboleda de cerezos", "biome.biomesoplenty.cherry_blossom_grove": "Arboleda de cerezos",
"biome.biomesoplenty.cold_desert": "Desierto frío", "biome.biomesoplenty.cold_desert": "Desierto frío",
@ -23,7 +23,6 @@
"biome.biomesoplenty.floodplain": "Llanura aluvial", "biome.biomesoplenty.floodplain": "Llanura aluvial",
"biome.biomesoplenty.flower_meadow": "Prado floral", "biome.biomesoplenty.flower_meadow": "Prado floral",
"biome.biomesoplenty.fungal_jungle": "Jungla fúngica", "biome.biomesoplenty.fungal_jungle": "Jungla fúngica",
"biome.biomesoplenty.ghost_forest": "Bosque fantasma",
"biome.biomesoplenty.grassland": "Pastizal", "biome.biomesoplenty.grassland": "Pastizal",
"biome.biomesoplenty.gravel_beach": "Playa de grava", "biome.biomesoplenty.gravel_beach": "Playa de grava",
"biome.biomesoplenty.grove": "Arboleda", "biome.biomesoplenty.grove": "Arboleda",
@ -37,6 +36,7 @@
"biome.biomesoplenty.marsh": "Marisma", "biome.biomesoplenty.marsh": "Marisma",
"biome.biomesoplenty.meadow": "Prado", "biome.biomesoplenty.meadow": "Prado",
"biome.biomesoplenty.mire": "Ciénaga", "biome.biomesoplenty.mire": "Ciénaga",
"biome.biomesoplenty.muskeg": "Pantano congelado",
"biome.biomesoplenty.mystic_grove": "Arboleda mística", "biome.biomesoplenty.mystic_grove": "Arboleda mística",
"biome.biomesoplenty.oasis": "Oasis", "biome.biomesoplenty.oasis": "Oasis",
"biome.biomesoplenty.ominous_woods": "Bosque siniestro", "biome.biomesoplenty.ominous_woods": "Bosque siniestro",

View file

@ -12,7 +12,7 @@
"biome.biomesoplenty.bayou": "Bayou", "biome.biomesoplenty.bayou": "Bayou",
"biome.biomesoplenty.bog": "Turbera", "biome.biomesoplenty.bog": "Turbera",
"biome.biomesoplenty.boreal_forest": "Bosque boreal", "biome.biomesoplenty.boreal_forest": "Bosque boreal",
"biome.biomesoplenty.brushland": "Garriga", "biome.biomesoplenty.brushland": "Brushland",
"biome.biomesoplenty.chaparral": "Chaparral", "biome.biomesoplenty.chaparral": "Chaparral",
"biome.biomesoplenty.cherry_blossom_grove": "Arboleda de cerezos", "biome.biomesoplenty.cherry_blossom_grove": "Arboleda de cerezos",
"biome.biomesoplenty.cold_desert": "Desierto frío", "biome.biomesoplenty.cold_desert": "Desierto frío",
@ -23,7 +23,6 @@
"biome.biomesoplenty.floodplain": "Llanura aluvial", "biome.biomesoplenty.floodplain": "Llanura aluvial",
"biome.biomesoplenty.flower_meadow": "Prado florecido", "biome.biomesoplenty.flower_meadow": "Prado florecido",
"biome.biomesoplenty.fungal_jungle": "Jungla de champiñones", "biome.biomesoplenty.fungal_jungle": "Jungla de champiñones",
"biome.biomesoplenty.ghost_forest": "Bosque fantasma",
"biome.biomesoplenty.grassland": "Pastizal", "biome.biomesoplenty.grassland": "Pastizal",
"biome.biomesoplenty.gravel_beach": "Playa de grava", "biome.biomesoplenty.gravel_beach": "Playa de grava",
"biome.biomesoplenty.grove": "Arboleda", "biome.biomesoplenty.grove": "Arboleda",
@ -37,6 +36,7 @@
"biome.biomesoplenty.marsh": "Marisma", "biome.biomesoplenty.marsh": "Marisma",
"biome.biomesoplenty.meadow": "Prado", "biome.biomesoplenty.meadow": "Prado",
"biome.biomesoplenty.mire": "Ciénaga", "biome.biomesoplenty.mire": "Ciénaga",
"biome.biomesoplenty.muskeg": "Pantano congelado",
"biome.biomesoplenty.mystic_grove": "Arboleda mística", "biome.biomesoplenty.mystic_grove": "Arboleda mística",
"biome.biomesoplenty.oasis": "Oasis", "biome.biomesoplenty.oasis": "Oasis",
"biome.biomesoplenty.ominous_woods": "Bosque siniestro", "biome.biomesoplenty.ominous_woods": "Bosque siniestro",

View file

@ -12,7 +12,7 @@
"biome.biomesoplenty.bayou": "Bayou", "biome.biomesoplenty.bayou": "Bayou",
"biome.biomesoplenty.bog": "Turbera", "biome.biomesoplenty.bog": "Turbera",
"biome.biomesoplenty.boreal_forest": "Bosque boreal", "biome.biomesoplenty.boreal_forest": "Bosque boreal",
"biome.biomesoplenty.brushland": "Garriga", "biome.biomesoplenty.brushland": "Brushland",
"biome.biomesoplenty.chaparral": "Chaparral", "biome.biomesoplenty.chaparral": "Chaparral",
"biome.biomesoplenty.cherry_blossom_grove": "Arboleda de cerezos", "biome.biomesoplenty.cherry_blossom_grove": "Arboleda de cerezos",
"biome.biomesoplenty.cold_desert": "Desierto frío", "biome.biomesoplenty.cold_desert": "Desierto frío",
@ -23,7 +23,6 @@
"biome.biomesoplenty.floodplain": "Llanura aluvial", "biome.biomesoplenty.floodplain": "Llanura aluvial",
"biome.biomesoplenty.flower_meadow": "Prado floral", "biome.biomesoplenty.flower_meadow": "Prado floral",
"biome.biomesoplenty.fungal_jungle": "Jungla fúngica", "biome.biomesoplenty.fungal_jungle": "Jungla fúngica",
"biome.biomesoplenty.ghost_forest": "Bosque fantasma",
"biome.biomesoplenty.grassland": "Pastizal", "biome.biomesoplenty.grassland": "Pastizal",
"biome.biomesoplenty.gravel_beach": "Playa de grava", "biome.biomesoplenty.gravel_beach": "Playa de grava",
"biome.biomesoplenty.grove": "Arboleda", "biome.biomesoplenty.grove": "Arboleda",
@ -37,6 +36,7 @@
"biome.biomesoplenty.marsh": "Marisma", "biome.biomesoplenty.marsh": "Marisma",
"biome.biomesoplenty.meadow": "Prado", "biome.biomesoplenty.meadow": "Prado",
"biome.biomesoplenty.mire": "Ciénaga", "biome.biomesoplenty.mire": "Ciénaga",
"biome.biomesoplenty.muskeg": "Pantano congelado",
"biome.biomesoplenty.mystic_grove": "Arboleda mística", "biome.biomesoplenty.mystic_grove": "Arboleda mística",
"biome.biomesoplenty.oasis": "Oasis", "biome.biomesoplenty.oasis": "Oasis",
"biome.biomesoplenty.ominous_woods": "Bosque siniestro", "biome.biomesoplenty.ominous_woods": "Bosque siniestro",