- Debugging State for Mouse Clicks for addon

- Zooming with scroll wheel works now
- Test adding new stuff to Photodex test for addon
2026-10-25 00:26:26 -04:00 · 2024-02-02 10:01:14 -08:00 · 2024-02-01 19:52:36 -08:00 · 2024-02-01 10:54:46 -08:00 · 2023-10-29 21:03:16 -07:00 · 2023-10-29 17:20:17 +00:00
1052 changed files with 33282 additions and 7468 deletions
@@ -1,26 +1,71 @@
 # Changelog
-## [1.4.0](#1-4-0)
+## [1.4.1](#1-4-1)
+
+### Changes
+- Slightly lowered the volume of all cries
+- Pasture blocks will now also connect their bottom left and right sides to walls, iron bars, glass panes and any other modded block that follows the same connection rules.
+
 ### Additions
- Added nicknaming.
- Added mints, found on mountains.
- Added revival herbs, with pep-up flowers if fully grown, growing in lush caves.
- Added medicinal leeks, growing on the surface of rivers and ponds. It is a potion ingredient!
- Added big roots, generating from cave ceiling dirt and sometimes spreading into energy roots.
- Added trading between players. Press R while looking at another player, you'll figure it out.
- Added pasture blocks, used to let your PC Pokémon roam around your base.
- Added 69 berry trees. Some are found in village farms, some from planting different berries close to each other.
+- Cobblemon now has compatibility with [Adorn](https://modrinth.com/mod/adorn) allowing you to craft Apricorn wood furniture.
+- Berries can now be used in recipes from [Farmer's Delight](https://modrinth.com/mod/farmers-delight) and [Farmer's Delight (Fabric)](https://modrinth.com/mod/farmers-delight-fabric), as well as any other mods using the same berry tags.
+- The nature of cobblemon will now be displayed italicized when a mint has been applied. Hovering over the nature will display the mint that was applied. This is the intended behaviour, because the original nature and taste of the Cobblemon does not change when a mint is applied.
+- Giving Pokémon items now plays a sound
+
+### Fixes
+- Fixed various stone related blocks not being valid for Big Roots to spread on the Fabric version.
+- Updated the registration of compostable items to improve compatibility with Fabric forks such as Quilt. Please note this does not mean we officially support Quilt, this change was only done since it was possible by correcting the registration to use the new intended way in the Fabric API.
+- Fixed Dispensers being unable to shear grown Apricorns.
+- Fixed Bowl not being given back to player after using Berry Juice
+- Fixed Moonphases for Clefairy line
+- Fixed issue where Potions, Super Potions, and Hyper Potions did not work during battle
+- Fixed the compatibility patch with the Forge version of [Carry On](https://modrinth.com/mod/carry-on) due to a bug on the mod, the Fabric version was unchanged and is still compatible.
+- Added the ability to place Berries on modded Farmland blocks.
+- Shouldered Pokémon now hop off when selected in team and r is pressed. This also is in effect in battles leading to shouldered Pokémon jumping of the shoulder of the trainer when it is their turn.
+- Made more items compostable and changed the process for making items compostable.
+- Added the ability for Hoppers to fill Brewing Stands with Medicinal Brews and Potions.
+- Apricorn blocks are now flammable.
+- The default pose for Pokémon being passengers is now "standing".
+- Fixed issue where some IVs were changing every player relog.
+- Fixed cursed battle message
+- Fixed mistakes in pokemon spawning JSONs
+- Fixed advancement crash from bad datapack evolution data.
+
+### Developer
+- Fixed the `SpawnEvent` not respecting usage of `Cancelable#cancel`.
+- Added the `EvolutionTestedEvent`, this allows listening and overriding the final result of evolution requirement tests.
+
+## [1.4.0 - The Friends and Farms Update (October 13th, 2023)](#1-4-0)
+### Additions
+- Added pasture blocks, used to let your PC Pokémon roam around an area.
+- Added nicknaming from the summary menu of a Pokémon (click their name).
+- Added trading between players. Press R while looking at another player and you'll figure the rest out.
+- Added mints for changing Pokémon stats. These are most commonly found at high altitudes.
+- Added [Revival Herbs](https://wiki.cobblemon.com/index.php/Revival_Herb), with pep-up flowers when fully grown, growing in lush caves.
+- Added [Medicinal Leeks](https://wiki.cobblemon.com/index.php/Medicinal_Leek), growing on the surface of rivers and ponds. It is a potion ingredient and can be cooked as food!.
+- Added [Big Roots](https://wiki.cobblemon.com/index.php/Big_Root), generating from cave ceiling dirt which sometimes spread as energy roots.
+- Added [69 Berry Trees](https://wiki.cobblemon.com/index.php/Berry_Tree) and [Berries](https://wiki.cobblemon.com/index.php/Berry). Some are found in village farms, some from planting different berries close to each other.
+- Added mulches: Mulch Base, Growth Mulch, Surprise Mulch, Coarse Mulch, Humid Mulch, Rich Mulch, Loamy Mulch, Peat Mulch, and Sandy Mulch
+- Added [Vivichokes](https://wiki.cobblemon.com/index.php/Vivichoke), obtainable from wandering villager trades and some loot chests.
 - Added medicine brewing using medicinal leeks and berries in brewing stands.
 - Added Pokémon cries when in battles and being sent out.
- Added support for scale in animations.
- Added support for jump keyframes (i.e. pre and post keyframes)
- Added AI for Nosepass to point towards world spawn when idle.
- Added structure spawn conditions
- Added recipes for Berry Juice, Heal Powder, Remedy, Fine Remedy, Superb Remedy, Revive, Max Revive, HP Up, Protein, Iron, Calcium, Zinc, Carbos, PP Up, PP Max, Pasture, Medicinal Leek to Magenta Dye, Roasted Leek, Leek and Potato Stew, Braised Vivichoke, Vivichoke Dip, Mulch Base, Growth Mulch, Surprise Mulch, Coarse Mulch, Humid Mulch, Rich Mulch, Loamy Mulch, Peat Mulch, Sandy Mulch, X Attack, X Defense, X Special Attack, X Special Defense, X Speed, X Accuracy, Dire Hit, Guard Spec, Power Anklet, Power Band, Power Belt, Power Bracelet, Power Lens, Power Weight, Bright Powder, Destiny Knot
- Added a shoulder mount for Mimikyu
- Added Advancement trigger for defeating Pokémon and collecting varieties of Pokémon.
- Added sleep animations to Arcanine, Jigglypuff, Wigglytuff, Vulpix and Ninetales.
+- Added medicinal items: Berry Juice, Heal Powder, Remedy, Fine Remedy, Superb Remedy, Revive, Max Revive, Potion, Super Potion, Hyper Potion, Max Potion, Full Restore, Full Heal, Antidote, Awakening, Burn Heal, Ice Heal, and Paralyze Heal.
+- Added battle items: X Attack, X Defence, X Sp.Atk, X Sp.Def, X Speed, Dire Hit, and Guard Spec.
+- Added EV items: Power Anklet, Power Band, Power Belt, Power Bracelet, Power Lens, Power Weight.
+- Added food items: Roasted Leek, Leek and Potato Stew, Braised Vivichoke, and Vivichoke Dip
+- Added evolution items: Auspicious Armor and Malicious Armor, which can be used to evolve Charcadet into Armarouge or Ceruledge respectively.
+- Added (mostly brewing) recipes for HP Up, Protein, Iron, Calcium, Zinc, Carbos, PP Up, PP Max, and Medicinal Leek to Magenta Dye.
+- Added held items: Bright Powder, Destiny Knot
+- Added AI for Nosepass to point towards world spawn when idle. We just think it's neat.
+- Added shoulder mounting for Mimikyu.
 - Added flying placeholder animations to Pidgey, Pidgeotto, Pidgeot, Golbat, Crobat, Scyther, Scizor, Zapdos, Moltres, Articuno, Dragonite, Rowlet, Dartrix, and Decidueye.
 - Added loot to various vanilla chest loot tables (Link Cable in Ancient Cities, Woodland Mansions, End Cities, and Igloos, Vivichoke Seeds in Jungle Temples, Dungeons, and Plains, Savanna, Snowy, and Taiga Villages, and all 7 Apricorn Sprouts in Desert, Plains, Savanna, Snowy, and Taiga Villages, as well as the Bonus Chest, which can also have 5 of the basic Poké Ball types)
+- Added a `doShinyStarters` gamerule to make it quick and easy to be offered shiny starters.
+- Added a `doPokemonLoot` gamerule to toggle Pokémon dropping items/exp on death.
+- Added ability activation announcement when in battle.
+- Added animations for Wailord and made it BIGGER.
+- Added Cherry Torterra variant.
+- Added 2 new face spots for Spinda. The number of unique Spindas increases...
+- Added Forretress Shulker variant.
 - Added the `/teststore <player> <store> <properties>` command allowing command block/mcfunction users to query a party, PC or both for Pokémon matching specific properties and returning the match count, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.teststore` if a permission mod is present.
 - Added the `/querylearnset <player> <slot> <move>` command allowing command block/mcfunction users to query a party slot and check if the Pokémon can learn a specific move returning a 1 if yes otherwise 0, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.querylearnset` if a permission mod is present.
 - Added the `/testpcslot <player> <slot> <properties>` command allowing command block/mcfunction users to query a pc slot and check if the Pokémon matches specific properties returning a 1 if yes otherwise 0, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.testpcslot` if a permission mod is present.
@@ -28,18 +73,6 @@
 - Added the `/clearparty <player>` command for emptying a player's party.
 - Added the `/clearpc <player>` command for emptying a player's PC.
 - Added the `/pokemonrestart <reset_starters>` and the `/pokemonrestartother <player> <reset_starters>` command allowing command block/mcfunction users to reset a players Pokémon data.
- Added support for "isBattle" and "isTouchingWater" properties on resource pack Pokémon poses. This allows your custom Pokémon to be posed differently when in battle.
- Added support for "isVisible" on a transformed part on resource pack Pokémon poses. This allows your custom Pokémon to have bones disappear in specific poses, such as hiding Greninja's throwing star when not in a battle pose.
- Added a "doShinyStarters" gamerule
- Added the `doPokemonLoot` gamerule to toggle Pokémon dropping items/exp on death.
- Added support for battle music. Sounds can be added to the ``battle.pvp.default`` and ``battle.pvw.default`` sound events.
- Added ability activation announcement when in battle.
- Added Auspicious Armor and Malicious Armor, which can be used to evolve Charcadet into Armarouge or Ceruledge respectively.
- Added animations for Wailord.
- Added Cherry Torterra variant.
- Added 2 new face spots for Spinda.
- Added Forretress Shulker variant.
- Added 'enabled' optional property on model layers, allowing later variations to disable previously-defined layers. See [this issue](https://gitlab.com/cable-mc/cobblemon/-/issues/335) for how this looks.

 ### Pokémon Added
 #### Gen 2
@@ -257,39 +290,36 @@
 - Clodsire

 ### Changes
- Updated model and textures of Spiritomb, Koffing, Weezing, Kadabra, Alakazam, Emolga, Oshawott, Doduo, Dodrio, Dratini, Dragonair, Dragonite, Sneasel, Weavile, Gyarados, Hitmonlee, Hitmonchan, Chesnaught, Spinda, Mamoswine, Steelix, Midreavus, Mismagius, Buneary, Lopunny, Golduck, Meowth, Persian, Fennekin, Braixen, Delphox, Snivy, Servine, Serperior, Ratatta, Raticate, Nidorina, Nidoqueen, NidoranM, Nidoking, Riolu, Lucario, Haunter, Mankey, Primeape, Mew, Mewtwo, Arcanine, Magnemite, Magneton, Magnezone, Exeggcute, Exeggutor, Elekid, Electabuzz, Electivire, Pichu, Pikachu, Raichu, Gengar, Wooper, Drowzee, Hypno, Aerodactyl, Spearow, Fearow, Lickitung, Pidgey, Pidgeotto, Pidgeot, Scyther, Scizor, Kleavor, Popplio, Brionne, Primarina, Torchic, Combusken, Blaziken, Aerodacyl, Scyther, Scizor, Kleavor, Lickitung, Lickilicky, Happiny, Chansey and Blissey.
- Updated animations for Steelix, Turtwig, Grotle, Torterra, Ponyta, Rapidash, Piplup, Prinplup, Empoleon, Drowzee, Hypno, Farfetch'd, Exeggcute, Exeggutor, Bidoof, Chimecho, Lickytung, Lickilicky, Popplio, Brionne, Luvdisc, Chimchar, Monferno, Infernape, Sobble, Drizzile, Inteleon, Greninja, Heatmor, Aerodactyl, Ditto, Lotad, Lombre, Ludicolo, Pumpkaboo, Gourgeist.
+- Removed the existing shoulder effects from Pokémon until we have more balanced versions of them (they're too powerful!)
+- Updated models and textures of Weedle, Dwebble and Crustle, Spiritomb, Koffing and Weezing, Kadabra and Alakazam, Emolga, Oshawott, Doduo and Dodrio, Dratini and Dragonair and Dragonite, Sneasel and Weavile, Gyarados, Hitmonlee and Hitmonchan, Chesnaught, Spinda, Mamoswine, Steelix, Misdreavus and Mismagius, Buneary and Lopunny, Golduck, Meowth and Persian, Fennekin and Braixen and Delphox, Snivy and Servine and Serperior, Ratatta and Raticate, Nidorina and Nidoqueen, Nidoran Male and Nidoking, Riolu and Lucario, Haunter and Gengar, Mankey and Primeape, Mew and Mewtwo, Arcanine, Magnemite and Magneton and Magnezone, Exeggcute and Exeggutor, Elekid and Electabuzz and Electivire, Pichu and Pikachu and Raichu, Wooper, Drowzee and Hypno, Aerodactyl, Spearow and Fearow, Lickitung and Lickilicky, Pidgey and Pidgeotto and Pidgeot, Scyther and Scizor and Kleavor, Popplio and Brionne and Primarina, Torchic and Combusken and Blaziken, Happiny and Chansey and Blissey.
+- Updated animations for Steelix, Turtwig and Grotle and Torterra, Ponyta and Rapidash, Piplup and Prinplup and Empoleon, Drowzee and Hypno, Farfetch'd, Exeggcute and Exeggutor, Bidoof, Chimecho, Lickitung and Lickilicky, Popplio and Brionne, Luvdisc, Chimchar and Monferno and Infernape, Sobble and Drizzile and Inteleon, Greninja, Heatmor, Aerodactyl, Ditto, Lotad and Lombre and Ludicolo, Pumpkaboo and Gourgeist.
 - Updated sprites for EV medicines, the rare candy, and the apricorn door item.
 - Updated textures for apricorn doors and all the evolution stone ores.
+- Ponyta and Rapidash now have animated textures; they look insane.
 - Updated Apricorn Leaves color.
 - Wild Pokémon now heal if you are defeated by them or flee from them.
 - Doubled the default time between ambient Pokémon cries (they have cries if you're using a resource pack to add them)
 - Moved spawn attempts per tick to a config option (ticksBetweenSpawnAttempts)
 - PCs can now be waterlogged
 - Starter selection prompt now appears as a tutorial-esque toast instead of plain text
- Cobblemon items can now all have their own tooltips via resourcepacks, to add a tooltip simply add a lang entry like "item.cobblemon.{item_id}.tooltip", if you want to add multiple tooltip lines you can do so with "item.cobblemon.{item_id}.tooltip_1" and upwards.
- Updated texture of Weedle.
- Updated shiny texture of Dwebble and Crustle.
 - Reorganised the advancements recipes folder
 - Pokéedit command now supports IVs and EVs.
 - Reorganised creative categories
 - Pokémon can now wander into non-solid blocks such as foliage
- Pokéballs now despawn after 30 seconds
+- Thrown Poké Balls now despawn after 30 seconds so that they don't fly forever.
 - Dive Balls will now have the same motion speed underwater as if they were thrown in the air.
- Hardcoded potion shoulder effects have been removed, you can now use any potion vanilla or otherwise with the parameters you'd like, for more information see the [Datapack & Resourcepack Creators](#datapack-&-resourcepack-creators) section.
- Clicking categories of the Stat sub-section or the party reorder button in the Summary screen will now produce a click sound.
+- Hardcoded potion shoulder effects have been removed. You can now use any potion vanilla or otherwise with the parameters you'd like, for more information see the [Datapack & Resourcepack Creators](#datapack-&-resourcepack-creators) section.
+- Clicking categories of the Stat subsection or the party reorder button in the Summary screen will now produce a click sound.
 - Updated PC Recipe.
 - Improved Pokémon AI and movement.
 - Friendship will slowly increase when Pokémon are shoulder-mounted.
- Master balls are now unable to be burned when dropped into fire/lava.
+- Master Balls are now unable to be burned when dropped into fire/lava. They're made from stronger stuff.
 - Pokémon will appear red when hurt, like regular entities, except when they're fainting.
- Ponyta and Rapidash now have animated textures.
 - Pokémon's air meter no longer depletes while battling underwater.
 - Sleeping partially restores PP of Pokémon
- Item interaction evolutions and held item requirements now support NBT by creating an object JSON containing the key ``item`` for what used to be the existing condition support and a ``nbt`` key for the NBT format, this is the string [format](https://minecraft.fandom.com/wiki/NBT_format) expected in commands. Existing data does not need to be updated.
 - Shoulder mounts now match the shoulder position a bit more accurately when sneaking.
 - Poison Heal will now cause poisoned Pokémon to heal outside of battle.
- Updated Pokéball, PC, UI, evolution and Healing Machine sounds.
+- Updated Poké Ball, PC, UI, evolution and Healing Machine sounds.

 ### Added cries to the following Pokémon:
 - All starters and their evolutions
@@ -359,48 +389,48 @@
 - Tatsugiri

 ### Fixes
- Fixed spawning moon phase dependent Pokémon only when the moon phase is wrong
+- Fixed spawning moon phase dependent Pokémon only when the moon phase is wrong (that's a funny woopsy)
 - Fixed large Pokémon spawning partially inside walls where they suffocate.
+- Fixed custom Pokémon in your party or PC not being removed when the addon is removed, causing major issues.
 - Fixed messages for entry hazards, screens, weather, damage, healing, Tailwind, Perish Song, Destiny Bond, Shed Skin, Uproar, Forewarn, Disguise, Arena Trap, Yawn, Curse, Clamp, Whirlpool, Liquid Ooze, Miracle Eye, Safeguard, Magic Bounce, Lock On, Focus Energy, Confusion, and more.
 - Fixed Porygon not evolving with an Upgrade.
 - Fixed super sized Pumpkaboo not having any moves.
 - Fixed Infernape look animation.
- Fixed Garchomp t-posing while swimming.
- Fixed a bug that caused sleeping Pokémon to stay asleep.
- Fixed a bug that would freeze a battle when a Pokémon gets trapped due to an ability.
+- Fixed Garchomp T-posing while swimming which was very funny.
+- Fixed a bug that caused sleeping Pokémon to stay asleep. Forever. The years passing them by as they dream of a world without hate...
+- Fixed a bug that would freeze a battle when a Pokémon gets trapped by an ability, making the trap abilities even scarier and trap-like than they were before.
 - Fixed the Poké Ball close animation canceling whenever colliding with a block.
- Fixed faint animations not working properly in add-ons.
 - Fixed lighting and Pokémon label issues when a Pokémon item frame is nearby.
 - Fixed Pokémon being able to spawn outside the world border as a tease.
- Fixed deepslate water stone ore items looking like deepslate fire stone ores.
- Fixed a bunch of client-side logging errors when Pokémon are shoulder mounted.
+- Fixed deepslate water stone ore items looking like deepslate fire stone ores. Huh?
+- Fixed a bunch of client-side logging errors when Pokémon are shoulder mounted. You didn't notice? Good.
 - Fixed a crash when wild Pokémon have to struggle under specific circumstances.
 - Fixed uncolored pixels on Yanma's shiny texture.
- Fixed apricorn tree leaves looking gross on Fast graphics mode.
+- Fixed apricorn tree leaves looking gross on the Fast graphics mode.
 - Fixed hoes not breaking apricorn tree leaves any faster.
 - Fixed Shiftry's PC model position.
 - Fixed the /pc command not playing the opening sound.
- Fixed Shedinja not being able to recover naturally.
 - Fixed different forms of Pokémon not being able to appear as different sizes.
 - Fixed the Healing Machine soft locking you from using others when removed by non-players.
 - Fixed animations being sped up when using the Replay Mod.
 - Fixed particle animations not running when a Pokémon is off-screen.
 - Fixed Pokémon variants and layers not rendering correctly when shouldered and playing on a dedicated server, existing shoulders affected will need to be retrieved and shouldered again.
- Shoulder effects will now stay applied through situations that remove potion effects such as drinking milk.
- Fixed Shedinja evolving to use the consumed PokéBall and removed the held item.
- Fixed non-existent species in spawn pool file causing random species to spawn.
- Fixed shearing Pokémon dropping 0-2 wool instead of 1-3.
- Fixed some alignment issues in the stat hexagon of the summary menu.
- Fixed capture calculations not applying ball bonuses entirely correctly.
+- Fixed shoulder effects not staying applied through situations that remove potion effects such as drinking milk.
+- Fixed Shedinja not being able to recover naturally.
+- Fixed Shedinja evolving to use the consumed Poké Ball and removed the held item to prevent dupes.
 - Fixed Shedinja healing above 1 HP.
+- Fixed Shedinja, basically.
+- Fixed shearing Pokémon dropping 0-2 wool instead of 1-3.
+- Fixed some alignment issues in the stat hexagon of the summary menu. OCD people rejoice.
+- Fixed capture calculations not applying ball bonuses entirely correctly.
 - Fixed battles soft-locking when consecutive Pokémon faint on switch-in.
 - Fixed timing and color of battle window messages.
 - Fixed players being able to trade, battle and let out their Pokémon while in spectator mode.
 - Fixed Galarian Yamask not being able to evolve and by proxy the ``damage_taken`` evolution requirement.
 - Fixed Bisharp not being able to evolve and by proxy the ``defeat`` evolution requirement.
- Fixed White-Striped Basculin not being able to evolve and by proxy the ``recoil`` evolution requirement.
- Fixed Primeape, Qwilfish and Stantler not being able to evolve and by proxy the ``use_move`` evolution requirement.
- Fixed Bramblin, Pawmo, and Rellor not being able to evolve and by proxy the ``blocks_traveled`` evolution requirement.
+- Fixed White-Striped Basculin not being able to evolve because of a broken ``recoil`` evolution requirement.
+- Fixed Primeape, Qwilfish and Stantler not being able to evolve because of a broken ``use_move`` evolution requirement.
+- Fixed Bramblin, Pawmo, and Rellor not being able to evolve because of a broken ``blocks_traveled`` evolution requirement.
 - Fixed displayName property in spawn files not doing what it's meant to do.
 - Fixed Pokémon not sleeping in the wild like we wanted them to.

@@ -413,9 +443,12 @@
 - The various hardcoded potion shoulder effects have been removed, make use of PotionBaseEffect.
 - Added ContextManager for tracking causes and contexts of conditions created during a battle. See BattleContext for types of conditions that are tracked. 
 - Added MongoDB support for storing Pokémon and Player data. Must be enabled in config, requires MongoDB core and sync drivers (4.10.0+).
+- CobblemonShowdown updated to version 10.
+- Generation of a battle can be set in BattleFormat.
+- Pokémon now have ``teraType``, ``dmaxLevel``, and ``gmaxFactor`` properties. Gimmicks can be used during battle by adding the respective identifiers to ``keyItems`` in PlayerData: ``key_stone``, ``z_ring``, ``dynamax_band``, and ``tera_orb``. Dynamax is only supported in Gen 8 battles. Mega Evolution and Z-Power require custom held items to be added (e.g. an item with the path ``gengarite`` will allow Gengar to Mega Evolve). Currently custom Z-Crystals and Mega Stones are not supported.

 ### Datapack & Resourcepack Creators
- All potion related shoulder effects have had their IDs changed, they now all share the same type being `potion_effect` and use the vanilla Potion data [parameters](https://minecraft.fandom.com/wiki/Potion#Item_data), take for example the default Pidgey asset:
+- All potion related shoulder effects have had their IDs changed. They now all share the same type being `potion_effect` and use the vanilla Potion data [parameters](https://minecraft.fandom.com/wiki/Potion#Item_data). For example, here is the converted Pidgey asset:
  - ```json
    {
      "type": "potion_effect",
@@ -427,6 +460,22 @@
    }
    ```
 - Renamed the ``walked_steps`` evolution requirement to ``blocks_traveled``.
+- Added support for scale in animations.
+- Added support for jump keyframes (i.e. pre and post keyframes)
+- Added structure spawning conditions
+- Added Advancement trigger for defeating Pokémon and collecting varieties of Pokémon.
+- Added support for "isBattle" and "isTouchingWater" properties on resource pack Pokémon poses. This allows your custom Pokémon to be posed differently when in battle.
+- Added support for "isVisible" on a transformed part on resource pack Pokémon poses. This allows your custom Pokémon to have bones disappear in specific poses, such as hiding Greninja's throwing star when not in a battle pose.
+- Added support for battle music. Sounds can be added to the ``battle.pvp.default`` and ``battle.pvw.default`` sound events.
+- Added 'enabled' optional property on model layers, allowing later variations to disable previously-defined layers. See [this issue](https://gitlab.com/cable-mc/cobblemon/-/issues/335) for how this looks.
+- Cobblemon items can now all have their own tooltips via resourcepacks. To add a tooltip, add a lang entry like "item.cobblemon.{item_id}.tooltip". If you want to add multiple tooltip lines you can do so with "item.cobblemon.{item_id}.tooltip_1" and upwards.
+- Item interaction evolutions and held item requirements now support NBT by creating an object JSON containing the key ``item`` for what used to be the existing condition support and a ``nbt`` key for the NBT format, this is the string [format](https://minecraft.fandom.com/wiki/NBT_format) expected in commands. Existing data does not need to be updated.
+- Fixed faint animations not working properly in add-ons.
+- Fixed non-existent species in spawn pool files causing random species to spawn.
+
+### Localization
+- Added partial translations for Dutch, Polish, Swedish, Hungarian, Czech, Cyprus Greek, and even Esperanto.
+- Updated translation for French and Canadian French, Simplified Chinese, Japanese, Korean, Spanish and Mexican Spanish, Pirate English, German, Thai, Turkish, Portuguese and Brazilian Portuguese, Ukrainian, and Russian.

 ## [1.3.1 (March 31st, 2023)](#1-3-1)

@@ -440,7 +489,7 @@
 - Add lava surface spawn preset.
 - Added an ``any`` evolution requirement allowing you to define ``possibilities`` of other evolution requirements, for example, this allows you to create an evolution that requires the Pokémon to be shiny or a female.
 - Added the `/spawnpokemonfrompool [amount]` or `/forcespawn [amount]` command to spawn Pokémon(s) in the surrounding area using the natural spawn rates/pool of that area, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.spawnpokemon` if a permission mod is present. On a successful execution of the command, the amount of Pokémon spawned will be the output.
- Added the `/pokebox` and `/pokeboxall` commands to move Pokemon(s) to the PC from a Player's party, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.pokebox` if a permission mod is present. On a successful execution of the command the output will be the number of pokemon moved to the Player's PC.
+- Added the `/pokebox` and `/pokeboxall` commands to move Pokémon(s) to the PC from a Player's party, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.pokebox` if a permission mod is present. On a successful execution of the command the output will be the number of pokemon moved to the Player's PC.
 - Added the `/pc` command which opens up the PC UI the same way interacting with the block would, this will be a cheat command in the Minecraft permission system or use the permission `cobblemon.command.pc` if a permission mod is present.

 ### Changes
@@ -19,6 +19,7 @@ architectury {

 repositories {
    maven(url = "${rootProject.projectDir}/deps")
+    maven(url = "https://api.modrinth.com/maven")
    mavenLocal()
 }

@@ -28,9 +29,10 @@ dependencies {

    modImplementation(libs.fabricLoader)
    //Flywheel has no common dep so just pick one and don't use any platform specific code in common
-    modCompileOnly(libs.flywheelFabric)
+//    modCompileOnly(libs.flywheelFabric)
    modApi(libs.molang)
    compileOnlyApi(libs.jeiApi)
+    modCompileOnly(libs.adornFabric)

    // For Showdown
    modCompileOnly(libs.graal)
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.CobblemonBlocks;
-import com.cobblemon.mod.common.block.PastureBlock;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.FenceBlock;
-import net.minecraft.block.HorizontalFacingBlock;
-import net.minecraft.util.math.Direction;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(value = FenceBlock.class)
-public abstract class FenceBlockMixin {
-
-    // This could be done with a modify variable but it just doesn't seem to want to work, very crude unfinished explanation I had on Fabric discord was
-    // "boolean is a primitive, it isnt passed by reference but by value and you have your own object references anyway so assigning a new object to non-primitive references (variables) wont modify it after your mixin returns
-    //(you cant modify a random argument that mixin passes you that way, target the boolean not the FenceBlock)"
-    // However the issue is the only way to get all the params which we need is by passing in the entire method reference which enforces the return type.
-
-    @Redirect(method = "getStateForNeighborUpdate", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/FenceBlock;canConnect(Lnet/minecraft/block/BlockState;ZLnet/minecraft/util/math/Direction;)Z"))
-    private boolean cobblemon$getStateForNeighborUpdate(FenceBlock instance, BlockState state, boolean neighborIsFullSquare, Direction dir) {
-        return instance.canConnect(state, neighborIsFullSquare, dir) || this.cobblemon$canConnect(state, dir);
-    }
-
-    @Redirect(method = "getPlacementState", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/FenceBlock;canConnect(Lnet/minecraft/block/BlockState;ZLnet/minecraft/util/math/Direction;)Z"))
-    private boolean cobblemon$getPlacementState(FenceBlock instance, BlockState state, boolean neighborIsFullSquare, Direction dir) {
-        return instance.canConnect(state, neighborIsFullSquare, dir) || this.cobblemon$canConnect(state, dir);
-    }
-
-    private boolean cobblemon$canConnect(BlockState state, Direction dir) {
-        if (state.isOf(CobblemonBlocks.PASTURE) && state.get(PastureBlock.Companion.getPART()) == PastureBlock.PasturePart.BOTTOM) {
-            final Direction pastureFacing = state.get(HorizontalFacingBlock.FACING);
-            return dir == pastureFacing.rotateYClockwise() || dir == pastureFacing.rotateYCounterclockwise();
-        }
-        return false;
-    }
-
-}
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin;
-
-import com.cobblemon.mod.common.api.spawning.mixins.CachedOnlyChunkAccessor;
-import com.mojang.datafixers.util.Either;
-import net.minecraft.server.world.ChunkHolder;
-import net.minecraft.server.world.ServerChunkManager;
-import net.minecraft.util.math.ChunkPos;
-import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.chunk.ChunkManager;
-import net.minecraft.world.chunk.ChunkStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import java.util.concurrent.CompletableFuture;
-
-@Mixin(ServerChunkManager.class)
-public abstract class ServerChunkManagerMixin extends ChunkManager implements CachedOnlyChunkAccessor {
-    @Shadow @Nullable protected abstract ChunkHolder getChunkHolder(long pos);
-
-    @Override
-    public Chunk cobblemon$request(int x, int z, @NotNull ChunkStatus status) {
-        long l = ChunkPos.toLong(x, z);
-
-        ChunkHolder holder = getChunkHolder(l);
-        if (holder != null) {
-            CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>> future = holder.getFutureFor(status);
-            if (future.isDone()) {
-                return future.join().left().orElse(null);
-            }
-        }
-
-        return null;
-    }
-}
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.entity;
+
+import com.cobblemon.mod.common.brewing.BrewingRecipes;
+import net.minecraft.block.entity.BrewingStandBlockEntity;
+import net.minecraft.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(BrewingStandBlockEntity.class)
+public abstract class BrewingStandBlockEntityMixin
+{
+    @Inject(
+        method = "isValid",
+        at = @At(value = "HEAD"),
+        cancellable = true
+    )
+    private void cobblemon$isValid(int slot, ItemStack stack, CallbackInfoReturnable<Boolean> cir) {
+        final BrewingStandBlockEntity entity = (BrewingStandBlockEntity) (Object) this;
+        if (slot < 3)
+        {
+            if (entity.getStack(slot).isEmpty() && BrewingRecipes.brewableItems.contains(stack.getItem()))
+                cir.setReturnValue(true);
+        }
+    }
+}
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.mixin.invoker;
+
+import net.minecraft.block.Block;
+import org.spongepowered.asm.mixin.Mixin;
+import net.minecraft.block.FireBlock;
+import net.minecraft.block.Blocks;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(FireBlock.class)
+public interface FireBlockInvoker {
+    @Invoker("registerFlammableBlock") void registerNewFlammableBlock(Block block, int burnChance, int spreadChance);
+}
@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common

 import com.cobblemon.mod.common.advancement.CobblemonCriteria
+import com.cobblemon.mod.common.advancement.criterion.EvolvePokemonContext
 import com.cobblemon.mod.common.api.Priority
 import com.cobblemon.mod.common.api.SeasonResolver
 import com.cobblemon.mod.common.api.data.DataProvider
@@ -336,7 +337,7 @@ object Cobblemon {
            // Ensure the config option is enabled and that the result was a ninjask and that shedinja exists
            if (this.config.ninjaskCreatesShedinja && pokemon.species.resourceIdentifier == ninjaskIdentifier && PokemonSpecies.getByIdentifier(Pokemon.SHEDINJA) != null) {
                val player = pokemon.getOwnerPlayer() ?: return@subscribe
-                if (player.inventory.containsAny { it.item is PokeBallItem }) {
+                if (player.isCreative || player.inventory.containsAny { it.item is PokeBallItem }) {
                    var pokeball = Items.AIR
                    player.inventory.combinedInventory.forEach {
                        it.forEach {
@@ -345,7 +346,12 @@ object Cobblemon {
                            }
                        }
                    }
-                    player.inventory.removeAmountIf(1) { it.item is PokeBallItem }
+                    if (!player.isCreative) {
+                        player.inventory.removeAmountIf(1) { it.item is PokeBallItem }
+                    }
+                    if (pokeball == Items.AIR) {
+                        pokeball = CobblemonItems.POKE_BALL
+                    }
                    val properties = event.evolution.result.copy()
                    properties.species = Pokemon.SHEDINJA.toString()
                    val product = pokemon.clone()
@@ -353,6 +359,7 @@ object Cobblemon {
                    properties.apply(product)
                    product.caughtBall = (pokeball as PokeBallItem).pokeBall
                    pokemon.storeCoordinates.get()?.store?.add(product)
+                    CobblemonCriteria.EVOLVE_POKEMON.trigger(player, EvolvePokemonContext(event.pokemon.preEvolution!!.species.resourceIdentifier, product.species.resourceIdentifier, playerData.get(player).advancementData.totalEvolvedCount))
                }
            }
        }
@@ -33,6 +33,8 @@ import net.minecraft.util.math.intprovider.UniformIntProvider
@Suppress("SameParameterValue", "HasPlatformType", "MemberVisibilityCanBePrivate", "unused")
 object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<Block>>, Block>() {

+
+
    override val registry: Registry<Block> = Registries.BLOCK
    override val registryKey: RegistryKey<Registry<Block>> = RegistryKeys.BLOCK

@@ -228,6 +230,8 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
        APRICORN_LOG to STRIPPED_APRICORN_LOG
    )

+
+
    private fun apricornBlock(name: String, apricorn: Apricorn): ApricornBlock = this.create(name, ApricornBlock(AbstractBlock.Settings.create().mapColor(apricorn.mapColor()).ticksRandomly().strength(Blocks.OAK_LOG.hardness, Blocks.OAK_LOG.blastResistance).sounds(BlockSoundGroup.WOOD).nonOpaque(), apricorn))

    private val berries = mutableMapOf<Identifier, BerryBlock>()
@@ -302,6 +306,25 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
    val WIKI_BERRY = this.berryBlock("wiki")
    val YACHE_BERRY = this.berryBlock("yache")

+    init {
+        /**
+         * Makes all blocks in array flammable by adding them to FireBlock's flammableRegistry.
+         * second value is burn chance and third value is spread chance
+         */
+        arrayOf(
+            Triple(APRICORN_LOG, 5, 5),
+            Triple(STRIPPED_APRICORN_LOG, 5, 5),
+            Triple(APRICORN_WOOD, 5, 5),
+            Triple(STRIPPED_APRICORN_WOOD, 5, 5),
+            Triple(APRICORN_PLANKS, 5, 20),
+            Triple(APRICORN_LEAVES, 30, 60),
+            Triple(APRICORN_FENCE, 5, 20),
+            Triple(APRICORN_FENCE_GATE, 5, 20),
+            Triple(APRICORN_SLAB, 5, 20),
+            Triple(APRICORN_STAIRS, 5, 20)
+        ).onEach{ data -> setFlammable(data.first, data.second, data.third) }
+    }
+
    fun berries() = this.berries.toMap()

    private fun berryBlock(name: String): BerryBlock {
@@ -312,14 +335,28 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
    }

    /**
-     * Helper method for creating logs
-     * copied over from Vanilla
+     * Calls helper method from Vanilla
     */
    private fun log(name: String, arg: MapColor = MapColor.DIRT_BROWN, arg2: MapColor = MapColor.DIRT_BROWN): PillarBlock {
        val block = BlocksInvoker.createLogBlock(arg, arg2)
        return this.create(name, block)
    }

+    /**
+     * Method uses generic E in order to keep the block as the same return type.
+     * If E is not a block then it will not be set as flammable.
+     * Calls Vanilla implementation of registering a flammable block.
+     * Mixins looks cursed but it is java's fault.
+     */
+    private fun <E> setFlammable(block: E, burnChance: Int, spreadChance: Int): E {
+        if(block !is Block) return block
+
+        var fireBlock: FireBlock =  Blocks.FIRE as FireBlock
+        //Cursed Mixin stuff
+        (fireBlock as FireBlockInvoker).registerNewFlammableBlock(block as Block, burnChance, spreadChance)
+        return block
+    }
+
    private fun evolutionStoneOre(name: String) = this.create(name, ExperienceDroppingBlock(AbstractBlock.Settings.copy(Blocks.IRON_ORE), UniformIntProvider.create(1, 2)))

    private fun deepslateEvolutionStoneOre(name: String) = this.create(name, ExperienceDroppingBlock(AbstractBlock.Settings.copy(Blocks.DEEPSLATE_IRON_ORE), UniformIntProvider.create(1, 2)))
@@ -15,7 +15,9 @@ import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
 import com.mojang.brigadier.arguments.ArgumentType
 import kotlin.reflect.KClass
 import net.minecraft.advancement.criterion.Criterion
+import net.minecraft.block.ComposterBlock
 import net.minecraft.command.argument.serialize.ArgumentSerializer
+import net.minecraft.item.ItemConvertible
 import net.minecraft.network.PacketByteBuf
 import net.minecraft.network.listener.ClientPlayPacketListener
 import net.minecraft.network.packet.Packet
@@ -26,6 +28,7 @@ import net.minecraft.resource.ResourceReloader
 import net.minecraft.resource.ResourceType
 import net.minecraft.server.MinecraftServer
 import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.text.Text
 import net.minecraft.util.Identifier
 import net.minecraft.world.GameRules
 import net.minecraft.world.biome.Biome
@@ -169,6 +172,44 @@ interface CobblemonImplementation {
     * @param manager The [ResourceManager] to reload from.
     */
    fun <T> reloadJsonRegistry(registry: JsonDataRegistry<T>, manager: ResourceManager): HashMap<Identifier, T>
+
+    /**
+     * Registers an item to the [ComposterBlock].
+     *
+     * @param item The [ItemConvertible] being registered.
+     * @param chance The chance % of increasing the composter level, 0 to 1 expected.
+     */
+    fun registerCompostable(item: ItemConvertible, chance: Float)
+
+    /**
+     * Registers a builtin resource pack.
+     *
+     * @param id The unique [Identifier] of this pack.
+     * @param title The title displayed in the resource pack GUI, the description is still a part of the pack metadata.
+     * @param activationBehaviour The [ResourcePackActivationBehaviour] for this pack.
+     */
+    fun registerBuiltinResourcePack(id: Identifier, title: Text, activationBehaviour: ResourcePackActivationBehaviour)
+
+}
+
+enum class ResourcePackActivationBehaviour {
+
+    /**
+     * The resource pack will start disabled.
+     */
+    NORMAL,
+
+    /**
+     * The resource pack will start enabled.
+     */
+    DEFAULT_ENABLED,
+
+    /**
+     * The resource pack will always be enabled.
+     * The user can reorder it but cannot remove it.
+     */
+    ALWAYS_ENABLED;
+
 }

 enum class ModAPI {
@@ -14,6 +14,7 @@ import com.cobblemon.mod.common.api.pokemon.Natures
 import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.pokemon.status.Statuses
 import com.cobblemon.mod.common.block.BerryBlock
+import com.cobblemon.mod.common.block.MintBlock
 import com.cobblemon.mod.common.block.MintBlock.MintType
 import com.cobblemon.mod.common.item.*
 import com.cobblemon.mod.common.item.battle.DireHitItem
@@ -32,7 +33,6 @@ import com.cobblemon.mod.common.pokeball.PokeBall
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.block.Block
-import net.minecraft.block.ComposterBlock
 import net.minecraft.entity.LivingEntity
 import net.minecraft.entity.effect.StatusEffectInstance
 import net.minecraft.entity.effect.StatusEffects
@@ -117,40 +117,40 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    val CHERISH_BALL = pokeBallItem(PokeBalls.CHERISH_BALL)

    @JvmField
-    val VIVICHOKE = create("vivichoke", Item(Item.Settings()))
+    val VIVICHOKE = compostableItem("vivichoke")

    @JvmField
-    val VIVICHOKE_SEEDS = create("vivichoke_seeds", VivichokeItem(CobblemonBlocks.VIVICHOKE_SEEDS))
+    val VIVICHOKE_SEEDS = compostableItem("vivichoke_seeds", VivichokeItem(CobblemonBlocks.VIVICHOKE_SEEDS))

    @JvmField
-    val RED_APRICORN = create("red_apricorn", ApricornItem(CobblemonBlocks.RED_APRICORN))
+    val RED_APRICORN = apricronItem("red", ApricornItem(CobblemonBlocks.RED_APRICORN))
    @JvmField
-    val YELLOW_APRICORN = create("yellow_apricorn", ApricornItem(CobblemonBlocks.YELLOW_APRICORN))
+    val YELLOW_APRICORN = apricronItem("yellow", ApricornItem(CobblemonBlocks.YELLOW_APRICORN))
    @JvmField
-    val GREEN_APRICORN = create("green_apricorn", ApricornItem(CobblemonBlocks.GREEN_APRICORN))
+    val GREEN_APRICORN = apricronItem("green", ApricornItem(CobblemonBlocks.GREEN_APRICORN))
    @JvmField
-    val BLUE_APRICORN = create("blue_apricorn", ApricornItem(CobblemonBlocks.BLUE_APRICORN))
+    val BLUE_APRICORN = apricronItem("blue", ApricornItem(CobblemonBlocks.BLUE_APRICORN))
    @JvmField
-    val PINK_APRICORN = create("pink_apricorn", ApricornItem(CobblemonBlocks.PINK_APRICORN))
+    val PINK_APRICORN = apricronItem("pink", ApricornItem(CobblemonBlocks.PINK_APRICORN))
    @JvmField
-    val BLACK_APRICORN = create("black_apricorn", ApricornItem(CobblemonBlocks.BLACK_APRICORN))
+    val BLACK_APRICORN = apricronItem("black", ApricornItem(CobblemonBlocks.BLACK_APRICORN))
    @JvmField
-    val WHITE_APRICORN = create("white_apricorn", ApricornItem(CobblemonBlocks.WHITE_APRICORN))
+    val WHITE_APRICORN = apricronItem("white", ApricornItem(CobblemonBlocks.WHITE_APRICORN))

    @JvmField
-    val RED_APRICORN_SEED = create("red_apricorn_seed", ApricornSeedItem(CobblemonBlocks.RED_APRICORN_SAPLING))
+    val RED_APRICORN_SEED = apricronSeedItem("red", ApricornSeedItem(CobblemonBlocks.RED_APRICORN_SAPLING))
    @JvmField
-    val YELLOW_APRICORN_SEED = create("yellow_apricorn_seed", ApricornSeedItem(CobblemonBlocks.YELLOW_APRICORN_SAPLING))
+    val YELLOW_APRICORN_SEED = apricronSeedItem("yellow", ApricornSeedItem(CobblemonBlocks.YELLOW_APRICORN_SAPLING))
    @JvmField
-    val GREEN_APRICORN_SEED = create("green_apricorn_seed", ApricornSeedItem(CobblemonBlocks.GREEN_APRICORN_SAPLING))
+    val GREEN_APRICORN_SEED = apricronSeedItem("green", ApricornSeedItem(CobblemonBlocks.GREEN_APRICORN_SAPLING))
    @JvmField
-    val BLUE_APRICORN_SEED = create("blue_apricorn_seed", ApricornSeedItem(CobblemonBlocks.BLUE_APRICORN_SAPLING))
+    val BLUE_APRICORN_SEED = apricronSeedItem("blue", ApricornSeedItem(CobblemonBlocks.BLUE_APRICORN_SAPLING))
    @JvmField
-    val PINK_APRICORN_SEED = create("pink_apricorn_seed", ApricornSeedItem(CobblemonBlocks.PINK_APRICORN_SAPLING))
+    val PINK_APRICORN_SEED = apricronSeedItem("pink", ApricornSeedItem(CobblemonBlocks.PINK_APRICORN_SAPLING))
    @JvmField
-    val BLACK_APRICORN_SEED = create("black_apricorn_seed", ApricornSeedItem(CobblemonBlocks.BLACK_APRICORN_SAPLING))
+    val BLACK_APRICORN_SEED = apricronSeedItem("black", ApricornSeedItem(CobblemonBlocks.BLACK_APRICORN_SAPLING))
    @JvmField
-    val WHITE_APRICORN_SEED = create("white_apricorn_seed", ApricornSeedItem(CobblemonBlocks.WHITE_APRICORN_SAPLING))
+    val WHITE_APRICORN_SEED = apricronSeedItem("white", ApricornSeedItem(CobblemonBlocks.WHITE_APRICORN_SAPLING))

    @JvmField
    val APRICORN_LOG = blockItem("apricorn_log", CobblemonBlocks.APRICORN_LOG)
@@ -163,13 +163,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    @JvmField
    val APRICORN_PLANKS = blockItem("apricorn_planks", CobblemonBlocks.APRICORN_PLANKS)
    @JvmField
-    val APRICORN_LEAVES = blockItem("apricorn_leaves", CobblemonBlocks.APRICORN_LEAVES).also {
-        val compostChance = ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.getFloat(Items.OAK_LEAVES)
-        // Should always pass unless Mojang reworks leaves to no longer work in the Composter, in that case we already updated w.o doing anything
-        if (compostChance != ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.defaultReturnValue()) {
-            ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE[it] = compostChance
-        }
-    }
+    val APRICORN_LEAVES = compostableBlockItem("apricorn_leaves", CobblemonBlocks.APRICORN_LEAVES)

    @JvmField
    val APRICORN_DOOR = blockItem("apricorn_door", CobblemonBlocks.APRICORN_DOOR)
@@ -353,11 +347,11 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
        }
    })
    @JvmField
-    val ENERGY_ROOT = create("energy_root", EnergyRootItem(CobblemonBlocks.ENERGY_ROOT, Item.Settings().food(FoodComponent.Builder().hunger(1).snack().saturationModifier(0.2f).build())))
+    val ENERGY_ROOT = compostableItem("energy_root", EnergyRootItem(CobblemonBlocks.ENERGY_ROOT, Item.Settings().food(FoodComponent.Builder().hunger(1).snack().saturationModifier(0.2f).build())))
    @JvmField
-    val REVIVAL_HERB = create("revival_herb", RevivalHerbItem(CobblemonBlocks.REVIVAL_HERB))
+    val REVIVAL_HERB = compostableItem("revival_herb", RevivalHerbItem(CobblemonBlocks.REVIVAL_HERB))
    @JvmField
-    val PEP_UP_FLOWER = blockItem("pep_up_flower", CobblemonBlocks.PEP_UP_FLOWER)
+    val PEP_UP_FLOWER = compostableBlockItem("pep_up_flower", CobblemonBlocks.PEP_UP_FLOWER)
    @JvmField
    val MEDICINAL_BREW = create("medicinal_brew", Item(Item.Settings()))
    @JvmField
@@ -392,72 +386,74 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    val PP_MAX = create("pp_max", PPUpItem(3))

    @JvmField
-    val RED_MINT_SEEDS = blockItem("red_mint_seeds", MintType.RED.getCropBlock())
+    val RED_MINT_SEEDS = mintSeed("red", MintType.RED.getCropBlock())
    @JvmField
-    val RED_MINT_LEAF = create("red_mint_leaf", MintLeafItem(MintType.RED))
+    val RED_MINT_LEAF = mintLeaf("red", MintLeafItem(MintType.RED))
    @JvmField
-    val BLUE_MINT_SEEDS = blockItem("blue_mint_seeds", MintType.BLUE.getCropBlock())
+    val BLUE_MINT_SEEDS = mintSeed("blue", MintType.BLUE.getCropBlock())
    @JvmField
-    val BLUE_MINT_LEAF = create("blue_mint_leaf", MintLeafItem(MintType.BLUE))
+    val BLUE_MINT_LEAF = mintLeaf("blue", MintLeafItem(MintType.BLUE))
    @JvmField
-    val CYAN_MINT_SEEDS = blockItem("cyan_mint_seeds", MintType.CYAN.getCropBlock())
+    val CYAN_MINT_SEEDS = mintSeed("cyan", MintType.CYAN.getCropBlock())
    @JvmField
-    val CYAN_MINT_LEAF = create("cyan_mint_leaf", MintLeafItem(MintType.CYAN))
+    val CYAN_MINT_LEAF = mintLeaf("cyan", MintLeafItem(MintType.CYAN))
    @JvmField
-    val PINK_MINT_SEEDS = blockItem("pink_mint_seeds", MintType.PINK.getCropBlock())
+    val PINK_MINT_SEEDS = mintSeed("pink", MintType.PINK.getCropBlock())
    @JvmField
-    val PINK_MINT_LEAF = create("pink_mint_leaf", MintLeafItem(MintType.PINK))
+    val PINK_MINT_LEAF = mintLeaf("pink", MintLeafItem(MintType.PINK))
    @JvmField
-    val GREEN_MINT_SEEDS = blockItem("green_mint_seeds", MintType.GREEN.getCropBlock())
+    val GREEN_MINT_SEEDS = mintSeed("green", MintType.GREEN.getCropBlock())
    @JvmField
-    val GREEN_MINT_LEAF = create("green_mint_leaf", MintLeafItem(MintType.GREEN))
+    val GREEN_MINT_LEAF = mintLeaf("green", MintLeafItem(MintType.GREEN))
    @JvmField
-    val WHITE_MINT_SEEDS = blockItem("white_mint_seeds", MintType.WHITE.getCropBlock())
+    val WHITE_MINT_SEEDS = mintSeed("white", MintType.WHITE.getCropBlock())
    @JvmField
-    val WHITE_MINT_LEAF = create("white_mint_leaf", MintLeafItem(MintType.WHITE))
+    val WHITE_MINT_LEAF = mintLeaf("white", MintLeafItem(MintType.WHITE))
+
+    val mints = mutableMapOf<String, MintItem>()

    @JvmField
-    val LONELY_MINT = create("lonely_mint", MintItem(Natures.LONELY))
+    val LONELY_MINT = mintItem("lonely_mint", MintItem(Natures.LONELY))
    @JvmField
-    val ADAMANT_MINT = create("adamant_mint", MintItem(Natures.ADAMANT))
+    val ADAMANT_MINT = mintItem("adamant_mint", MintItem(Natures.ADAMANT))
    @JvmField
-    val NAUGHTY_MINT = create("naughty_mint", MintItem(Natures.NAUGHTY))
+    val NAUGHTY_MINT = mintItem("naughty_mint", MintItem(Natures.NAUGHTY))
    @JvmField
-    val BRAVE_MINT = create("brave_mint", MintItem(Natures.BRAVE))
+    val BRAVE_MINT = mintItem("brave_mint", MintItem(Natures.BRAVE))
    @JvmField
-    val BOLD_MINT = create("bold_mint", MintItem(Natures.BOLD))
+    val BOLD_MINT = mintItem("bold_mint", MintItem(Natures.BOLD))
    @JvmField
-    val IMPISH_MINT = create("impish_mint", MintItem(Natures.IMPISH))
+    val IMPISH_MINT = mintItem("impish_mint", MintItem(Natures.IMPISH))
    @JvmField
-    val LAX_MINT = create("lax_mint", MintItem(Natures.LAX))
+    val LAX_MINT = mintItem("lax_mint", MintItem(Natures.LAX))
    @JvmField
-    val RELAXED_MINT = create("relaxed_mint", MintItem(Natures.RELAXED))
+    val RELAXED_MINT = mintItem("relaxed_mint", MintItem(Natures.RELAXED))
    @JvmField
-    val MODEST_MINT = create("modest_mint", MintItem(Natures.MODEST))
+    val MODEST_MINT = mintItem("modest_mint", MintItem(Natures.MODEST))
    @JvmField
-    val MILD_MINT = create("mild_mint", MintItem(Natures.MILD))
+    val MILD_MINT = mintItem("mild_mint", MintItem(Natures.MILD))
    @JvmField
-    val RASH_MINT = create("rash_mint", MintItem(Natures.RASH))
+    val RASH_MINT = mintItem("rash_mint", MintItem(Natures.RASH))
    @JvmField
-    val QUIET_MINT = create("quiet_mint", MintItem(Natures.QUIET))
+    val QUIET_MINT = mintItem("quiet_mint", MintItem(Natures.QUIET))
    @JvmField
-    val CALM_MINT = create("calm_mint", MintItem(Natures.CALM))
+    val CALM_MINT = mintItem("calm_mint", MintItem(Natures.CALM))
    @JvmField
-    val GENTLE_MINT = create("gentle_mint", MintItem(Natures.GENTLE))
+    val GENTLE_MINT = mintItem("gentle_mint", MintItem(Natures.GENTLE))
    @JvmField
-    val CAREFUL_MINT = create("careful_mint", MintItem(Natures.CAREFUL))
+    val CAREFUL_MINT = mintItem("careful_mint", MintItem(Natures.CAREFUL))
    @JvmField
-    val SASSY_MINT = create("sassy_mint", MintItem(Natures.SASSY))
+    val SASSY_MINT = mintItem("sassy_mint", MintItem(Natures.SASSY))
    @JvmField
-    val TIMID_MINT = create("timid_mint", MintItem(Natures.TIMID))
+    val TIMID_MINT = mintItem("timid_mint", MintItem(Natures.TIMID))
    @JvmField
-    val HASTY_MINT = create("hasty_mint", MintItem(Natures.HASTY))
+    val HASTY_MINT = mintItem("hasty_mint", MintItem(Natures.HASTY))
    @JvmField
-    val JOLLY_MINT = create("jolly_mint", MintItem(Natures.JOLLY))
+    val JOLLY_MINT = mintItem("jolly_mint", MintItem(Natures.JOLLY))
    @JvmField
-    val NAIVE_MINT = create("naive_mint", MintItem(Natures.NAIVE))
+    val NAIVE_MINT = mintItem("naive_mint", MintItem(Natures.NAIVE))
    @JvmField
-    val SERIOUS_MINT = create("serious_mint", MintItem(Natures.SERIOUS))
+    val SERIOUS_MINT = mintItem("serious_mint", MintItem(Natures.SERIOUS))

    @JvmField val X_ACCURACY = create("x_${Stats.ACCURACY.identifier.path}", XStatItem(Stats.ACCURACY))
    @JvmField val X_ATTACK = create("x_${Stats.ATTACK.identifier.path}", XStatItem(Stats.ATTACK))
@@ -616,11 +612,11 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    @JvmField
    val WISE_GLASSES = heldItem("wise_glasses")
    @JvmField
-    val MENTAL_HERB = heldItem("mental_herb")
+    val MENTAL_HERB = compostableHeldItem("mental_herb")
    @JvmField
-    val MIRROR_HERB = heldItem("mirror_herb")
+    val MIRROR_HERB = compostableHeldItem("mirror_herb")
    @JvmField
-    val POWER_HERB = heldItem("power_herb")
+    val POWER_HERB = compostableHeldItem("power_herb")
    @JvmField
    val WHITE_HERB = heldItem("white_herb")
    @JvmField
@@ -670,10 +666,17 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    @JvmField
    val POKEMON_MODEL = this.create("pokemon_model", PokemonItem())

+    //Keyitems
+    @JvmField
+    val PHOTODEX = photodexItem("photodex")
+
+
    private fun blockItem(name: String, block: Block): BlockItem = this.create(name, BlockItem(block, Item.Settings()))

    private fun noSettingsItem(name: String): CobblemonItem = this.create(name, CobblemonItem(Item.Settings()))

+    private fun photodexItem(name: String): PhotodexItem = this.create(name, PhotodexItem())
+
    fun berries() = this.berries.toMap()

    private fun mulchItem(name: String, mulchVariant: MulchVariant): MulchItem = this.create(name, MulchItem(mulchVariant))
@@ -696,9 +699,12 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
        }
    )

+    private fun compostable(item: Item, increaseLevelChance: Float) = Cobblemon.implementation.registerCompostable(item, increaseLevelChance)
+
    private fun berryItem(name: String, berryBlock: BerryBlock): BerryItem {
        val finalName = "${name}_berry"
        val item = this.create(finalName, BerryItem(berryBlock))
+        compostable(item, .65f)
        this.berries[cobblemonResource(finalName)] = item
        return item
    }
@@ -706,7 +712,62 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
    private fun berryItem(name: String, berryItem: BerryItem): BerryItem {
        val finalName = "${name}_berry"
        val item = this.create(finalName, berryItem)
+        compostable(item, .65f)
        this.berries[cobblemonResource(finalName)] = item
        return item
    }
+
+    private fun mintItem(name: String, mintItem: MintItem): MintItem {
+        val item = this.create(name, mintItem)
+        mints[item.nature.displayName] = item
+        compostable(item, .65f)
+        return item
+    }
+
+    private fun apricronItem(name: String, apricornItem: ApricornItem): ApricornItem {
+        val finalName = "${name}_apricorn"
+        val item = this.create(finalName, apricornItem)
+        compostable(item, .65f)
+        return item
+    }
+
+    private fun apricronSeedItem(name: String, apricronSeedItem: ApricornSeedItem): ApricornSeedItem {
+        val finalName = "${name}_apricorn_seed"
+        val item = this.create(finalName, apricronSeedItem)
+        compostable(item, .65f)
+        return item
+    }
+
+    private fun mintSeed(name: String, mintBlock: MintBlock): Item {
+        val finalName = "${name}_mint_seeds"
+        val item = this.blockItem(finalName, mintBlock)
+        compostable(item, .65f)
+        return item
+    }
+
+    private fun mintLeaf(name: String, mintLeafItem: MintLeafItem): MintLeafItem {
+        val finalName = "${name}_mint_leaf"
+        val item = this.create(finalName, mintLeafItem)
+        compostable(item, .65f)
+        return item
+    }
+
+    private fun compostableItem(name: String, item: Item? = null, increaseLevelChance: Float = .65f): Item {
+        val createdItem = this.create(name, item ?: Item(Item.Settings()))
+        compostable(createdItem, increaseLevelChance)
+        return createdItem
+    }
+
+    private fun compostableHeldItem(name: String, remappedName: String? = null, increaseLevelChance: Float = .65f): CobblemonItem {
+        val createdItem = heldItem(name, remappedName)
+        compostable(createdItem, increaseLevelChance)
+        return createdItem
+    }
+
+    private fun compostableBlockItem(name: String, block: Block, increaseLevelChance: Float = .65f): Item {
+        val createdItem = this.blockItem(name, block)
+        compostable(createdItem, increaseLevelChance)
+        return createdItem
+    }
+
 }
@@ -26,13 +26,20 @@ abstract class AIBattleActor(
        super.sendUpdate(packet)

        if (packet is BattleMakeChoicePacket) {
-            try {
-                setActionResponses(request!!.iterate(this.activePokemon, battleAI::choose))
-            } catch (exception: IllegalActionChoiceException) {
-                LOGGER.error("AI was unable to choose a move, we're going to need to pass!")
-                exception.printStackTrace()
-                setActionResponses(request!!.iterate(this.activePokemon) { _, _, _ -> PassActionResponse })
-            }
+            this.onChoiceRequested()
+        }
+    }
+
+    /**
+     * Called when the AI is requested to make a choice.
+     */
+    open fun onChoiceRequested() {
+        try {
+            setActionResponses(request!!.iterate(this.activePokemon, battleAI::choose))
+        } catch (exception: IllegalActionChoiceException) {
+            LOGGER.error("AI was unable to choose a move, we're going to need to pass!")
+            exception.printStackTrace()
+            setActionResponses(request!!.iterate(this.activePokemon) { _, _, _ -> PassActionResponse })
        }
    }
 }
@@ -10,11 +10,11 @@ package com.cobblemon.mod.common.api.drop

 import com.cobblemon.mod.common.api.events.CobblemonEvents.LOOT_DROPPED
 import com.cobblemon.mod.common.api.events.drops.LootDroppedEvent
-import kotlin.random.Random
 import net.minecraft.entity.LivingEntity
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.server.world.ServerWorld
 import net.minecraft.util.math.Vec3d
+import kotlin.random.Random

 /**
 * A table of drops that can produce a list of [DropEntry]. You can produce a drop list from [getDrops] to
@@ -31,6 +31,7 @@ import com.cobblemon.mod.common.api.events.pokemon.*
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionAcceptedEvent
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionCompleteEvent
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionDisplayEvent
+import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionTestedEvent
 import com.cobblemon.mod.common.api.events.pokemon.interaction.ExperienceCandyUseEvent
 import com.cobblemon.mod.common.api.events.starter.StarterChosenEvent
 import com.cobblemon.mod.common.api.events.storage.ReleasePokemonEvent
@@ -43,6 +44,7 @@ import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.server.network.ServerPlayerEntity

+@Suppress("unused")
 object CobblemonEvents {

    @JvmField
@@ -58,6 +60,8 @@ object CobblemonEvents {
    @JvmField
    val EVOLUTION_DISPLAY = EventObservable<EvolutionDisplayEvent>()
    @JvmField
+    val EVOLUTION_TESTED = EventObservable<EvolutionTestedEvent>()
+    @JvmField
    val EVOLUTION_COMPLETE = EventObservable<EvolutionCompleteEvent>()
    @JvmField
    val POKEMON_NICKNAMED = CancelableObservable<PokemonNicknamedEvent>()
@@ -109,7 +113,10 @@ object CobblemonEvents {
    val POKEMON_ENTITY_SPAWN = ENTITY_SPAWN
        .pipe(
            filter { it.entity is PokemonEntity },
-            map { it as SpawnEvent<PokemonEntity> }
+            map {
+                @Suppress("UNCHECKED_CAST")
+                it as SpawnEvent<PokemonEntity>
+            }
        )

    @JvmField
@@ -23,6 +23,6 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 * @since April 28th, 2022
 */
 data class EvolutionAcceptedEvent(
-    val pokemon: Pokemon,
-    val evolution: Evolution
-) : Cancelable()
+    override val pokemon: Pokemon,
+    override val evolution: Evolution
+) : Cancelable(), EvolutionEvent
@@ -21,6 +21,6 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 * @since October 2nd, 2022
 */
 data class EvolutionCompleteEvent(
-    val pokemon: Pokemon,
-    val evolution: Evolution
-)
+    override val pokemon: Pokemon,
+    override val evolution: Evolution
+) : EvolutionEvent
@@ -25,7 +25,7 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 * @since May 3rd, 2022
 */
 data class EvolutionDisplayEvent(
-    val pokemon: Pokemon,
+    override val pokemon: Pokemon,
    var display: EvolutionDisplay,
-    val evolution: Evolution
-)
+    override val evolution: Evolution
+) : EvolutionEvent
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.pokemon.evolution
+
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.pokemon.Pokemon
+
+/**
+ * The root of the various evolution related events.
+ */
+interface EvolutionEvent {
+
+    /**
+     * The Pokémon impacted in this event.
+     */
+    val pokemon: Pokemon
+
+    /**
+     * The evolution triggering this event.
+     */
+    val evolution: Evolution
+
+}
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.api.events.pokemon.evolution
+
+import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
+import com.cobblemon.mod.common.pokemon.Pokemon
+
+/**
+ * An event fired when [Evolution.test] has been performed.
+ * The final state [result] will be the return value of the test function.
+ *
+ * @property pokemon The [Pokemon] being tested against.
+ * @property evolution The [Evolution] instance performing the test.
+ * @property originalResult The base result from the Cobblemon implementation.
+ * @property result The final value returned by [Evolution.test].
+ */
+data class EvolutionTestedEvent(
+    override val pokemon: Pokemon,
+    override val evolution: Evolution,
+    val originalResult: Boolean,
+    var result: Boolean
+) : EvolutionEvent
@@ -122,16 +122,27 @@ fun drawText(
    y: Number,
    centered: Boolean = false,
    colour: Int,
-    shadow: Boolean = true
-) {
+    shadow: Boolean = true,
+    pMouseX: Number? = null,
+    pMouseY: Number? = null
+): Boolean {
    val comp = if (font == null) text else text.setStyle(text.style.withFont(font))
    val textRenderer = MinecraftClient.getInstance().textRenderer
    var x = x
+    val width = textRenderer.getWidth(comp)
    if (centered) {
-        val width = textRenderer.getWidth(comp)
        x = x.toDouble() - width / 2
    }
    context.drawText(textRenderer, comp, x.toInt(), y.toInt(), colour, shadow)
+    var isHovered = false
+    if (pMouseY != null && pMouseX != null) {
+        if (pMouseX.toInt() >= x.toInt() && pMouseX.toInt() <= x.toInt() + width &&
+            pMouseY.toInt() >= y.toInt() && pMouseY.toInt() <= y.toInt() + textRenderer.fontHeight
+        ) {
+            isHovered = true
+        }
+    }
+    return isHovered
 }

 fun drawText(
@@ -156,7 +156,7 @@ open class PokemonProperties {
        }

        private fun parseSpeciesIdentifier(keyPairs: MutableList<Pair<String, String?>>): String? {
-            fun cleanSpeciesName(string: String) = string.lowercase().replace("[^a-z0-9:]".toRegex(), "")
+            fun cleanSpeciesName(string: String) = string.lowercase().replace("[^a-z0-9_:]".toRegex(), "")
            val matched = getMatchedKeyPair(keyPairs, listOf("species"))
            if (matched != null) {
                val value = matched.second?.let(::cleanSpeciesName) ?: return null
@@ -486,7 +486,6 @@ open class PokemonProperties {
    fun roll(pokemon: Pokemon) {
        val baseTypes = pokemon.species.types.toList()
        if (this.shiny == null) pokemon.shiny = Cobblemon.config.shinyRate.checkRate()
-        if (this.gmaxFactor == null) pokemon.gmaxFactor = Cobblemon.config.gigantamaxFactorRate.checkRate()
        if (this.teraType == null) pokemon.teraType =
            if (Cobblemon.config.teraTypeRate.checkRate()) ElementalTypes.all().filter { !baseTypes.contains(it) }.random()
            else baseTypes.random()
@@ -9,9 +9,9 @@
 package com.cobblemon.mod.common.api.pokemon.evolution

 import com.cobblemon.mod.common.CobblemonSounds
-import com.cobblemon.mod.common.api.abilities.AbilityPool
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionCompleteEvent
+import com.cobblemon.mod.common.api.events.pokemon.evolution.EvolutionTestedEvent
 import com.cobblemon.mod.common.api.moves.BenchedMove
 import com.cobblemon.mod.common.api.moves.MoveTemplate
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
@@ -67,7 +67,12 @@ interface Evolution : EvolutionLike {
     * @param pokemon The [Pokemon] being queried.
     * @return If the [Evolution] can start.
     */
-    fun test(pokemon: Pokemon) = this.requirements.all { requirement -> requirement.check(pokemon) }
+    fun test(pokemon: Pokemon): Boolean {
+        val result = this.requirements.all { requirement -> requirement.check(pokemon) }
+        val event = EvolutionTestedEvent(pokemon, this, result, result)
+        CobblemonEvents.EVOLUTION_TESTED.post(event)
+        return event.result
+    }

    /**
     * Starts this evolution or queues it if [optional] is true.
@@ -10,7 +10,6 @@ package com.cobblemon.mod.common.api.spawning

 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.Cobblemon.config
-import com.cobblemon.mod.common.api.spawning.mixins.CachedOnlyChunkAccessor
 import com.cobblemon.mod.common.api.spawning.prospecting.SpawningProspector
 import com.cobblemon.mod.common.api.spawning.spawner.Spawner
 import com.cobblemon.mod.common.api.spawning.spawner.SpawningArea
@@ -81,8 +80,7 @@ object CobblemonSpawningProspector : SpawningProspector {
        for (x in area.baseX until area.baseX + area.length) {
            for (z in area.baseZ until area.baseZ + area.width) {
                val query = chunks.computeIfAbsent(Pair(getSectionCoord(x), getSectionCoord(z))) {
-                    val manager = world.chunkManager as CachedOnlyChunkAccessor
-                    manager.`cobblemon$request`(it.first, it.second, ChunkStatus.FULL)
+                    world.getChunk(it.first, it.second, ChunkStatus.FULL, false)
                } ?: continue

                var canSeeSky = world.isSkyVisibleAllowingSea(pos.set(x, yRange.first, z))
@@ -28,13 +28,12 @@ abstract class SpawnAction<T : Entity>(
 ) {
    abstract fun createEntity(): T?

-    fun run() {
+    open fun run() {
        ctx.influences.forEach { it.affectAction(this) }
        val e = createEntity() ?: return
        e.setPosition(ctx.position.toVec3d().add(0.5, 1.0, 0.5))
        entity.emit(e)
-        CobblemonEvents.ENTITY_SPAWN.post(SpawnEvent(e, ctx))
-        ctx.world.spawnEntity(e)
+        CobblemonEvents.ENTITY_SPAWN.postThen(SpawnEvent(e, ctx), ifSucceeded = { ctx.world.spawnEntity(e) })
    }

    /**
@@ -47,4 +46,4 @@ abstract class SpawnAction<T : Entity>(
    val entity: SimpleObservable<T> = SimpleObservable<T>().apply {
        subscribe { entity -> ctx.afterSpawn(entity) }
    }
-}
+}
@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.spawning.mixins
-
-import net.minecraft.world.chunk.Chunk
-import net.minecraft.world.chunk.ChunkStatus
-
-interface CachedOnlyChunkAccessor {
-
-    fun `cobblemon$request`(x: Int, z: Int, status: ChunkStatus): Chunk?
-
-}
@@ -17,9 +17,9 @@ import com.cobblemon.mod.common.api.spawning.context.calculators.AreaSpawningCon
 import com.cobblemon.mod.common.api.spawning.context.calculators.SpawningContextCalculator.Companion.prioritizedAreaCalculators
 import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail
 import com.cobblemon.mod.common.api.spawning.detail.SpawnPool
-import com.cobblemon.mod.common.api.spawning.mixins.CachedOnlyChunkAccessor
 import com.cobblemon.mod.common.api.spawning.prospecting.SpawningProspector
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.util.isBoxLoaded
 import com.cobblemon.mod.common.util.squeezeWithinBounds
 import com.cobblemon.mod.common.util.toVec3f
 import net.minecraft.entity.ai.pathing.NavigationType
@@ -31,6 +31,7 @@ import net.minecraft.world.World
 import net.minecraft.world.chunk.Chunk
 import net.minecraft.world.chunk.ChunkStatus
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules.DO_POKEMON_SPAWNING
+import net.minecraft.util.math.ChunkPos

 /**
 * A type of [TickingSpawner] that operates within some area. When this spawner type
@@ -59,6 +60,7 @@ abstract class AreaSpawner(
    var resolver: AreaContextResolver = Cobblemon.areaContextResolver
    var contextCalculators: List<AreaSpawningContextCalculator<*>> = prioritizedAreaCalculators

+
    override fun run(cause: SpawnCause): Pair<SpawningContext, SpawnDetail>? {
        val area = getArea(cause)
        if (area?.world?.gameRules?.getBoolean(DO_POKEMON_SPAWNING) == false) {
@@ -66,9 +68,15 @@ abstract class AreaSpawner(
        }
        val constrainedArea = if (area != null) constrainArea(area) else null
        if (constrainedArea != null) {
+
+            val areaBox = Box.of(Vec3d(constrainedArea.getCenter().toVec3f()), CHUNK_REACH * 16.0 * 2, 1000.0, CHUNK_REACH * 16.0 * 2)
+            if (!constrainedArea.world.isBoxLoaded(areaBox)) {
+                return null
+            }
+
            val numberNearby = constrainedArea.world.getEntitiesByClass(
                PokemonEntity::class.java,
-                Box.of(Vec3d(constrainedArea.getCenter().toVec3f()), CHUNK_REACH * 16.0 * 2, 1000.0, CHUNK_REACH * 16.0 * 2)
+                areaBox
            ) { true }.size

            val chunksCovered = CHUNK_REACH * CHUNK_REACH
@@ -117,7 +125,11 @@ abstract class AreaSpawner(
        val originalY = area.baseY

        val (chunkX, chunkZ) = Pair(ChunkSectionPos.getSectionCoord(area.baseX), ChunkSectionPos.getSectionCoord(area.baseZ))
-        val chunk = (area.world.chunkManager as CachedOnlyChunkAccessor).`cobblemon$request`(chunkX, chunkZ, ChunkStatus.FULL) ?: return null
+
+        // if the chunk isn't loaded, we don't want to go further & we don't want the getChunk function below to load/create the chunk.
+        if (!area.world.isChunkLoaded(ChunkPos.toLong(chunkX, chunkZ))) return null
+
+        val chunk = area.world.getChunk(chunkX, chunkZ, ChunkStatus.FULL) ?: return null

        var valid = isValidStartPoint(area.world, chunk, basePos)

@@ -32,29 +32,19 @@ import java.util.UUID
 * @author Pebbles
 * @since August 23rd, 2023
 */
+@Suppress("MemberVisibilityCanBePrivate")
 open class MongoDBStoreAdapter(
-    private val mongoClient: MongoClient,
-    private val databaseName: String,
+    protected val mongoClient: MongoClient,
+    protected val databaseName: String,
 ) : CobblemonAdapterParent<JsonObject>(), FileStoreAdapter<JsonObject> {
-    private fun getCollection(storeClass: Class<out PokemonStore<*>>): MongoCollection<Document> {
-        val collectionName = when (storeClass) {
-            PlayerPartyStore::class.java -> "PlayerPartyCollection"
-            PCStore::class.java -> "PCCollection"
-            else -> "OtherCollection"
-        }
-        return mongoClient.getDatabase(databaseName).getCollection(collectionName)
-    }

-    private val gson: Gson = Gson()
+    protected val gson: Gson = this.createGson()

-    override fun <E : StorePosition, T : PokemonStore<E>> serialize(store: T): JsonObject {
-        return store.saveToJSON(JsonObject())
-    }
+    override fun <E : StorePosition, T : PokemonStore<E>> serialize(store: T): JsonObject = store.saveToJSON(JsonObject())

    override fun save(storeClass: Class<out PokemonStore<*>>, uuid: UUID, serialized: JsonObject) {
-        val document = Document.parse(gson.toJson(serialized))
-        document.put("uuid", uuid.toString())
-
+        val document = Document.parse(this.gson.toJson(serialized))
+        document["uuid"] = uuid.toString()
        val collection = getCollection(storeClass)
        val filter = Document("uuid", uuid.toString())
        collection.replaceOne(filter, document, ReplaceOptions().upsert(true))
@@ -76,7 +66,7 @@ open class MongoDBStoreAdapter(
        val document = collection.find(filter).first()

        if (document != null) {
-            val json = gson.fromJson(document.toJson(), JsonObject::class.java)
+            val json = this.gson.fromJson(document.toJson(), JsonObject::class.java)
            val store = storeClass.getConstructor(UUID::class.java).newInstance(uuid)
            store.loadFromJSON(json)
            return store
@@ -98,4 +88,15 @@ open class MongoDBStoreAdapter(
        return null
    }

+    protected open fun createGson(): Gson = Gson()
+
+    protected open fun getCollection(storeClass: Class<out PokemonStore<*>>): MongoCollection<Document> {
+        val collectionName = when (storeClass) {
+            PlayerPartyStore::class.java -> "PlayerPartyCollection"
+            PCStore::class.java -> "PCCollection"
+            else -> "OtherCollection"
+        }
+        return this.mongoClient.getDatabase(this.databaseName).getCollection(collectionName)
+    }
+
 }
@@ -48,7 +48,11 @@ open class JSONStoreAdapter(
            val br = BufferedReader(FileReader(file))
            val json = gson.fromJson<JsonObject>(br)
            br.close()
-            val store = storeClass.getConstructor(UUID::class.java).newInstance(uuid)
+            val store = try {
+                storeClass.getConstructor(UUID::class.java, UUID::class.java).newInstance(uuid, uuid)
+            } catch (exception: NoSuchMethodException) {
+                storeClass.getConstructor(UUID::class.java).newInstance(uuid)
+            }
            store.loadFromJSON(json)
            store
        } catch (e: Exception) {
@@ -31,7 +31,12 @@ open class NBTStoreAdapter(
    override fun <E : StorePosition, T : PokemonStore<E>> serialize(store: T) = store.saveToNBT(NbtCompound())
    override fun save(file: File, serialized: NbtCompound) = NbtIo.writeCompressed(serialized, file)
    override fun <E, T : PokemonStore<E>> load(file: File, storeClass: Class<out T>, uuid: UUID): T? {
-        val store = storeClass.getConstructor(UUID::class.java).newInstance(uuid)
+        val store = try {
+            storeClass.getConstructor(UUID::class.java, UUID::class.java).newInstance(uuid, uuid)
+        } catch (exception: NoSuchMethodException) {
+            storeClass.getConstructor(UUID::class.java).newInstance(uuid)
+        }
+
        return try {
            val nbt = NbtIo.readCompressed(file)
            store.loadFromNBT(nbt)
@@ -38,8 +38,10 @@ import kotlin.random.Random
 */
 open class PlayerPartyStore(
    /** The UUID of the player this store is for. */
-    val playerUUID: UUID
-) : PartyStore(playerUUID) {
+    val playerUUID: UUID,
+    /** The UUID of the store. This is the same as [playerUUID] by default, but can be changed to allow for multiple parties. */
+    storageUUID: UUID = playerUUID
+) : PartyStore(storageUUID) {

    private var secondsSinceFriendshipUpdate = 0

@@ -158,6 +158,7 @@ fun String.stripCodes(): String = this.replace("[&§][A-Ea-e0-9K-Ok-oRr]".toRege
 fun MutableText.onClick(consumed: AtomicBoolean, action: (p: ServerPlayerEntity) -> Unit) = also { it.style = it.style.withClickEvent(click(consumed, action)) }
 fun MutableText.onClick(onlyOnce: Boolean = false, action: (p: ServerPlayerEntity) -> Unit) = also { it.style = it.style.withClickEvent(click(onlyOnce, action)) }
 fun MutableText.onHover(string: String) = also { it.style = it.style.withHoverEvent(hover(string)) }
+fun MutableText.onHover(text: Text) = also { it.style = it.style.withHoverEvent(hover(text)) }
 fun MutableText.onHover(text: MutableText) = also { it.style = it.style.withHoverEvent(hover(text)) }
 fun MutableText.underline() = also { it.style = it.style.withUnderline(true) }
 fun MutableText.bold() = also { it.style = it.style.withBold(true) }
@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.battles.interpreter.*
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
+import com.cobblemon.mod.common.api.battles.model.actor.ActorType
 import com.cobblemon.mod.common.api.battles.model.actor.BattleActor
 import com.cobblemon.mod.common.api.battles.model.actor.EntityBackedBattleActor
 import com.cobblemon.mod.common.api.data.ShowdownIdentifiable
@@ -24,6 +25,7 @@ import com.cobblemon.mod.common.api.pokemon.status.Statuses
 import com.cobblemon.mod.common.api.scheduling.after
 import com.cobblemon.mod.common.api.text.*
 import com.cobblemon.mod.common.api.types.ElementalTypes
+import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
 import com.cobblemon.mod.common.battles.dispatch.BattleDispatch
 import com.cobblemon.mod.common.battles.dispatch.DispatchResult
 import com.cobblemon.mod.common.battles.dispatch.GO
@@ -579,6 +581,17 @@ object ShowdownInterpreter {
            battle.end()

            val wasCaught = battle.showdownMessages.any { "capture" in it }
+
+            // If the battle was a PvW battle, we need to set the killer of the wild Pokémon to the player
+            if (battle.isPvW) {
+                val nonPlayerActor = battle.actors.first { it.type == ActorType.WILD }
+                val wildPokemon: BattlePokemon = nonPlayerActor.pokemonList.first()
+
+                if (!wasCaught && losers.any { it.uuid == wildPokemon.uuid }) {
+                    wildPokemon.effectedPokemon.entity?.killer = (battle.actors.firstOrNull { it.type == ActorType.PLAYER } as? PlayerBattleActor)?.entity
+                }
+            }
+
            CobblemonEvents.BATTLE_VICTORY.post(BattleVictoryEvent(battle, winners, losers, wasCaught))

            this.lastCauser.remove(battle.battleId)
@@ -888,6 +901,8 @@ object ShowdownInterpreter {
                    "confusion", "perish3" -> return@dispatch GO // Skip
                    "perish2", "perish1", "perish0" -> battleLang("start.perish", pokemon.getName(), effectID.last().digitToInt())
                    "dynamax" -> battleLang("start.${message.effectAt(2)?.id ?: effectID}", pokemon.getName()).yellow()
+                    "disable" -> battleLang("start.disable", pokemon.getName(), message.effectAt(2)!!.rawData)
+                    "curse" -> battleLang("start.curse", message.getSourceBattlePokemon(battle)!!.getName(), pokemon.getName())
                    else -> battleLang("start.$effectID", pokemon.getName())
                }
                battle.broadcastChatMessage(lang)
@@ -166,7 +166,7 @@ class ApricornBlock(settings: Settings, val apricorn: Apricorn) : HorizontalFaci
    }

    override fun attemptShear(world: World, state: BlockState, pos: BlockPos, successCallback: () -> Unit): Boolean {
-        if (state.get(AGE) == MAX_AGE) {
+        if (state.get(AGE) != MAX_AGE) {
            return false
        }
        world.playSound(null, pos, SoundEvents.ENTITY_SHEEP_SHEAR, SoundCategory.BLOCKS, 1F, 1F)
@@ -24,6 +24,7 @@ import net.minecraft.block.BlockRenderType
 import net.minecraft.block.BlockState
 import net.minecraft.block.BlockWithEntity
 import net.minecraft.block.Blocks
+import net.minecraft.block.FarmlandBlock
 import net.minecraft.block.Fertilizable
 import net.minecraft.block.ShapeContext
 import net.minecraft.block.entity.BlockEntity
@@ -67,6 +68,14 @@ class BerryBlock(private val berryIdentifier: Identifier, settings: Settings) :
     */
    fun berry(): Berry? = Berries.getByIdentifier(this.berryIdentifier)

+    override fun onBreak(world: World, pos: BlockPos, state: BlockState, player: PlayerEntity) {
+        if (!player.isCreative && state.get(AGE) == FRUIT_AGE) {
+            val treeEntity = world.getBlockEntity(pos) as BerryBlockEntity
+            treeEntity.harvest(world, state, pos, player).forEach { drop -> Block.dropStack(world, pos, drop) }
+        }
+        super.onBreak(world, pos, state, player)
+    }
+
    override fun createBlockEntity(pos: BlockPos, state: BlockState) = BerryBlockEntity(pos, state, berryIdentifier)

    override fun isFertilizable(world: WorldView, pos: BlockPos, state: BlockState, isClient: Boolean) = !this.isMaxAge(state)
@@ -178,7 +187,9 @@ class BerryBlock(private val berryIdentifier: Identifier, settings: Settings) :
    @Deprecated("Deprecated in Java")
    override fun canPlaceAt(state: BlockState, world: WorldView, pos: BlockPos): Boolean {
        val below = world.getBlockState(pos.down())
-        return (state.get(WAS_GENERATED) && below.isIn(CobblemonBlockTags.BERRY_WILD_SOIL)) || below.isIn(CobblemonBlockTags.BERRY_SOIL)
+        return (state.get(WAS_GENERATED) && below.isIn(CobblemonBlockTags.BERRY_WILD_SOIL))
+                || below.isIn(CobblemonBlockTags.BERRY_SOIL)
+                || below.block is FarmlandBlock
    }

    @Deprecated("Deprecated in Java")
@@ -114,7 +114,10 @@ class PastureBlock(properties: Settings): BlockWithEntity(properties), Waterlogg
                    voxelShape(0.1875, 0.25, 0.25, 0.1875, 0.4375, 0.875, direction),
                    voxelShape(0.8125, 0.25, 0.25, 0.8125, 0.4375, 0.875, direction),
                    voxelShape(0.1875, 0.3125, 0.3125, 0.8125, 0.5, 0.3125, direction),
-                    voxelShape(0.25, 0.75, 0.3125, 0.75, 1.0, 0.8125, direction)
+                    voxelShape(0.25, 0.75, 0.3125, 0.75, 1.0, 0.8125, direction),
+                    // I'm lazy and this gets optimized in union anyway
+                    voxelShape(0.0, 0.0, 0.0, 0.0625, 1.0, 1.0, direction),
+                    voxelShape(0.9375, 0.0, 0.0, 1.0, 1.0, 1.0, direction),
                )
            }
        }
@@ -17,7 +17,6 @@ import com.cobblemon.mod.common.client.gui.PartyOverlay
 import com.cobblemon.mod.common.client.gui.battle.BattleOverlay
 import com.cobblemon.mod.common.client.particle.BedrockParticleEffectRepository
 import com.cobblemon.mod.common.client.render.block.BerryBlockRenderer
-import com.cobblemon.mod.common.client.render.block.BerryEntityInstance
 import com.cobblemon.mod.common.client.render.block.HealingMachineRenderer
 import com.cobblemon.mod.common.client.render.item.CobblemonBuiltinItemRendererRegistry
 import com.cobblemon.mod.common.client.render.item.PokemonItemRenderer
@@ -36,9 +35,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.repository.Berry
 import com.cobblemon.mod.common.platform.events.PlatformEvents
 import com.cobblemon.mod.common.util.DataKeys
 import com.cobblemon.mod.common.util.asTranslated
-import com.jozufozu.flywheel.backend.instancing.InstancedRenderRegistry
-import net.minecraft.client.color.block.BlockColorProvider
-import net.minecraft.client.color.item.ItemColorProvider
 import net.minecraft.client.gui.DrawContext
 import net.minecraft.client.render.RenderLayer
 import net.minecraft.client.render.entity.EntityRenderer
@@ -121,11 +117,11 @@ object CobblemonClient {
    }

    fun registerFlywheelRenderers() {
-        InstancedRenderRegistry
-            .configure(CobblemonBlockEntities.BERRY)
-            .alwaysSkipRender()
-            .factory(::BerryEntityInstance)
-            .apply()
+//        InstancedRenderRegistry
+//            .configure(CobblemonBlockEntities.BERRY)
+//            .alwaysSkipRender()
+//            .factory(::BerryEntityInstance)
+//            .apply()
    }

    /*
@@ -17,6 +17,7 @@ import com.cobblemon.mod.common.client.gui.ExitButton
 import com.cobblemon.mod.common.client.gui.TypeIcon
 import com.cobblemon.mod.common.client.gui.summary.Summary
 import com.cobblemon.mod.common.client.gui.summary.widgets.ModelWidget
+import com.cobblemon.mod.common.client.gui.summary.widgets.common.reformatNatureTextIfMinted
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.client.storage.ClientPC
 import com.cobblemon.mod.common.client.storage.ClientParty
@@ -31,7 +32,6 @@ import net.minecraft.client.gui.DrawContext
 import net.minecraft.client.gui.screen.Screen
 import net.minecraft.client.sound.PositionedSoundInstance
 import net.minecraft.client.util.InputUtil
-import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.sound.SoundEvent
 import net.minecraft.text.Text

@@ -309,14 +309,18 @@ class PCGUI(
            ).render(context)

            // Nature
+            val natureText = reformatNatureTextIfMinted(pokemon)
            drawScaledText(
                context = context,
-                text = pokemon.nature.displayName.asTranslated(),
+                text = natureText,
                x = x + 39,
                y = y + 137,
                centered = true,
                shadow = true,
-                scale = SCALE
+                scale = SCALE,
+                colour = 0x32CBFF,
+                pMouseX = mouseX,
+                pMouseY = mouseY
            )

            // Ability
@@ -402,8 +406,14 @@ class PCGUI(
        if (pokemon != null && !pokemon.heldItemNoCopy().isEmpty) {
            val itemX = x + 3
            val itemY = y + 98
-            val itemHovered = mouseX.toFloat() in (itemX.toFloat()..(itemX.toFloat() + 16)) && mouseY.toFloat() in (itemY.toFloat()..(itemY.toFloat() + 16))
-            if (itemHovered) context.drawItemTooltip(MinecraftClient.getInstance().textRenderer, pokemon.heldItemNoCopy(), mouseX, mouseY)
+            val itemHovered =
+                mouseX.toFloat() in (itemX.toFloat()..(itemX.toFloat() + 16)) && mouseY.toFloat() in (itemY.toFloat()..(itemY.toFloat() + 16))
+            if (itemHovered) context.drawItemTooltip(
+                MinecraftClient.getInstance().textRenderer,
+                pokemon.heldItemNoCopy(),
+                mouseX,
+                mouseY
+            )
        }
    }

@@ -416,12 +426,22 @@ class PCGUI(
    }

    override fun mouseScrolled(mouseX: Double, mouseY: Double, amount: Double): Boolean {
-        if (storageWidget.pastureWidget != null) storageWidget.pastureWidget!!.pastureScrollList.mouseScrolled(mouseX, mouseY, amount)
+        if (storageWidget.pastureWidget != null) storageWidget.pastureWidget!!.pastureScrollList.mouseScrolled(
+            mouseX,
+            mouseY,
+            amount
+        )
        return children().any { it.mouseScrolled(mouseX, mouseY, amount) }
    }

    override fun mouseDragged(mouseX: Double, mouseY: Double, button: Int, deltaX: Double, deltaY: Double): Boolean {
-        if (storageWidget.pastureWidget != null) storageWidget.pastureWidget!!.pastureScrollList.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)
+        if (storageWidget.pastureWidget != null) storageWidget.pastureWidget!!.pastureScrollList.mouseDragged(
+            mouseX,
+            mouseY,
+            button,
+            deltaX,
+            deltaY
+        )
        return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)
    }

@@ -431,10 +451,12 @@ class PCGUI(
                playSound(CobblemonSounds.PC_OFF)
                UnlinkPlayerFromPCPacket().sendToServer()
            }
+
            InputUtil.GLFW_KEY_RIGHT -> {
                playSound(CobblemonSounds.PC_CLICK)
                this.storageWidget.box += 1
            }
+
            InputUtil.GLFW_KEY_LEFT -> {
                playSound(CobblemonSounds.PC_CLICK)
                this.storageWidget.box -= 1
@@ -454,7 +476,7 @@ class PCGUI(
        ticksElapsed++

        // Calculate select pointer offset
-        var delayFactor = 3
+        val delayFactor = 3
        if (ticksElapsed % (2 * delayFactor) == 0) selectPointerOffsetIncrement = !selectPointerOffsetIncrement
        if (ticksElapsed % delayFactor == 0) selectPointerOffsetY += if (selectPointerOffsetIncrement) 1 else -1
    }
@@ -480,8 +502,8 @@ class PCGUI(
                offsetY = -10.0
            )
        } else {
-            previewPokemon = null;
-            modelWidget = null;
+            previewPokemon = null
+            modelWidget = null
        }
    }
 }
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.gui.summary.widgets.common
+
+import com.cobblemon.mod.common.CobblemonItems
+import com.cobblemon.mod.common.api.text.italicise
+import com.cobblemon.mod.common.api.text.onHover
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.util.asTranslated
+import net.minecraft.text.MutableText
+
+
+/**
+ * Italicizes the nature text and makes it include the name of the MintItem used to mint the Pokémon's nature
+ */
+fun reformatNatureTextIfMinted(pokemon: Pokemon): MutableText {
+    var natureText = pokemon.nature.displayName.asTranslated()
+    if (pokemon.mintedNature != null) {
+        CobblemonItems.mints[pokemon.mintedNature!!.displayName]?.let { mint ->
+            natureText = natureText.italicise().onHover(mint.name)
+        }
+    }
+    return natureText
+}
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.gui.summary.widgets.screens.info
+
+import com.cobblemon.mod.common.api.text.*
+import com.cobblemon.mod.common.client.gui.summary.widgets.SoundlessWidget
+import com.cobblemon.mod.common.client.render.drawScaledText
+import net.minecraft.client.gui.DrawContext
+import net.minecraft.text.MutableText
+import net.minecraft.text.Text
+import net.minecraft.util.Identifier
+
+class InfoBlockWidget(
+    pX: Int,
+    pY: Int,
+    blockWidth: Int,
+    blockHeight: Int,
+    private val text: MutableText,
+    private val withinRowVerticalTextOffset: Int,
+    private val font: Identifier,
+) : SoundlessWidget(pX, pY, blockWidth, blockHeight, Text.literal("InfoBlockWidget")) {
+
+
+    override fun renderButton(context: DrawContext, pMouseX: Int, pMouseY: Int, pPartialTicks: Float) {
+
+        drawScaledText(
+            context = context,
+            font = font,
+            text = text.bold(),
+            x = x,
+            y = y + withinRowVerticalTextOffset,
+            shadow = true,
+            pMouseX = pMouseX,
+            pMouseY = pMouseY
+        )
+    }
+
+}
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.client.gui.summary.widgets.screens.info
+
+import com.cobblemon.mod.common.client.CobblemonResources
+import com.cobblemon.mod.common.client.gui.summary.widgets.SoundlessWidget
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.gui.DrawContext
+import net.minecraft.text.MutableText
+import net.minecraft.text.Text
+
+class InfoOneLineWidget(
+    pX: Int,
+    pY: Int,
+    width: Int,
+    height: Int = ROW_HEIGHT,
+    private val label: MutableText,
+    private val value: MutableText,
+) : SoundlessWidget(pX, pY, width, height, Text.literal("InfoOneLineWidget")) {
+    companion object {
+        private val FONT = CobblemonResources.DEFAULT_LARGE
+        private const val ROW_HEIGHT = 15
+        private const val WITHIN_ROW_VERTICAL_OFFSET = 6
+        private const val LABEL_HORIZONTAL_OFFSET = 8
+        private const val VALUE_HORIZONTAL_OFFSET = 53
+    }
+
+
+    override fun renderButton(context: DrawContext, pMouseX: Int, pMouseY: Int, pPartialTicks: Float) {
+
+        // Label
+        val label = InfoBlockWidget(
+            pX = x + LABEL_HORIZONTAL_OFFSET,
+            pY = y,
+            blockWidth = MinecraftClient.getInstance().textRenderer.getWidth(label),
+            blockHeight = height,
+            text = label,
+            font = FONT,
+            withinRowVerticalTextOffset = WITHIN_ROW_VERTICAL_OFFSET
+        )
+        label.render(context, pMouseX, pMouseY, pPartialTicks)
+
+        // Value
+        val value = InfoBlockWidget(
+            pX = x + VALUE_HORIZONTAL_OFFSET,
+            pY = y,
+            blockWidth = MinecraftClient.getInstance().textRenderer.getWidth(value),
+            blockHeight = height,
+            text = value,
+            font = FONT,
+            withinRowVerticalTextOffset = WITHIN_ROW_VERTICAL_OFFSET
+        )
+        value.render(context, pMouseX, pMouseY, pPartialTicks)
+    }
+
+}
@@ -11,11 +11,10 @@ package com.cobblemon.mod.common.client.gui.summary.widgets.screens.info
 import com.cobblemon.mod.common.api.gui.ColourLibrary
 import com.cobblemon.mod.common.api.gui.MultiLineLabelK
 import com.cobblemon.mod.common.api.gui.blitk
-import com.cobblemon.mod.common.api.text.bold
-import com.cobblemon.mod.common.api.text.plus
-import com.cobblemon.mod.common.api.text.text
+import com.cobblemon.mod.common.api.text.*
 import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.gui.summary.widgets.SoundlessWidget
+import com.cobblemon.mod.common.client.gui.summary.widgets.common.reformatNatureTextIfMinted
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.asTranslated
@@ -23,17 +22,21 @@ import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.gui.DrawContext
+import net.minecraft.text.MutableText
 import net.minecraft.text.Text
+import net.minecraft.text.TextContent
+

 class InfoWidget(
    pX: Int,
    pY: Int,
    private val pokemon: Pokemon
-): SoundlessWidget(pX, pY, WIDTH, HEIGHT, Text.literal("InfoWidget")) {
+) : SoundlessWidget(pX, pY, WIDTH, HEIGHT, Text.literal("InfoWidget")) {
    companion object {
        private const val WIDTH = 134
        private const val HEIGHT = 148
        private val infoBaseResource = cobblemonResource("textures/gui/summary/summary_info_base.png")
+        private const val ROW_HEIGHT = 15
    }

    override fun renderButton(context: DrawContext, pMouseX: Int, pMouseY: Int, pPartialTicks: Float) {
@@ -42,137 +45,89 @@ class InfoWidget(
        blitk(
            matrixStack = matrices,
            texture = infoBaseResource,
-            x= x,
+            x = x,
            y = y,
            width = width,
            height = height
        )

-        // Pokédex Number
-        drawScaledText(
-            context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = lang("ui.info.pokedex_number").bold(),
-            x = x + 8,
-            y = y + 6,
-            shadow = true
-        )

+        // Pokédex Number
        // Add preceding zeroes if Pokédex number is less than 3 digits
        var dexNo = pokemon.species.nationalPokedexNumber.toString()
-        while(dexNo.length < 3) {
-            dexNo = "0$dexNo";
+        while (dexNo.length < 3) {
+            dexNo = "0$dexNo"
        }

-        drawScaledText(
-            context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = dexNo.text().bold(),
-            x = x + 53,
-            y = y + 6,
-            shadow = true
+        val pokedexNumberWidget = InfoOneLineWidget(
+            pX = x,
+            pY = y,
+            width = width,
+            label = lang("ui.info.pokedex_number"),
+            value = dexNo.text()
        )
+        pokedexNumberWidget.render(context, pMouseX, pMouseY, pPartialTicks)
+

        // Species
-        drawScaledText(
-            context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = lang("ui.info.species").bold(),
-            x = x + 8,
-            y = y + 21,
-            shadow = true
-        )
-
-        drawScaledText(
-            context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = pokemon.species.translatedName.bold(),
-            x = x + 53,
-            y = y + 21,
-            shadow = true
+        val speciesWidget = InfoOneLineWidget(
+            pX = x,
+            pY = y + ROW_HEIGHT,
+            width = width,
+            label = lang("ui.info.species"),
+            value = pokemon.species.translatedName
        )
+        speciesWidget.render(context, pMouseX, pMouseY, pPartialTicks)

        // Type
-        drawScaledText(
-            context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = lang("ui.info.type").bold(),
-            x = x + 8,
-            y = y + 36,
-            shadow = true
-        )
-
        val type = pokemon.types.map { it.displayName.copy() }.reduce { acc, next -> acc.plus("/").plus(next) }
-
-        drawScaledText(
-            context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = type.bold(),
-            x = x + 53,
-            y = y + 36,
-            shadow = true
+        val typeWidget = InfoOneLineWidget(
+            pX = x,
+            pY = y + 2 * ROW_HEIGHT,
+            width = width,
+            label = lang("ui.info.type"),
+            value = type
        )
+        typeWidget.render(context, pMouseX, pMouseY, pPartialTicks)

        // OT
-        drawScaledText(
-            context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = lang("ui.info.original_trainer").bold(),
-            x = x + 8,
-            y = y + 51,
-            shadow = true
-        )
-
+        var displayName: MutableText = MutableText.of(TextContent.EMPTY)
        if (pokemon.isPlayerOwned() && pokemon.getOwnerPlayer() != null) {
-            pokemon.getOwnerPlayer()?.displayName?.copy()?.let {
-                drawScaledText(
-                    context = context,
-                    font = CobblemonResources.DEFAULT_LARGE,
-                    text = it.bold(),
-                    x = x + 53,
-                    y = y + 51,
-                    shadow = true
-                )
-            }
+            displayName = pokemon.getOwnerPlayer()!!.displayName.copy()
        }
+        val otWidget = InfoOneLineWidget(
+            pX = x,
+            pY = y + 3 * ROW_HEIGHT,
+            width = width,
+            label = lang("ui.info.original_trainer"),
+            value = displayName // You'll need to provide the value for the Original Trainer
+        )
+        otWidget.render(context, pMouseX, pMouseY, pPartialTicks)
+

        // Nature
-        drawScaledText(
-            context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = lang("ui.info.nature").bold(),
-            x = x + 8,
-            y = y + 66,
-            shadow = true
-        )
+        // Get the name of the MintItem used to mint the Pokémon's nature
+        val natureText = reformatNatureTextIfMinted(pokemon)

-        drawScaledText(
-            context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = pokemon.nature.displayName.asTranslated().bold(),
-            x = x + 53,
-            y = y + 66,
-            shadow = true
+        val natureWidget = InfoOneLineWidget(
+            pX = x,
+            pY = y + 4 * ROW_HEIGHT,
+            width = width,
+            label = lang("ui.info.nature"),
+            value = natureText,
        )
+        natureWidget.render(context, pMouseX, pMouseY, pPartialTicks)
+

        // Ability
-        drawScaledText(
-            context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = lang("ui.info.ability").bold(),
-            x = x + 8,
-            y = y + 81,
-            shadow = true
-        )
-
-        drawScaledText(
-            context = context,
-            font = CobblemonResources.DEFAULT_LARGE,
-            text = pokemon.ability.displayName.asTranslated().bold(),
-            x = x + 53,
-            y = y + 81,
-            shadow = true
+        val abilityWidget = InfoOneLineWidget(
+            pX = x,
+            pY = y + 5 * ROW_HEIGHT,
+            width = width,
+            label = lang("ui.info.ability").bold(),
+            value = pokemon.ability.displayName.asTranslated().bold()
        )
+        abilityWidget.render(context, pMouseX, pMouseY, pPartialTicks)

        val smallTextScale = 0.5F

@@ -212,8 +167,10 @@ class InfoWidget(

        val mcFont = MinecraftClient.getInstance().textRenderer
        val experience = pokemon.experience.toString().text()
-        val experienceForThisLevel = pokemon.experience - if (pokemon.level == 1) 0 else pokemon.experienceGroup.getExperience(pokemon.level)
-        val experienceToNext = pokemon.experienceGroup.getExperience(pokemon.level + 1) - pokemon.experienceGroup.getExperience(pokemon.level)
+        val experienceForThisLevel =
+            pokemon.experience - if (pokemon.level == 1) 0 else pokemon.experienceGroup.getExperience(pokemon.level)
+        val experienceToNext =
+            pokemon.experienceGroup.getExperience(pokemon.level + 1) - pokemon.experienceGroup.getExperience(pokemon.level)

        drawScaledText(
            context = context,
@@ -19,6 +19,7 @@ import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.gui.ExitButton
 import com.cobblemon.mod.common.client.gui.TypeIcon
 import com.cobblemon.mod.common.client.gui.summary.Summary
+import com.cobblemon.mod.common.client.gui.summary.widgets.common.reformatNatureTextIfMinted
 import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.client.trade.ClientTrade
 import com.cobblemon.mod.common.net.messages.client.trade.TradeStartedPacket.TradeablePokemon
@@ -36,7 +37,6 @@ import net.minecraft.client.gui.DrawContext
 import net.minecraft.client.gui.screen.Screen
 import net.minecraft.client.sound.PositionedSoundInstance
 import net.minecraft.client.util.InputUtil
-import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.sound.SoundEvent
 import net.minecraft.text.MutableText

@@ -266,8 +266,8 @@ class TradeGUI(

        renderInfoLabels(context, x, y)

-        renderPokemonInfo(offeredPokemon, false, context, x, y)
-        renderPokemonInfo(opposingOfferedPokemon, true, context, x, y)
+        renderPokemonInfo(offeredPokemon, false, context, x, y, mouseX, mouseY)
+        renderPokemonInfo(opposingOfferedPokemon, true, context, x, y, mouseX, mouseY)

        if (trade.acceptedOppositeOffer) {
            blitk(
@@ -373,7 +373,7 @@ class TradeGUI(
        }

        // Calculate select pointer offset
-        var delayFactor = 3
+        val delayFactor = 3
        if (ticksElapsed % (2 * delayFactor) == 0) selectPointerOffsetIncrement = !selectPointerOffsetIncrement
        if (ticksElapsed % delayFactor == 0) selectPointerOffsetY += if (selectPointerOffsetIncrement) 1 else -1

@@ -422,7 +422,7 @@ class TradeGUI(
        MinecraftClient.getInstance().soundManager.play(PositionedSoundInstance.master(soundEvent, 1.0F))
    }

-    private fun renderPokemonInfo(pokemon: Pokemon?, isOpposing: Boolean, context: DrawContext, x: Int, y: Int) {
+    private fun renderPokemonInfo(pokemon: Pokemon?, isOpposing: Boolean, context: DrawContext, x: Int, y: Int, mouseX: Int, mouseY: Int) {
        if (pokemon != null) {
            val matrices = context.matrices
            // Level
@@ -530,14 +530,17 @@ class TradeGUI(
            val labelXOffset = if (isOpposing) 77 else 0

            // Nature
+            val natureText = reformatNatureTextIfMinted(pokemon)
            drawScaledText(
                context = context,
-                text = pokemon.nature.displayName.asTranslated(),
+                text = natureText,
                x = x + 108 + labelXOffset,
                y = y + 146.5,
                centered = true,
                shadow = true,
-                scale = SCALE
+                scale = SCALE,
+                pMouseX = mouseX,
+                pMouseY = mouseY
            )

            // Ability
@@ -15,7 +15,7 @@ import net.minecraft.client.util.InputUtil
 object HidePartyBinding : CobblemonKeyBinding(
    "key.cobblemon.hideparty",
    InputUtil.Type.KEYSYM,
-    InputUtil.GLFW_KEY_P,
+    InputUtil.GLFW_KEY_O,
    KeybindCategories.COBBLEMON_CATEGORY
 ) {
    var shouldHide = false
@@ -115,6 +115,7 @@ fun getDepletableRedGreen(
    return r.toFloat() to g.toFloat()
 }

+
 fun drawScaledText(
    context: DrawContext,
    font: Identifier? = null,
@@ -126,7 +127,9 @@ fun drawScaledText(
    maxCharacterWidth: Int = Int.MAX_VALUE,
    colour: Int = 0x00FFFFFF + ((opacity.toFloat() * 255).toInt() shl 24),
    centered: Boolean = false,
-    shadow: Boolean = false
+    shadow: Boolean = false,
+    pMouseX: Int? = null,
+    pMouseY: Int? = null
 ) {
    if (opacity.toFloat() < 0.05F) {
        return
@@ -138,7 +141,7 @@ fun drawScaledText(
    val matrices = context.matrices
    matrices.push()
    matrices.scale(scale * extraScale, scale * extraScale, 1F)
-    drawText(
+    val isHovered = drawText(
        context = context,
        font = font,
        text = text,
@@ -146,9 +149,15 @@ fun drawScaledText(
        y = y.toFloat() / (scale * extraScale) + (1 - extraScale) * fontHeight * scale,
        centered = centered,
        colour = colour,
-        shadow = shadow
+        shadow = shadow,
+        pMouseX = pMouseX?.toFloat()?.div((scale * extraScale)),
+        pMouseY = pMouseY?.toFloat()?.div(scale * extraScale)?.plus((1 - extraScale) * fontHeight * scale)
    )
    matrices.pop()
+    // Draw tooltip that was created with onHover and is attached to the MutableText
+    if (isHovered) {
+        context.drawHoverEvent(MinecraftClient.getInstance().textRenderer, text.style, pMouseX!!, pMouseY!!)
+    }
 }

 fun drawScaledText(
@@ -7,55 +7,54 @@
 */

 package com.cobblemon.mod.common.client.render.block
-
-import com.cobblemon.mod.common.block.BerryBlock
-import com.cobblemon.mod.common.block.entity.BerryBlockEntity
-import com.cobblemon.mod.common.client.render.layer.CobblemonRenderLayers
-import com.cobblemon.mod.common.client.render.models.blockbench.repository.BerryModelRepository
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.jozufozu.flywheel.api.MaterialManager
-import com.jozufozu.flywheel.backend.instancing.blockentity.BlockEntityInstance
-import com.jozufozu.flywheel.core.Materials
-import com.jozufozu.flywheel.core.materials.model.ModelData
-
-class BerryEntityInstance(val materialManager: MaterialManager, val entity: BerryBlockEntity) : BlockEntityInstance<BerryBlockEntity>(materialManager, entity) {
-    val models: MutableList<ModelData> = mutableListOf()
-    override fun init() {
-        super.init()
-        val age = entity.cachedState.get(BerryBlock.AGE)
-        if (age < BerryBlock.FLOWER_AGE) {
-            return
-        }
-        entity.berryAndGrowthPoint().forEach {
-            val newModel = if (age == BerryBlock.FLOWER_AGE) BerryModelRepository.flywheelModelOf(
-                cobblemonResource("flower")
-            ) else BerryModelRepository.flywheelModelOf(it.first.fruitModelIdentifier)
-            if (newModel != null) {
-                val instancedModel = materialManager
-                    .cutout(CobblemonRenderLayers.BERRY_LAYER)
-                    .material(Materials.TRANSFORMED)
-                    .model(newModel.name()) { newModel }
-                    .createInstance()
-                models.add(instancedModel)
-                val identity = instancedModel.loadIdentity()
-                identity.translate(instancePosition)
-                identity.translate(it.second.position.multiply(1.0/16.0))
-                identity.rotateZ(it.second.rotation.z)
-                identity.rotateY(it.second.rotation.y + 180)
-                identity.rotateX(-it.second.rotation.x)
-            }
-
-        }
-    }
-
-    override fun updateLight() {
-        relight(worldPosition, models.stream())
-    }
-
-    override fun remove() {
-        models.forEach {
-            it.delete()
-        }
-    }
-
-}
+//import com.cobblemon.mod.common.block.BerryBlock
+//import com.cobblemon.mod.common.block.entity.BerryBlockEntity
+//import com.cobblemon.mod.common.client.render.layer.CobblemonRenderLayers
+//import com.cobblemon.mod.common.client.render.models.blockbench.repository.BerryModelRepository
+//import com.cobblemon.mod.common.util.cobblemonResource
+//import com.jozufozu.flywheel.api.MaterialManager
+//import com.jozufozu.flywheel.backend.instancing.blockentity.BlockEntityInstance
+//import com.jozufozu.flywheel.core.Materials
+//import com.jozufozu.flywheel.core.materials.model.ModelData
+//
+//class BerryEntityInstance(val materialManager: MaterialManager, val entity: BerryBlockEntity) : BlockEntityInstance<BerryBlockEntity>(materialManager, entity) {
+//    val models: MutableList<ModelData> = mutableListOf()
+//    override fun init() {
+//        super.init()
+//        val age = entity.cachedState.get(BerryBlock.AGE)
+//        if (age < BerryBlock.FLOWER_AGE) {
+//            return
+//        }
+//        entity.berryAndGrowthPoint().forEach {
+//            val newModel = if (age == BerryBlock.FLOWER_AGE) BerryModelRepository.flywheelModelOf(
+//                cobblemonResource("flower.geo")
+//            ) else BerryModelRepository.flywheelModelOf(it.first.fruitModelIdentifier)
+//            if (newModel != null) {
+//                val instancedModel = materialManager
+//                    .cutout(CobblemonRenderLayers.BERRY_LAYER)
+//                    .material(Materials.TRANSFORMED)
+//                    .model(newModel.name()) { newModel }
+//                    .createInstance()
+//                models.add(instancedModel)
+//                val identity = instancedModel.loadIdentity()
+//                identity.translate(instancePosition)
+//                identity.translate(it.second.position.multiply(1.0/16.0))
+//                identity.rotateZ(it.second.rotation.z)
+//                identity.rotateY(it.second.rotation.y + 180)
+//                identity.rotateX(-it.second.rotation.x)
+//            }
+//
+//        }
+//    }
+//
+//    override fun updateLight() {
+//        relight(worldPosition, models.stream())
+//    }
+//
+//    override fun remove() {
+//        models.forEach {
+//            it.delete()
+//        }
+//    }
+//
+//}
@@ -13,8 +13,6 @@ import com.cobblemon.mod.common.util.math.fromEulerXYZ
 import com.cobblemon.mod.common.util.math.geometry.toRadians
 import com.google.gson.GsonBuilder
 import com.google.gson.annotations.SerializedName
-import com.jozufozu.flywheel.core.hardcoded.PartBuilder
-import com.jozufozu.flywheel.core.model.Model
 import net.minecraft.client.model.Dilation
 import net.minecraft.client.model.ModelData
 import net.minecraft.client.model.ModelPartBuilder
@@ -71,88 +69,88 @@ class TexturedModel {
     *
     * - Hiro & Apion
     */
-    fun createFlywheelModel(atlas: SpriteAtlasHolder, textureName: Identifier, name: String): Model {
-        val texture = atlas.getSprite(textureName)
-        val width = ((texture.maxU * atlas.atlas.width.toFloat()) - (texture.minU * atlas.atlas.width)).toInt()
-        val height =( (texture.maxV * atlas.atlas.height.toFloat()) - (texture.minV * atlas.atlas.height)).toInt()
-
-        val modelBuilder = PartBuilder(name, width, height)
-        modelBuilder.sprite(texture)
-        val boneMap = mutableMapOf<String, ModelBone>()
-        geometry?.forEach { it.bones?.forEach { boneMap[it.name] = it } }
-
-        geometry?.forEach {
-            it.bones?.forEach { bone ->
-                // This is meant to prepare the rotation stack so that the rotation around a cube's pivot point is respecting
-                // all of the parent bone rotations. It's not meant to influence the POSITION of the cubes further down
-                // the chain, only the location of the joints. It doesn't sum the pivot points either; the child bones
-                // are only affected by the parent bones because of the rotations.
-                //
-                // This probably doesn't work but haven't tested it on models with joints so.
-                val stack = MatrixStack()
-                for (bone in resolveParentsFromRoot(mutableMapOf(), bone)) {
-                    val rotation = bone.rotation?.takeIf { it[0] != 0F || it[1] != 0F || it[2] != 0F } ?: continue
-                    stack.translate(-bone.pivot[0], bone.pivot[1], -bone.pivot[2])
-                    stack.multiply(Quaternionf().rotationXYZ(rotation[0].toRadians(), rotation[1].toRadians(), rotation[2].toRadians()))
-                    stack.translate(bone.pivot[0], -bone.pivot[1], bone.pivot[2])
-                }
-
-                bone.cubes?.forEach { cube ->
-                    val size = cube.size?.let { Vector3f(it[0], it[1], it[2]) } ?: Vector3f()
-                    val rotation = cube.rotation?.let { Vector3f(it[0], it[1], it[2]) } ?: Vector3f()
-                    val inflation = (cube.inflate ?: 0F) / 2
-                    val uvs = cube.uv?.let { Vector2i(it[0], it[1]) } ?: Vector2i()
-
-                    /*
-                     * The origin has the X and Z flipped, and that also means counting from the opposite side of the
-                     * cube (second line is accomplishing that part). The reason for this is because Minecraft Java Edition
-                     * is a "right hand" coordinate system (finger guns time!!) whereas Bedrock presumably is left-hand.
-                     *
-                     * Pivots are also inverted fyi.
-                     *
-                     * - Hiro
-                     */
-                    val origin = cube.origin?.let { Vector3f(-it[0], it[1], -it[2]) } ?: Vector3f()
-                    origin.sub(size.get(Vector3f()).mul(1F, 0F, 1F))
-                    val pivot = cube.pivot?.let { Vector3f(-it[0], it[1], -it[2]) } ?: Vector3f()
-
-                    // Apply translate, rotate, then translate back because the pivots don't actually directly translate
-                    // to shifted positions in Bedrock.
-                    stack.push()
-                    stack.translate(pivot.x, pivot.y, pivot.z)
-                    stack.multiply(Quaternionf().rotationXYZ(rotation.x.toRadians(), rotation.y.toRadians(), rotation.z.toRadians()))
-                    stack.translate(-pivot.x, -pivot.y, -pivot.z)
-                    val rotationMatrix = stack.peek().positionMatrix
-                    stack.pop()
-
-                    // Finds where Bedrock put the start of the cube. The matrix does the rotation correctly because we
-                    // are chasing rotations around very specific points.
-                    val desiredPoint = rotationMatrix.transformPosition(origin.get(Vector3f()))
-
-                    // The rotation in Euler angles (which are about 0,0,0), that's what Flywheel likes to eat.
-                    // It will orient it correctly, but a limitation of Euler angles is that it can't get the thing
-                    // to rotate around a specific point, only ever the origin. We'll fix that.
-                    val eulerRotation = rotationMatrix.getEulerAnglesXYZ(Vector3f())
-                    // The reversed form of the rotation Flywheel is about to apply.
-                    val reversedRotation = Quaternionf().fromEulerXYZ(-eulerRotation.x, -eulerRotation.y, -eulerRotation.z)
-                    // Figure out the start point such that Flywheel applying the eulerRotation will put it at the desired point.
-                    val correctStart = reversedRotation.transform(desiredPoint.get(Vector3f()))
-
-                    // Now just put it all together. Inflation is a slight tweak to size and start position.
-                    // Invert YZ is something I don't understand but is necessary.
-                    modelBuilder.cuboid()
-                        .sprite(texture)
-                        .start(correctStart.x - inflation, correctStart.y - inflation, correctStart.z - inflation)
-                        .invertYZ()
-                        .size(size.x + 2 * inflation, size.y + 2 * inflation, size.z + 2 * inflation)
-                        .rotate(eulerRotation.x, eulerRotation.y, eulerRotation.z)
-                        .textureOffset(uvs.x, uvs.y)
-                        .endCuboid()
-                }
-            }
-        }
-        return modelBuilder.build()
-    }
+//    fun createFlywheelModel(atlas: SpriteAtlasHolder, textureName: Identifier, name: String): Model {
+//        val texture = atlas.getSprite(textureName)
+//        val width = ((texture.maxU * atlas.atlas.width.toFloat()) - (texture.minU * atlas.atlas.width)).toInt()
+//        val height =( (texture.maxV * atlas.atlas.height.toFloat()) - (texture.minV * atlas.atlas.height)).toInt()
+//
+//        val modelBuilder = PartBuilder(name, width, height)
+//        modelBuilder.sprite(texture)
+//        val boneMap = mutableMapOf<String, ModelBone>()
+//        geometry?.forEach { it.bones?.forEach { boneMap[it.name] = it } }
+//
+//        geometry?.forEach {
+//            it.bones?.forEach { bone ->
+//                // This is meant to prepare the rotation stack so that the rotation around a cube's pivot point is respecting
+//                // all of the parent bone rotations. It's not meant to influence the POSITION of the cubes further down
+//                // the chain, only the location of the joints. It doesn't sum the pivot points either; the child bones
+//                // are only affected by the parent bones because of the rotations.
+//                //
+//                // This probably doesn't work but haven't tested it on models with joints so.
+//                val stack = MatrixStack()
+//                for (bone in resolveParentsFromRoot(mutableMapOf(), bone)) {
+//                    val rotation = bone.rotation?.takeIf { it[0] != 0F || it[1] != 0F || it[2] != 0F } ?: continue
+//                    stack.translate(-bone.pivot[0], bone.pivot[1], -bone.pivot[2])
+//                    stack.multiply(Quaternionf().rotationXYZ(rotation[0].toRadians(), rotation[1].toRadians(), rotation[2].toRadians()))
+//                    stack.translate(bone.pivot[0], -bone.pivot[1], bone.pivot[2])
+//                }
+//
+//                bone.cubes?.forEach { cube ->
+//                    val size = cube.size?.let { Vector3f(it[0], it[1], it[2]) } ?: Vector3f()
+//                    val rotation = cube.rotation?.let { Vector3f(it[0], it[1], it[2]) } ?: Vector3f()
+//                    val inflation = (cube.inflate ?: 0F) / 2
+//                    val uvs = cube.uv?.let { Vector2i(it[0], it[1]) } ?: Vector2i()
+//
+//                    /*
+//                     * The origin has the X and Z flipped, and that also means counting from the opposite side of the
+//                     * cube (second line is accomplishing that part). The reason for this is because Minecraft Java Edition
+//                     * is a "right hand" coordinate system (finger guns time!!) whereas Bedrock presumably is left-hand.
+//                     *
+//                     * Pivots are also inverted fyi.
+//                     *
+//                     * - Hiro
+//                     */
+//                    val origin = cube.origin?.let { Vector3f(-it[0], it[1], -it[2]) } ?: Vector3f()
+//                    origin.sub(size.get(Vector3f()).mul(1F, 0F, 1F))
+//                    val pivot = cube.pivot?.let { Vector3f(-it[0], it[1], -it[2]) } ?: Vector3f()
+//
+//                    // Apply translate, rotate, then translate back because the pivots don't actually directly translate
+//                    // to shifted positions in Bedrock.
+//                    stack.push()
+//                    stack.translate(pivot.x, pivot.y, pivot.z)
+//                    stack.multiply(Quaternionf().rotationXYZ(rotation.x.toRadians(), rotation.y.toRadians(), rotation.z.toRadians()))
+//                    stack.translate(-pivot.x, -pivot.y, -pivot.z)
+//                    val rotationMatrix = stack.peek().positionMatrix
+//                    stack.pop()
+//
+//                    // Finds where Bedrock put the start of the cube. The matrix does the rotation correctly because we
+//                    // are chasing rotations around very specific points.
+//                    val desiredPoint = rotationMatrix.transformPosition(origin.get(Vector3f()))
+//
+//                    // The rotation in Euler angles (which are about 0,0,0), that's what Flywheel likes to eat.
+//                    // It will orient it correctly, but a limitation of Euler angles is that it can't get the thing
+//                    // to rotate around a specific point, only ever the origin. We'll fix that.
+//                    val eulerRotation = rotationMatrix.getEulerAnglesXYZ(Vector3f())
+//                    // The reversed form of the rotation Flywheel is about to apply.
+//                    val reversedRotation = Quaternionf().fromEulerXYZ(-eulerRotation.x, -eulerRotation.y, -eulerRotation.z)
+//                    // Figure out the start point such that Flywheel applying the eulerRotation will put it at the desired point.
+//                    val correctStart = reversedRotation.transform(desiredPoint.get(Vector3f()))
+//
+//                    // Now just put it all together. Inflation is a slight tweak to size and start position.
+//                    // Invert YZ is something I don't understand but is necessary.
+//                    modelBuilder.cuboid()
+//                        .sprite(texture)
+//                        .start(correctStart.x - inflation, correctStart.y - inflation, correctStart.z - inflation)
+//                        .invertYZ()
+//                        .size(size.x + 2 * inflation, size.y + 2 * inflation, size.z + 2 * inflation)
+//                        .rotate(eulerRotation.x, eulerRotation.y, eulerRotation.z)
+//                        .textureOffset(uvs.x, uvs.y)
+//                        .endCuboid()
+//                }
+//            }
+//        }
+//        return modelBuilder.build()
+//    }

    fun createWithUvOverride(isForLivingEntityRenderer: Boolean, u: Int, v: Int, textureWidth: Int?, textureHeight: Int?) : TexturedModelData {
        val modelData = ModelData()
@@ -18,8 +18,8 @@ import net.minecraft.util.math.Vec3d
 class WishiwashiSchoolingModel (root: ModelPart) : PokemonPoseableModel(){
    override val rootPart = root.registerChildWithAllChildren("wishiwashi_school")

-    override val portraitScale = 0.55F
-    override val portraitTranslation = Vec3d(-1.21, 0.4, 0.0)
+    override val portraitScale = 0.5F
+    override val portraitTranslation = Vec3d(-0.4, 0.8, 0.0)

    override val profileScale = 0.2F
    override val profileTranslation = Vec3d(0.0, 1.0, 0.0)
@@ -40,7 +40,7 @@ class WishiwashiSchoolingModel (root: ModelPart) : PokemonPoseableModel(){

        standing = registerPose(
            poseName = "standing",
-            poseTypes = PoseType.STANDING_POSES - PoseType.FLOAT,
+            poseTypes = PoseType.STANDING_POSES - PoseType.FLOAT + PoseType.UI_POSES,
            idleAnimations = arrayOf(
                bedrock("wishiwashi_school", "water_idle")
            ),
@@ -62,7 +62,7 @@ class WishiwashiSchoolingModel (root: ModelPart) : PokemonPoseableModel(){

        floating = registerPose(
            poseName = "floating",
-            poseTypes = PoseType.UI_POSES + PoseType.FLOAT,
+            poseType = PoseType.FLOAT,
            idleAnimations = arrayOf(
                bedrock("wishiwashi_school", "water_idle")
            )
@@ -17,7 +17,6 @@ import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.endsWith
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.jozufozu.flywheel.core.model.Model
 import net.minecraft.client.model.ModelPart
 import net.minecraft.resource.ResourceType
 import net.minecraft.server.network.ServerPlayerEntity
@@ -35,31 +34,31 @@ object BerryModelRepository : JsonDataRegistry<TexturedModel> {
    override val gson: Gson = TexturedModel.GSON
    override val typeToken: TypeToken<TexturedModel> = TypeToken.get(TexturedModel::class.java)
    override val resourcePath = "bedrock/berries"
-    private val flywheelModels = hashMapOf<Identifier, Model>()
+//    private val flywheelModels = hashMapOf<Identifier, Model>()
    private val vanillaModels = hashMapOf<Identifier, ModelPart>()

    override fun sync(player: ServerPlayerEntity) {}

    override fun reload(data: Map<Identifier, TexturedModel>) {
-        this.flywheelModels.clear()
+//        this.flywheelModels.clear()
        data.forEach { (identifier, model) ->
            var textureName = "cobblemon:flower"
            if (identifier.endsWith("berry.geo")) {
                textureName = identifier.toString()
                    .substring(0, identifier.toString().length - "_berry.geo".length)
            }
-            val atlas = CobblemonAtlases.BERRY_SPRITE_ATLAS
-            this.flywheelModels[identifier] = model.createFlywheelModel(
-                atlas,
-                Identifier.tryParse(textureName)!!,
-                identifier.toString()
-            )
+//            val atlas = CobblemonAtlases.BERRY_SPRITE_ATLAS
+//            this.flywheelModels[identifier] = model.createFlywheelModel(
+//                atlas,
+//                Identifier.tryParse(textureName)!!,
+//                identifier.toString()
+//            )
            //These are for when flywheel isn't available, e.g. with shaders
            this.vanillaModels[identifier] = model.create(false).createModel()
        }
-        Cobblemon.LOGGER.info("Loaded {} berry models", this.flywheelModels.size)
+        Cobblemon.LOGGER.info("Loaded {} berry models", /*this.flywheelModels.size*/this.vanillaModels.size)
    }
-    fun flywheelModelOf(identifier: Identifier) = this.flywheelModels[identifier]
+//    fun flywheelModelOf(identifier: Identifier) = this.flywheelModels[identifier]

    fun modelOf(identifier: Identifier) = this.vanillaModels[identifier]
 }
@@ -148,6 +148,16 @@ class PokemonRenderer(
        pMatrixStack.scale(scale, scale, scale)
    }

+    /**
+     * Renders a beam between the Cobblemon and the target.
+     *
+     * @param matrixStack The matrix stack to render with.
+     * @param partialTicks The partial ticks.
+     * @param entity The Cobblemon.
+     * @param beamTarget The target.
+     * @param colour The colour of the beam.
+     * @param buffer The vertex consumer provider.
+     */
    fun renderBeam(matrixStack: MatrixStack, partialTicks: Float, entity: PokemonEntity, beamTarget: Entity, colour: Vector4f, buffer: VertexConsumerProvider) {
        val clientDelegate = entity.delegate as PokemonClientDelegate
        val pokemonPosition = entity.pos.add(0.0, entity.height / 2.0 * clientDelegate.entityScaleModifier.toDouble(), 0.0)
@@ -205,9 +205,6 @@ class CobblemonConfig {
    @NodeCategory(Category.Spawning)
    var teraTypeRate = 20F

-    @NodeCategory(Category.Spawning)
-    var gigantamaxFactorRate = 20F
-
    @NodeCategory(Category.Pokemon)
    @LastChangedVersion("1.4.0")
    var consumeHeldItems = true
@@ -538,27 +538,19 @@ class PokemonEntity(

    override fun interactMob(player: PlayerEntity, hand: Hand) : ActionResult {
        val itemStack = player.getStackInHand(hand)
-        if (player is ServerPlayerEntity) {
-            if (itemStack.isOf(Items.SHEARS) && this.isShearable) {
-                this.sheared(SoundCategory.PLAYERS)
-                this.emitGameEvent(GameEvent.SHEAR, player)
-                itemStack.damage(1, player) { it.sendToolBreakStatus(hand) }
-                return ActionResult.SUCCESS
-            }
-            else if (itemStack.isOf(Items.BUCKET)) {
-                if (pokemon.getFeature<FlagSpeciesFeature>(DataKeys.CAN_BE_MILKED) != null) {
-                    world.playSoundFromEntity(
-                        null,
-                        this,
-                        SoundEvents.ENTITY_GOAT_MILK,
-                        SoundCategory.PLAYERS,
-                        1.0F,
-                        1.0F
-                    )
-                    val milkBucket = ItemUsage.exchangeStack(itemStack, player, ItemStack(Items.MILK_BUCKET))
-                    player.setStackInHand(hand, milkBucket)
-                    return ActionResult.SUCCESS
-                }
+
+        if (itemStack.isOf(Items.SHEARS) && this.isShearable) {
+            this.sheared(SoundCategory.PLAYERS)
+            this.emitGameEvent(GameEvent.SHEAR, player)
+            itemStack.damage(1, player) { it.sendToolBreakStatus(hand) }
+            return ActionResult.SUCCESS
+        }
+        else if (itemStack.isOf(Items.BUCKET)) {
+            if (pokemon.getFeature<FlagSpeciesFeature>(DataKeys.CAN_BE_MILKED) != null) {
+                player.playSound(SoundEvents.ENTITY_GOAT_MILK, 1.0f, 1.0f)
+                val milkBucket = ItemUsage.exchangeStack(itemStack, player, Items.MILK_BUCKET.defaultStack)
+                player.setStackInHand(hand, milkBucket)
+                return ActionResult.success(world.isClient)
            }
        }

@@ -738,6 +730,7 @@ class PokemonEntity(
        }
        player.giveOrDropItemStack(returned)
        player.sendMessage(text)
+        this.world.playSoundServer(position = this.pos, sound = SoundEvents.ENTITY_ITEM_PICKUP, volume = 0.6F, pitch = 1.4F)
        return true
    }

@@ -757,6 +750,7 @@ class PokemonEntity(
                            this.mountOnto(player)
                            this.pokemon.form.shoulderEffects.forEach { it.applyEffect(this.pokemon, player, isLeft) }
                            this.world.playSoundServer(position = this.pos, sound = SoundEvents.ENTITY_ITEM_PICKUP, volume = 0.7F, pitch = 1.4F)
+                            discard()
                        }
                    }
                }
@@ -160,10 +160,12 @@ class PokemonServerDelegate : PokemonSideDelegate {
    fun updatePoseType() {
        val isSleeping = entity.pokemon.status?.status == Statuses.SLEEP && entity.behaviour.resting.canSleep
        val isMoving = entity.isMoving.get()
+        val isPassenger = entity.hasVehicle()
        val isUnderwater = entity.getIsSubmerged()
        val isFlying = entity.getBehaviourFlag(PokemonBehaviourFlag.FLYING)

        val poseType = when {
+            isPassenger -> PoseType.STAND
            isSleeping -> PoseType.SLEEP
            isMoving && isUnderwater  -> PoseType.SWIM
            isUnderwater -> PoseType.FLOAT
@@ -51,19 +51,24 @@ object AdvancementHandler {
    fun onEvolve(event: EvolutionCompleteEvent) {
        val player = event.pokemon.getOwnerPlayer()
        if (player != null) {
-            val playerData = Cobblemon.playerData.get(player)
-            val advancementData = playerData.advancementData
-            advancementData.updateTotalEvolvedCount()
-            advancementData.updateAspectsCollected(player, event.pokemon)
-            Cobblemon.playerData.saveSingle(playerData)
-            CobblemonCriteria.EVOLVE_POKEMON.trigger(
-                player, EvolvePokemonContext(
-                    event.pokemon.preEvolution!!.species.resourceIdentifier,
-                    event.pokemon.species.resourceIdentifier,
-                    advancementData.totalEvolvedCount
+            if (event.pokemon.preEvolution != null) {
+                val playerData = Cobblemon.playerData.get(player)
+                val advancementData = playerData.advancementData
+                advancementData.updateTotalEvolvedCount()
+                advancementData.updateAspectsCollected(player, event.pokemon)
+                Cobblemon.playerData.saveSingle(playerData)
+                CobblemonCriteria.EVOLVE_POKEMON.trigger(
+                    player, EvolvePokemonContext(
+                        event.pokemon.preEvolution!!.species.resourceIdentifier,
+                        event.pokemon.species.resourceIdentifier,
+                        advancementData.totalEvolvedCount
+                    )
                )
-            )
-            CobblemonCriteria.COLLECT_ASPECT.trigger(player, advancementData.aspectsCollected)
+                CobblemonCriteria.COLLECT_ASPECT.trigger(player, advancementData.aspectsCollected)
+            }
+            else {
+                Cobblemon.LOGGER.warn("Evolution triggered by ${player.displayName} has missing evolution data for ${event.pokemon.species.resourceIdentifier}. Incomplete evolution data: ${event.evolution.id}, please report to the datapack creator!")
+            }
        }
    }

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.integration.adorn
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.ResourcePackActivationBehaviour
+import com.cobblemon.mod.common.util.cobblemonResource
+import juuxel.adorn.block.variant.BlockKind
+import juuxel.adorn.block.variant.BlockVariant
+import juuxel.adorn.block.variant.BlockVariantSet
+import juuxel.adorn.block.variant.BlockVariantSets
+import net.minecraft.text.Text
+import org.jetbrains.annotations.ApiStatus
+
+@ApiStatus.Internal
+object AdornCompatibility : BlockVariantSet {
+
+    override val woodVariants: List<BlockVariant> = listOf(
+        BlockVariant.Wood("${Cobblemon.MODID}/apricorn")
+    )
+
+    private val registerMethod by lazy {
+        BlockVariantSets::class.java.getDeclaredMethod("register", BlockKind::class.java, BlockVariant::class.java).apply { isAccessible = true }
+    }
+
+    @ApiStatus.Internal
+    fun register() {
+        var count = 0
+        Cobblemon.implementation.registerBuiltinResourcePack(cobblemonResource("adorncompatibility"), Text.literal("Adorn Compatibility"), ResourcePackActivationBehaviour.ALWAYS_ENABLED)
+        BlockKind.values().forEach { kind ->
+            this.woodVariants.forEach { variant ->
+                // We use this hack because we can't just call BlockVariantSets#register
+                // This would attempt to register blocks and items multiple times
+                // Unfortunately Adorn does all these registrations on mod initialization on all implementations making it impossible to "correctly" add our things
+                this.registerMethod.invoke(BlockVariantSets, kind, variant)
+                count++
+            }
+        }
+        Cobblemon.LOGGER.info("Registered {} blocks to Adorn", count)
+    }
+
+}
@@ -10,17 +10,10 @@ package com.cobblemon.mod.common.item

 import com.cobblemon.mod.common.block.ApricornBlock
 import net.minecraft.block.BlockState
-import net.minecraft.block.ComposterBlock
 import net.minecraft.item.AliasedBlockItem
 import net.minecraft.item.ItemPlacementContext

 class ApricornItem(block: ApricornBlock) : AliasedBlockItem(block, Settings()) {
-
-    init {
-        // 65% to raise composter level
-        ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE[this] = .65F
-    }
-
    override fun canPlace(context: ItemPlacementContext, state: BlockState) = context.player?.isCreative != false && super.canPlace(context, state)

 }
@@ -9,14 +9,6 @@
 package com.cobblemon.mod.common.item

 import com.cobblemon.mod.common.block.ApricornSaplingBlock
-import net.minecraft.block.ComposterBlock
 import net.minecraft.item.AliasedBlockItem

-class ApricornSeedItem(block: ApricornSaplingBlock) : AliasedBlockItem(block, Settings()) {
-
-    init {
-        // 65% to raise composter level
-        ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE[this] = .65F
-    }
-
-}
+class ApricornSeedItem(block: ApricornSaplingBlock) : AliasedBlockItem(block, Settings())
@@ -9,15 +9,9 @@
 package com.cobblemon.mod.common.item

 import com.cobblemon.mod.common.block.BerryBlock
-import net.minecraft.block.ComposterBlock
 import net.minecraft.item.AliasedBlockItem

 open class BerryItem(private val berryBlock: BerryBlock) : AliasedBlockItem(berryBlock, Settings()) {

-    init {
-        // 65% to raise composter level
-        ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE[this] = .65F
-    }
-
    fun berry() = this.berryBlock.berry()
 }
@@ -8,8 +8,8 @@

 package com.cobblemon.mod.common.item

+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.block.MedicinalLeekBlock
-import net.minecraft.block.ComposterBlock
 import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.item.*
 import net.minecraft.util.ActionResult
@@ -21,7 +21,7 @@ import net.minecraft.world.World
 class MedicinalLeekItem(block: MedicinalLeekBlock, settings: Settings) : AliasedBlockItem(block, settings) {

    init {
-        ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE[this] = .65F
+        Cobblemon.implementation.registerCompostable(this, .65F)
    }

    override fun useOnBlock(context: ItemUsageContext): ActionResult = ActionResult.PASS
@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.item

 import com.bedrockk.molang.runtime.MoLangRuntime
+import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonMechanics
 import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
@@ -19,7 +20,6 @@ import com.cobblemon.mod.common.block.RevivalHerbBlock
 import com.cobblemon.mod.common.item.battle.BagItem
 import com.cobblemon.mod.common.pokemon.Pokemon
 import kotlin.math.ceil
-import net.minecraft.block.ComposterBlock
 import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.item.AliasedBlockItem
 import net.minecraft.item.ItemStack
@@ -34,7 +34,7 @@ class RevivalHerbItem(block: RevivalHerbBlock) : AliasedBlockItem(block, Setting

    init {
        // 65% to raise composter level
-        ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE[this] = .65F
+        Cobblemon.implementation.registerCompostable(this, .65F)
    }

    private val runtime = MoLangRuntime()
@@ -64,16 +64,16 @@ class RevivalHerbItem(block: RevivalHerbBlock) : AliasedBlockItem(block, Setting
        stack: ItemStack,
        pokemon: Pokemon
    ): TypedActionResult<ItemStack>? {
-        if (pokemon.isFainted()) {
+        return if (pokemon.isFainted()) {
            player.playSound(CobblemonSounds.MEDICINE_HERB_USE, SoundCategory.PLAYERS, 1F, 1F)
            pokemon.currentHealth = ceil(pokemon.hp / 4F).toInt()
            pokemon.decrementFriendship(CobblemonMechanics.remedies.getFriendshipDrop(runtime))
            if (!player.isCreative) {
                stack.decrement(1)
            }
-            return TypedActionResult.success(stack)
+            TypedActionResult.success(stack)
        } else {
-            return TypedActionResult.pass(stack)
+            TypedActionResult.pass(stack)
        }
    }

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.item

 import com.cobblemon.mod.common.block.VivichokeBlock
-import net.minecraft.block.*
 import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.item.AliasedBlockItem
 import net.minecraft.item.ItemStack
@@ -22,12 +21,7 @@ import net.minecraft.world.RaycastContext
 import net.minecraft.world.World

 class VivichokeItem(block: VivichokeBlock) : AliasedBlockItem(block, Settings()) {
-
-    init {
-        ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE[this] = .65F
-    }
-
-    override fun use(world: World?, user: PlayerEntity, hand: Hand?): TypedActionResult<ItemStack?>? {
+    override fun use(world: World?, user: PlayerEntity, hand: Hand?): TypedActionResult<ItemStack?> {
        val blockHitResult = PlaceableOnWaterItem.raycast(world, user, RaycastContext.FluidHandling.SOURCE_ONLY)
        val blockHitResult2 = blockHitResult.withBlockPos(blockHitResult.blockPos.up())
        val actionResult: ActionResult = super.useOnBlock(ItemUsageContext(user, hand, blockHitResult2))
@@ -360,6 +360,12 @@ object CobblemonItemGroups {
        CobblemonItems.pokeBalls.forEach(entries::add)
    }

+    private fun keyitemsentries(displayContext: DisplayContext): List<Item> = arrayListOf(
+            CobblemonItems.PHOTODEX
+    )
+
+
+
    private fun foodInjections(displayContext: DisplayContext): List<Item> = arrayListOf(
        CobblemonItems.ROASTED_LEEK,
        CobblemonItems.LEEK_AND_POTATO_STEW,
@@ -23,6 +23,7 @@ import net.minecraft.sound.SoundCategory
 import net.minecraft.util.Hand
 import net.minecraft.util.TypedActionResult
 import net.minecraft.world.World
+import net.minecraft.item.Items

 class BerryJuiceItem : CobblemonItem(Settings()), PokemonSelectingItem {
    override val bagItem = object : BagItem {
@@ -51,6 +52,11 @@ class BerryJuiceItem : CobblemonItem(Settings()), PokemonSelectingItem {
        player.playSound(CobblemonSounds.BERRY_EAT, SoundCategory.PLAYERS, 1F, 1F)
        if (!player.isCreative)  {
            stack.decrement(1)
+            val woodenBowlItemStack = ItemStack(Items.BOWL)
+            if (!player.inventory.insertStack(woodenBowlItemStack)) {
+                // Drop the item into the world if the inventory is full
+                player.dropItem(woodenBowlItemStack, false)
+            }
        }
        return TypedActionResult.success(stack)
    }
@@ -58,5 +64,12 @@ class BerryJuiceItem : CobblemonItem(Settings()), PokemonSelectingItem {
    override fun applyToBattlePokemon(player: ServerPlayerEntity, stack: ItemStack, battlePokemon: BattlePokemon) {
        super.applyToBattlePokemon(player, stack, battlePokemon)
        player.playSound(CobblemonSounds.BERRY_EAT, SoundCategory.PLAYERS, 1F, 1F)
+        if (!player.isCreative)  {
+            val woodenBowlItemStack = ItemStack(Items.BOWL)
+            if (!player.inventory.insertStack(woodenBowlItemStack)) {
+                // Drop the item into the world if the inventory is full
+                player.dropItem(woodenBowlItemStack, false)
+            }
+        }
    }
-}
+}
@@ -0,0 +1,265 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.item.interactive
+
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import net.fabricmc.api.EnvType
+import net.fabricmc.api.Environment
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.render.*
+import net.minecraft.client.util.math.MatrixStack
+import net.minecraft.entity.Entity
+import net.minecraft.entity.LivingEntity
+import net.minecraft.entity.player.PlayerEntity
+import net.minecraft.item.ItemStack
+import net.minecraft.item.SpyglassItem
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.text.Text
+import net.minecraft.util.Hand
+import net.minecraft.util.Identifier
+import net.minecraft.util.TypedActionResult
+import net.minecraft.util.math.Box
+import net.minecraft.world.World
+import org.lwjgl.glfw.GLFW
+import org.lwjgl.glfw.GLFWMouseButtonCallback
+import org.lwjgl.glfw.GLFWScrollCallback
+import java.util.logging.LogManager
+
+
+class PhotodexItem : /*CobblemonItem(Settings()),*/ SpyglassItem(Settings()) {
+    private var inUse = false
+    private var isZooming = false
+    private var zoomLevel = 1.0
+    private var scrollCallback = -1L
+    private var mouseCallback = -1L
+
+    private var isScrollCallbackRegistered = false
+    private var isMouseButtonCallbackRegistered = false
+
+    private var leftMouseButtonPressedLastTick = false
+
+    fun changeFOV(double: Double) {
+        val client = MinecraftClient.getInstance()
+        val newFov = (70 / zoomLevel).coerceIn(30.0, 110.0).toInt() // Clamping the FOV value
+        client.options.fov.setValue(newFov)
+    }
+
+    // todo use method to toggle on functionality of camera
+    /*override fun use(world: World, user: PlayerEntity, hand: Hand): TypedActionResult<ItemStack> {
+        if (world.isClient) {
+            inUse = !inUse // toggle inUse state
+
+            if (inUse) {
+                //registerInputHandlers() // Activate input handling
+                zoomLevel = 1.0 // Initialize zoom level
+            } else {
+                //unregisterInputHandlers() // Deactivate input handling
+                zoomLevel = 1.0 // Reset zoom level
+                changeFOV(70.0) // Reset FOV
+            }
+            return TypedActionResult.success(user.getStackInHand(hand))
+        }
+        return TypedActionResult.pass(user.getStackInHand(hand))
+    }*/
+
+    // todo use method for holding down right click to enable camera like the spyglass
+    override fun use(world: World, user: PlayerEntity, hand: Hand): TypedActionResult<ItemStack> {
+
+        if (world.isClient) {
+            if (!inUse) {
+                inUse = true // Activate only on initial click
+                registerInputHandlers() // Activate input handling
+                zoomLevel = 1.0 // Initialize zoom level
+                changeFOV(70.0) // Set initial FOV
+            }
+            return TypedActionResult.success(user.getStackInHand(hand))
+        }
+        return TypedActionResult.pass(user.getStackInHand(hand))
+    }
+
+    // todo onStoppedUsing for ending the camera use when letting go of the Right Click
+    override fun onStoppedUsing(stack: ItemStack?, world: World, entity: LivingEntity, timeLeft: Int) {
+        println("Triggered onStoppedUsing function")
+        super.onStoppedUsing(stack, world, entity, timeLeft)
+        if (world.isClient && entity is PlayerEntity) {
+            inUse = false // Reset on release
+            unregisterInputHandlers()
+            zoomLevel = 1.0
+            changeFOV(70.0) // Reset FOV
+        }
+    }
+
+    @Environment(EnvType.CLIENT)
+    private fun registerInputHandlers() {
+        val windowHandle = MinecraftClient.getInstance().window.handle
+
+        if (!isScrollCallbackRegistered) {
+            // Register scroll callback
+            GLFW.glfwSetScrollCallback(windowHandle) { _, _, yOffset ->
+                println("Scroll Callback Triggered: yOffset = $yOffset")
+
+                if (yOffset != 0.0) {
+                    zoomLevel += yOffset * 0.05 // Smaller increment
+                    zoomLevel = zoomLevel.coerceIn(1.0, 4.0) // More controlled zoom range
+                    changeFOV(70 / zoomLevel)
+                }
+            }
+            isScrollCallbackRegistered = true
+        }
+
+        if (!isMouseButtonCallbackRegistered) {
+            // Register mouse button callback
+            GLFW.glfwSetMouseButtonCallback(windowHandle) { _, button, action, _ ->
+                //println("Mouse Button Callback Triggered")
+                //println("inUse is " + inUse.toString())
+
+                // todo NOTE: BUTTON_1 is apparently LEFT BUTTON_2 is apparently RIGHT but we might need to check
+
+
+                if (inUse && button == GLFW.GLFW_MOUSE_BUTTON_1 && action == GLFW.GLFW_PRESS) {
+                    println("Mouse Button 1 Left Pressed")
+                    MinecraftClient.getInstance().player?.let {
+                        if (it.world.isClient) {
+                            detectPokemon(it.world, it, Hand.MAIN_HAND)
+                        }
+                    }
+                }
+                else if (inUse && button == GLFW.GLFW_MOUSE_BUTTON_1 && action == GLFW.GLFW_RELEASE) {
+                    println("Mouse Button 1 Left Released")
+                    // Implement your logic for release here
+
+                }
+
+                if (inUse && button == GLFW.GLFW_MOUSE_BUTTON_2 && action == GLFW.GLFW_PRESS) {
+                    println("Mouse Button 2 Right Pressed")
+
+                }
+                else if (inUse && button == GLFW.GLFW_MOUSE_BUTTON_2 && action == GLFW.GLFW_RELEASE) {
+                    println("Mouse Button 2 Right Released")
+                    inUse = false
+                    unregisterInputHandlers()
+                    zoomLevel = 1.0
+                    changeFOV(70.0) // Reset FOV
+                }
+
+                /*if (inUse && button == GLFW.GLFW_MOUSE_BUTTON_1 && action == GLFW.GLFW_PRESS) {
+                    println("Mouse Button Callback Triggered")
+                    MinecraftClient.getInstance().player?.let {
+                        if (it.world.isClient) {
+                            detectPokemon(it.world, it, Hand.MAIN_HAND)
+                        }
+                    }
+                }*/
+            }
+            isMouseButtonCallbackRegistered = true
+        }
+    }
+
+    private fun unregisterInputHandlers() {
+        val windowHandle = MinecraftClient.getInstance().window.handle
+
+        if (isScrollCallbackRegistered) {
+            GLFW.glfwSetScrollCallback(windowHandle, null)?.free()
+            isScrollCallbackRegistered = false
+        }
+
+        if (isMouseButtonCallbackRegistered) {
+            GLFW.glfwSetMouseButtonCallback(windowHandle, null)?.free()
+            isMouseButtonCallbackRegistered = false
+        }
+    }
+
+    fun detectPokemon(world: World, user: PlayerEntity, hand: Hand) {
+        if (user is ServerPlayerEntity && inUse) {
+            val eyePos = user.getCameraPosVec(1.0F)
+            val lookVec = user.getRotationVec(1.0F)
+            val maxDistance = 100.0  // Set this to how far you want the ray to go
+            var closestEntity: Entity? = null
+            var closestDistance = maxDistance
+
+            // Send a chat message to the player
+            //user.sendMessage(Text.of("Trying to Detect Entity"));
+
+            // Define a large bounding box around the player
+            val boundingBox = Box(
+                    user.x - 200.0, user.y - 200.0, user.z - 200.0,
+                    user.x + 200.0, user.y + 200.0, user.z + 200.0
+            )
+
+            // Get all entities within the bounding box
+            val entities = user.world.getEntitiesByClass(Entity::class.java, boundingBox, { it != user })
+
+            for (entity in entities) {
+                val entityBox: Box = entity.boundingBox
+                val intersection = entityBox.raycast(eyePos, eyePos.add(lookVec.multiply(maxDistance)))
+
+                if (intersection.isPresent) {
+                    val distanceToEntity = eyePos.distanceTo(intersection.get())
+                    if (distanceToEntity < closestDistance) {
+                        closestEntity = entity
+                        closestDistance = distanceToEntity
+                    }
+                }
+            }
+
+            if (closestEntity != null && closestEntity is PokemonEntity) {
+                user.sendMessage(Text.of("You have scanned a: ${closestEntity.pokemon.species.name}"))
+
+            }
+        }
+    }
+
+    /*override fun onStoppedUsing(stack: ItemStack, world: World, entity: LivingEntity, timeLeft: Int) {
+        inUse = false
+    }*/
+
+    fun renderPhotodexOverlay(matrixStack: MatrixStack) {
+        // Assuming your texture is meant to cover the full screen or a significant portion of it.
+        // These dimensions will scale the texture to fit as desired.
+        val screenWidth = MinecraftClient.getInstance().window.scaledWidth
+        val screenHeight = MinecraftClient.getInstance().window.scaledHeight
+
+        // Your custom overlay texture
+        val photodexOverlayTexture = Identifier("textures/item/keyitems/PhotodexLens.png")
+
+        // Binding the texture
+        MinecraftClient.getInstance().textureManager.bindTexture(photodexOverlayTexture)
+
+        // Enable blending for transparency
+        //RenderSystem.enableBlend()
+        //RenderSystem.blendFuncSeparate(RenderSystem.SourceFactor.SRC_ALPHA, RenderSystem.DestFactor.ONE_MINUS_SRC_ALPHA, RenderSystem.SourceFactor.ONE, RenderSystem.DestFactor.ZERO)
+
+//        RenderSystem.enableBlend()
+//        RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA)
+
+        // Drawing the overlay
+        drawTexture(matrixStack, 0, 0, screenWidth, screenHeight, 0f, 0f, 256, 256, 256, 256)
+
+        // Disable blending if you enabled it earlier
+//        RenderSystem.disableBlend()
+    }
+
+    // Adjusted to accept float texture coordinates and dimensions
+    private fun drawTexture(
+            matrices: MatrixStack,
+            x: Int, y: Int, width: Int, height: Int,
+            u0: Float, v0: Float, regionWidth: Int, regionHeight: Int, textureWidth: Int, textureHeight: Int
+    ) {
+        val drawMode = VertexFormat.DrawMode.QUADS // Quads
+        val tessellator = Tessellator.getInstance()
+        val bufferBuilder = tessellator.buffer
+        bufferBuilder.begin(drawMode, VertexFormats.POSITION_TEXTURE)
+        bufferBuilder.vertex(matrices.peek().positionMatrix, x.toFloat(), (y + height).toFloat(), 0f).texture(u0 / textureWidth, (v0 + regionHeight) / textureHeight).next()
+        bufferBuilder.vertex(matrices.peek().positionMatrix, (x + width).toFloat(), (y + height).toFloat(), 0f).texture((u0 + regionWidth) / textureWidth, (v0 + regionHeight) / textureHeight).next()
+        bufferBuilder.vertex(matrices.peek().positionMatrix, (x + width).toFloat(), y.toFloat(), 0f).texture((u0 + regionWidth) / textureWidth, v0 / textureHeight).next()
+        bufferBuilder.vertex(matrices.peek().positionMatrix, x.toFloat(), y.toFloat(), 0f).texture(u0 / textureWidth, v0 / textureHeight).next()
+        tessellator.draw()
+    }
+
+}
@@ -69,17 +69,17 @@ class PotionItem(val type: PotionType) : CobblemonItem(Settings()), PokemonSelec
 enum class PotionType(val amountToHeal: () -> Expression, val curesStatus: Boolean) : BagItem {
    POTION({ com.cobblemon.mod.common.CobblemonMechanics.potions.potionRestoreAmount }, false) {
        override val itemName = "item.cobblemon.potion"
-        override fun getShowdownInput(actor: BattleActor, battlePokemon: BattlePokemon, data: String?) = "potion $amountToHeal"
+        override fun getShowdownInput(actor: BattleActor, battlePokemon: BattlePokemon, data: String?) = "potion ${genericRuntime.resolveInt(amountToHeal(), battlePokemon)}"
        override fun canUse(battle: PokemonBattle, target: BattlePokemon) =  target.health < target.maxHealth && target.health > 0
    },
    SUPER_POTION({ com.cobblemon.mod.common.CobblemonMechanics.potions.superPotionRestoreAmount }, false) {
        override val itemName = "item.cobblemon.super_potion"
-        override fun getShowdownInput(actor: BattleActor, battlePokemon: BattlePokemon, data: String?) = "potion $amountToHeal"
+        override fun getShowdownInput(actor: BattleActor, battlePokemon: BattlePokemon, data: String?) = "potion ${genericRuntime.resolveInt(amountToHeal(), battlePokemon)}"
        override fun canUse(battle: PokemonBattle, target: BattlePokemon) =  target.health < target.maxHealth && target.health > 0
    },
    HYPER_POTION({ com.cobblemon.mod.common.CobblemonMechanics.potions.hyperPotionRestoreAmount }, false) {
        override val itemName = "item.cobblemon.hyper_potion"
-        override fun getShowdownInput(actor: BattleActor, battlePokemon: BattlePokemon, data: String?) = "potion $amountToHeal"
+        override fun getShowdownInput(actor: BattleActor, battlePokemon: BattlePokemon, data: String?) = "potion ${genericRuntime.resolveInt(amountToHeal(), battlePokemon)}"
        override fun canUse(battle: PokemonBattle, target: BattlePokemon) =  target.health < target.maxHealth && target.health > 0
    },
    MAX_POTION({ 999999.0.asExpression() }, false) {
@@ -92,4 +92,4 @@ enum class PotionType(val amountToHeal: () -> Expression, val curesStatus: Boole
        override fun getShowdownInput(actor: BattleActor, battlePokemon: BattlePokemon, data: String?) = "full_restore"
        override fun canUse(battle: PokemonBattle, target: BattlePokemon) =  target.health < target.maxHealth && target.health > 0
    }
-}
+}
@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
 import com.cobblemon.mod.common.net.messages.server.SendOutPokemonPacket
 import com.cobblemon.mod.common.pokemon.activestate.ActivePokemonState
+import com.cobblemon.mod.common.pokemon.activestate.ShoulderedState
 import com.cobblemon.mod.common.util.toVec3d
 import com.cobblemon.mod.common.util.traceBlockCollision
 import net.minecraft.server.MinecraftServer
@@ -31,11 +32,11 @@ object SendOutPokemonHandler : ServerNetworkPacketHandler<SendOutPokemonPacket>
        }
        val state = pokemon.state

-        if (state !is ActivePokemonState) {
+        if (state is ShoulderedState || state !is ActivePokemonState) {
            val trace = player.traceBlockCollision(maxDistance = 15F)
            if (trace != null && !player.world.getBlockState(trace.blockPos.up()).isSolid) {
                val position = Vec3d(trace.location.x, trace.blockPos.up().toVec3d().y, trace.location.z)
-                pokemon.sendOutWithAnimation(player, player.serverWorld, position)
+                    pokemon.sendOutWithAnimation(player, player.serverWorld, position)
            }
        } else {
            val entity = state.entity
@@ -19,31 +19,15 @@ import com.cobblemon.mod.common.api.data.ShowdownIdentifiable
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.CobblemonEvents.FRIENDSHIP_UPDATED
 import com.cobblemon.mod.common.api.events.CobblemonEvents.POKEMON_FAINTED
-import com.cobblemon.mod.common.api.events.pokemon.ExperienceGainedPostEvent
-import com.cobblemon.mod.common.api.events.pokemon.ExperienceGainedPreEvent
-import com.cobblemon.mod.common.api.events.pokemon.FriendshipUpdatedEvent
-import com.cobblemon.mod.common.api.events.pokemon.LevelUpEvent
-import com.cobblemon.mod.common.api.events.pokemon.PokemonFaintedEvent
-import com.cobblemon.mod.common.api.events.pokemon.PokemonRecalledEvent
-import com.cobblemon.mod.common.api.events.pokemon.PokemonSentPostEvent
-import com.cobblemon.mod.common.api.events.pokemon.PokemonSentPreEvent
-import com.cobblemon.mod.common.api.moves.BenchedMove
-import com.cobblemon.mod.common.api.moves.BenchedMoves
-import com.cobblemon.mod.common.api.moves.Move
-import com.cobblemon.mod.common.api.moves.MoveSet
-import com.cobblemon.mod.common.api.moves.MoveTemplate
-import com.cobblemon.mod.common.api.moves.Moves
+import com.cobblemon.mod.common.api.events.pokemon.*
+import com.cobblemon.mod.common.api.moves.*
 import com.cobblemon.mod.common.api.pokeball.PokeBalls
 import com.cobblemon.mod.common.api.pokemon.Natures
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.api.pokemon.PokemonPropertyExtractor
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.api.pokemon.aspect.AspectProvider
-import com.cobblemon.mod.common.api.pokemon.evolution.Evolution
-import com.cobblemon.mod.common.api.pokemon.evolution.EvolutionController
-import com.cobblemon.mod.common.api.pokemon.evolution.EvolutionDisplay
-import com.cobblemon.mod.common.api.pokemon.evolution.EvolutionProxy
-import com.cobblemon.mod.common.api.pokemon.evolution.PreEvolution
+import com.cobblemon.mod.common.api.pokemon.evolution.*
 import com.cobblemon.mod.common.api.pokemon.experience.ExperienceGroup
 import com.cobblemon.mod.common.api.pokemon.experience.ExperienceSource
 import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeature
@@ -70,10 +54,7 @@ import com.cobblemon.mod.common.net.messages.client.PokemonUpdatePacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.*
 import com.cobblemon.mod.common.net.serverhandling.storage.SendOutPokemonHandler.SEND_OUT_DURATION
 import com.cobblemon.mod.common.pokeball.PokeBall
-import com.cobblemon.mod.common.pokemon.activestate.ActivePokemonState
-import com.cobblemon.mod.common.pokemon.activestate.InactivePokemonState
-import com.cobblemon.mod.common.pokemon.activestate.PokemonState
-import com.cobblemon.mod.common.pokemon.activestate.SentOutState
+import com.cobblemon.mod.common.pokemon.activestate.*
 import com.cobblemon.mod.common.pokemon.evolution.CobblemonEvolutionProxy
 import com.cobblemon.mod.common.pokemon.evolution.progress.DamageTakenEvolutionProgress
 import com.cobblemon.mod.common.pokemon.evolution.progress.RecoilEvolutionProgress
@@ -81,26 +62,12 @@ import com.cobblemon.mod.common.pokemon.feature.SeasonFeatureHandler
 import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
 import com.cobblemon.mod.common.pokemon.status.PersistentStatus
 import com.cobblemon.mod.common.pokemon.status.PersistentStatusContainer
-import com.cobblemon.mod.common.util.DataKeys
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.lang
-import com.cobblemon.mod.common.util.playSoundServer
-import com.cobblemon.mod.common.util.server
-import com.cobblemon.mod.common.util.setPositionSafely
-import com.cobblemon.mod.common.util.toBlockPos
+import com.cobblemon.mod.common.util.*
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.google.gson.JsonPrimitive
 import com.mojang.serialization.Dynamic
 import com.mojang.serialization.JsonOps
-import java.util.Optional
-import java.util.UUID
-import java.util.concurrent.CompletableFuture
-import kotlin.math.absoluteValue
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.roundToInt
-import kotlin.random.Random
 import net.minecraft.entity.LivingEntity
 import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.item.ItemStack
@@ -119,6 +86,13 @@ import net.minecraft.util.InvalidIdentifierException
 import net.minecraft.util.math.MathHelper.ceil
 import net.minecraft.util.math.MathHelper.clamp
 import net.minecraft.util.math.Vec3d
+import java.util.*
+import java.util.concurrent.CompletableFuture
+import kotlin.math.absoluteValue
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.roundToInt
+import kotlin.random.Random

 open class Pokemon : ShowdownIdentifiable {
    var uuid = UUID.randomUUID()
@@ -275,12 +249,6 @@ open class Pokemon : ShowdownIdentifiable {
        }
    var state: PokemonState = InactivePokemonState()
        set(value) {
-            val current = field
-            if (current is ActivePokemonState && !isClient) {
-                if (value !is ActivePokemonState || value.entity != current.entity) {
-                    current.recall()
-                }
-            }
            field = value
            _state.emit(value)
        }
@@ -475,8 +443,12 @@ open class Pokemon : ShowdownIdentifiable {
        position: Vec3d,
        battleId: UUID? = null,
        doCry: Boolean = true,
-        mutation: (PokemonEntity) -> Unit = {}
+        mutation: (PokemonEntity) -> Unit = {},
    ): CompletableFuture<PokemonEntity> {
+        // Handle special case of shouldered Cobblemon
+        if (this.state is ShoulderedState) return sendOutFromShoulder(source as ServerPlayerEntity, level, position, battleId, doCry, mutation)
+
+        // Proceed as normal for non-shouldered Cobblemon
        val future = CompletableFuture<PokemonEntity>()
        sendOut(level, position) {
            level.playSoundServer(position, CobblemonSounds.POKE_BALL_SEND_OUT, volume = 0.6F)
@@ -498,9 +470,57 @@ open class Pokemon : ShowdownIdentifiable {
        }
        return future
    }
+
+    /**
+     * Send out the Pokémon from the player's shoulder.
+     */
+    fun sendOutFromShoulder(
+        player: ServerPlayerEntity,
+        level: ServerWorld,
+        targetPosition: Vec3d,
+        battleId: UUID? = null,
+        doCry: Boolean = true,
+        mutation: (PokemonEntity) -> Unit = {}
+    ): CompletableFuture<PokemonEntity> {
+        val future = CompletableFuture<PokemonEntity>()
+
+        // get the current position of the cobblemon on the players shoulder
+        val isLeftShoulder = (state as ShoulderedState).isLeftShoulder
+        val arbitraryXOffset = player.width * 0.3 + this.form.hitbox.width * 0.3
+        val shoulderHorizontalOffset = if (isLeftShoulder) arbitraryXOffset else -arbitraryXOffset
+        val rotation = player.yaw
+        Cobblemon.LOGGER.info("rotation: $rotation")
+        val approxShoulderMonHight = player.height.toDouble() - this.form.hitbox.height * 0.4
+        val rotatedOffset = Vec3d(shoulderHorizontalOffset, approxShoulderMonHight, 0.0).rotateY(-rotation * (Math.PI.toFloat() / 180f))
+        val currentPosition = player.pos.add(rotatedOffset)
+
+        sendOut(level, currentPosition) {
+            // Play some sound indicating hopping off
+            level.playSoundServer(currentPosition, CobblemonSounds.PC_DROP, volume = 0.6F)
+
+            // Make the Cobblemon walk to the target Position with haste
+            it.moveControl.moveTo(targetPosition.x, targetPosition.y, targetPosition.z, 1.2)
+            it.battleId.set(Optional.ofNullable(battleId))
+
+            afterOnMain(seconds = SEND_OUT_DURATION) {
+                future.complete(it)
+                CobblemonEvents.POKEMON_SENT_POST.post(PokemonSentPostEvent(this, it))
+                if (doCry) {
+                    it.cry()
+                }
+            }
+
+            mutation(it)
+        }
+        return future
+    }
+
+
    fun recall() {
        CobblemonEvents.POKEMON_RECALLED.post(PokemonRecalledEvent(this, this.entity))
+        val state = this.state as? ActivePokemonState
        this.state = InactivePokemonState()
+        state?.recall()
    }

    fun tryRecallWithAnimation() {
@@ -908,7 +928,14 @@ open class Pokemon : ShowdownIdentifiable {

    fun getOwnerUUID() : UUID? {
        storeCoordinates.get().let {
-            if (isPlayerOwned()) return it!!.store.uuid
+            if (!isPlayerOwned()) {
+                return@let
+            }
+
+            if (it!!.store is PlayerPartyStore) {
+                return (it.store as PlayerPartyStore).playerUUID
+            }
+            return it.store.uuid
        }
        return null
    }
@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.pokemon

 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.pokemon.stats.Stat
+import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.net.IntSize
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
@@ -73,12 +74,9 @@ abstract class PokemonStats : Iterable<Map.Entry<Stat, Int>> {

    fun loadFromNBT(nbt: NbtCompound): PokemonStats {
        stats.clear()
-        nbt.keys.forEach { statId ->
-            try {
-                val identifier = statId.asIdentifierDefaultingNamespace()
-                val stat = Cobblemon.statProvider.fromIdentifier(identifier) ?: return@forEach
-                this[stat] = nbt.getShort(statId).toInt()
-            } catch (_: InvalidIdentifierException) {}
+        Stats.PERMANENT.forEach { stat ->
+            val identifier = this.cleanStatIdentifier(stat.identifier)
+            this[stat] = nbt.getShort(identifier).toInt().coerceIn(this.acceptableRange)
        }
        return this
    }
@@ -95,12 +93,11 @@ abstract class PokemonStats : Iterable<Map.Entry<Stat, Int>> {

    fun loadFromJSON(json: JsonObject): PokemonStats {
        stats.clear()
-        json.entrySet().forEach { (key, element) ->
-            try {
-                val identifier = key.asIdentifierDefaultingNamespace()
-                val stat = Cobblemon.statProvider.fromIdentifier(identifier) ?: return@forEach
-                this[stat] = element.asInt
-            } catch (_: InvalidIdentifierException) {}
+
+        Stats.PERMANENT.forEach { stat ->
+            val identifier = this.cleanStatIdentifier(stat.identifier)
+            this[stat] = json.get(identifier)?.asInt?.coerceIn(this.acceptableRange)
+                ?: this.defaultValue
        }
        return this
    }
@@ -11,14 +11,8 @@ package com.cobblemon.mod.common.pokemon.activestate
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.Pokemon
-import com.cobblemon.mod.common.util.DataKeys
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.getPlayer
-import com.cobblemon.mod.common.util.isPokemonEntity
-import com.cobblemon.mod.common.util.party
-import com.cobblemon.mod.common.util.playSoundServer
+import com.cobblemon.mod.common.util.*
 import com.google.gson.JsonObject
-import java.util.UUID
 import net.minecraft.nbt.NbtCompound
 import net.minecraft.network.PacketByteBuf
 import net.minecraft.registry.RegistryKey
@@ -26,6 +20,7 @@ import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.sound.SoundEvents
 import net.minecraft.util.Identifier
 import net.minecraft.world.World
+import java.util.*

 sealed class PokemonState {
    companion object {
@@ -176,6 +171,9 @@ class ShoulderedState() : ActivePokemonState() {
        return this
    }

+    /**
+     * Removes the cobblemon from the player's shoulder. (currently not used)
+     */
    override fun recall() {
        val player = playerUUID.getPlayer() ?: return
        val nbt = if (isLeftShoulder) player.shoulderEntityLeft else player.shoulderEntityRight
@@ -25,11 +25,13 @@ import net.minecraft.world.biome.Biome
 * @since March 21st, 2022
 */
 class BiomeRequirement : EntityQueryRequirement {
-    val biomeCondition: RegistryLikeCondition<Biome> = BiomeIdentifierCondition(Identifier("plains"))
-    override fun check(pokemon: Pokemon, queriedEntity: LivingEntity) = biomeCondition.fits(
-        queriedEntity.world.getBiome(queriedEntity.blockPos).value(),
-        queriedEntity.world.registryManager.get(RegistryKeys.BIOME)
-    )
+    val biomeCondition: RegistryLikeCondition<Biome>? = null
+    val biomeAnticondition: RegistryLikeCondition<Biome>? = null
+    override fun check(pokemon: Pokemon, queriedEntity: LivingEntity): Boolean {
+        val biome = queriedEntity.world.getBiome(queriedEntity.blockPos).value()
+        val registry = queriedEntity.world.registryManager.get(RegistryKeys.BIOME)
+        return (biomeCondition == null || biomeCondition.fits(biome, registry)) && (biomeAnticondition == null || !biomeAnticondition.fits(biome, registry))
+    }

    companion object {
        const val ADAPTER_VARIANT = "biome"
@@ -15,11 +15,9 @@ import net.minecraft.registry.tag.FluidTags
 import net.minecraft.server.world.ServerWorld
 import net.minecraft.sound.SoundCategory
 import net.minecraft.sound.SoundEvent
-import net.minecraft.util.math.BlockPos
-import net.minecraft.util.math.Box
+import net.minecraft.util.math.*
 import net.minecraft.util.math.MathHelper.ceil
 import net.minecraft.util.math.MathHelper.floor
-import net.minecraft.util.math.Vec3d
 import net.minecraft.world.BlockView
 import net.minecraft.world.World

@@ -48,6 +46,23 @@ fun World.squeezeWithinBounds(pos: BlockPos): BlockPos {
    )
 }

+fun ServerWorld.isBoxLoaded(box: Box): Boolean {
+    val startChunkX = ChunkSectionPos.getSectionCoord(box.minX)
+    val startChunkZ = ChunkSectionPos.getSectionCoord(box.minZ)
+    val endChunkX = ChunkSectionPos.getSectionCoord(box.maxX)
+    val endChunkZ = ChunkSectionPos.getSectionCoord(box.maxZ)
+
+    for (chunkX in startChunkX..endChunkX) {
+        for (chunkZ in startChunkZ..endChunkZ) {
+            if (!this.isChunkLoaded(ChunkPos.toLong(chunkX, chunkZ))) {
+                return false
+            }
+        }
+    }
+
+    return true
+}
+
 fun Box.getRanges(): Triple<IntRange, IntRange, IntRange> {
    return Triple(floor(minX)..ceil(maxX), minY.toInt()..ceil(maxY), minZ.toInt()..ceil(maxZ))
 }
@@ -138,7 +138,6 @@
 			}
 		},
 		"animation.exeggcute.faint": {
-			"loop": true,
 			"animation_length": 2,
 			"bones": {
 				"egg": {
@@ -3,7 +3,7 @@
 	"minecraft:geometry": [
 		{
 			"description": {
-				"identifier": "geometry.unknown",
+				"identifier": "geometry.baltoy",
 				"texture_width": 64,
 				"texture_height": 64,
 				"visible_bounds_width": 3,
@@ -25,7 +25,7 @@
 						{"origin": [0.51209, 4.4125, -2.01659], "size": [0, 2, 2], "pivot": [0, 10.19375, -1.01659], "rotation": [0, 90, 0], "uv": [12, 18]},
 						{"origin": [-2.5279, 4.9125, 1.48341], "size": [3, 1, 0], "inflate": 0.011, "pivot": [0, 10.19375, -1.01659], "rotation": [0, 90, 0], "uv": [26, 32]},
 						{"origin": [-0.4721, 4.9125, 1.48341], "size": [3, 1, 0], "inflate": 0.011, "pivot": [0, 10.19375, -1.01659], "rotation": [0, -90, 0], "uv": [26, 34], "mirror": true},
-						{"origin": [-2.53791, 3.9125, -3.51659], "size": [0, 3, 5], "pivot": [0, 10.19375, -1.01659], "rotation": [0, 90, 0], "uv": [0, 30]},
+						{"origin": [-2.53791, 3.9125, -3.51659], "size": [0, 3, 5], "inflate": 0.001, "pivot": [0, 10.19375, -1.01659], "rotation": [0, 90, 0], "uv": [0, 30]},
 						{"origin": [-2.56291, 4.4125, -2.01659], "size": [0, 2, 2], "pivot": [0, 10.19375, -1.01659], "rotation": [0, 90, 0], "uv": [12, 18]},
 						{"origin": [0, 0.6375, -1.47868], "size": [0, 3, 3], "pivot": [0, 2.1375, 0.02132], "rotation": [-45, 0, 0], "uv": [0, 0]},
 						{"origin": [0, 0.6375, -1.47868], "size": [0, 3, 3], "pivot": [0, 2.1375, 0.02132], "rotation": [0, 90, 45], "uv": [18, 8]},
@@ -41,7 +41,7 @@
 						{"origin": [-2.26608, 10.025, -3.28268], "size": [6, 3, 6], "pivot": [0, 10.45625, -1.01659], "rotation": [0, -45, 0], "uv": [0, 0]},
 						{"origin": [-2.29108, 8.5, -3.30768], "size": [6, 4, 0], "pivot": [0, 9.93125, -1.01659], "rotation": [0, -45, 0], "uv": [0, 31]},
 						{"origin": [-3.70892, 8.5, -3.30768], "size": [6, 4, 0], "pivot": [0, 9.93125, -1.01659], "rotation": [0, 45, 0], "uv": [12, 31]},
-						{"origin": [0, 13.025, -1.47868], "size": [0, 3, 3], "pivot": [0, 14.525, 0.02132], "rotation": [0, 0, 0], "uv": [18, 22]},
+						{"origin": [0, 13.025, -1.47868], "size": [0, 3, 3], "uv": [18, 22]},
 						{"origin": [0, 13.025, -1.47868], "size": [0, 3, 3], "pivot": [0, 14.525, 0.02132], "rotation": [0, -90, 0], "uv": [18, 18]}
 					]
 				},
@@ -1,5 +1,4 @@
 {
-  "itemGroup.cobblemon.pokeball": "Pokébälle",
  "item.cobblemon.poke_ball": "Pokéball",
  "item.cobblemon.slate_ball": "Schieferball",
  "item.cobblemon.azure_ball": "Azurball",
@@ -32,13 +31,13 @@
  "item.cobblemon.park_ball": "Parkball",
  "item.cobblemon.dream_ball": "Traumball",
  "item.cobblemon.beast_ball": "Ultraball",
-  "item.cobblemon.black_apricorn_seed": "Schwarzer Aprikoko Samen",
-  "item.cobblemon.blue_apricorn_seed": "Blauer Aprikoko Samen",
-  "item.cobblemon.green_apricorn_seed": "Grüner Aprikoko Samen",
-  "item.cobblemon.pink_apricorn_seed": "Pinker Aprikoko Samen",
-  "item.cobblemon.red_apricorn_seed": "Roter Aprikoko Samen",
-  "item.cobblemon.white_apricorn_seed": "Weißer Aprikoko Samen",
-  "item.cobblemon.yellow_apricorn_seed": "Gelber Aprikoko Samen",
+  "item.cobblemon.black_apricorn_seed": "Schwarzer Aprikoko Sämling",
+  "item.cobblemon.blue_apricorn_seed": "Blauer Aprikoko Sämling",
+  "item.cobblemon.green_apricorn_seed": "Grüner Aprikoko Sämling",
+  "item.cobblemon.pink_apricorn_seed": "Rosa Aprikoko Sämling",
+  "item.cobblemon.red_apricorn_seed": "Roter Aprikoko Sämling",
+  "item.cobblemon.white_apricorn_seed": "Weißer Aprikoko Sämling",
+  "item.cobblemon.yellow_apricorn_seed": "Gelber Aprikoko Sämling",
  "item.cobblemon.black_apricorn": "Schwarze Aprikoko",
  "item.cobblemon.blue_apricorn": "Blaue Aprikoko",
  "item.cobblemon.green_apricorn": "Grüne Aprikoko",
@@ -46,7 +45,8 @@
  "item.cobblemon.red_apricorn": "Rote Aprikoko",
  "item.cobblemon.white_apricorn": "Weiße Aprikoko",
  "item.cobblemon.yellow_apricorn": "Gelbe Aprikoko",
-  "itemGroup.cobblemon.evolution_item": "Entwicklungs Items",
+  "item.cobblemon.vivichoke_seeds": "Vitalknospensamen",
+  "item.cobblemon.vivichoke": "Vitalknospe",
  "item.cobblemon.link_cable": "Linkkabel",
  "item.cobblemon.dragon_scale": "Drachenhaut",
  "item.cobblemon.kings_rock": "Königsstein",
@@ -88,7 +88,6 @@
  "item.cobblemon.sun_stone": "Sonnenstein",
  "item.cobblemon.thunder_stone": "Donnerstein",
  "item.cobblemon.water_stone": "Wasserstein",
-  "itemGroup.cobblemon.medicine": "Medizin",
  "item.cobblemon.rare_candy": "Sonderbonbon",
  "item.cobblemon.exp_candy_xs": "EP-Bonbon XS",
  "item.cobblemon.exp_candy_s": "EP-Bonbon S",
@@ -101,10 +100,47 @@
  "item.cobblemon.iron": "Eisen",
  "item.cobblemon.protein": "Protein",
  "item.cobblemon.zinc": "Zink",
-  "itemGroup.cobblemon.held_item": "Getragene Items",
+  "item.cobblemon.potion": "Trank",
+  "item.cobblemon.super_potion": "Supertrank",
+  "item.cobblemon.hyper_potion": "Hypertrank",
+  "item.cobblemon.max_potion": "Top-Trank",
+  "item.cobblemon.full_restore": "Top-Genesung",
+  "item.cobblemon.red_mint_leaf": "Rotes Minzblatt",
+  "item.cobblemon.red_mint_leaf.tooltip": "Kann ein Pokémon's Angriff beeinflussen",
+  "item.cobblemon.blue_mint_leaf": "Blaues Minzblatt",
+  "item.cobblemon.blue_mint_leaf.tooltip": "Kann ein Pokémon's Verteidigung beeinflussen",
+  "item.cobblemon.cyan_mint_leaf": "Türkises Minzblatt",
+  "item.cobblemon.cyan_mint_leaf.tooltip": "Kann ein Pokémon's Spezial-Angriff beeinflussen",
+  "item.cobblemon.pink_mint_leaf": "Rosa Minzblatt",
+  "item.cobblemon.pink_mint_leaf.tooltip": "Kann ein Pokémon's Spezial-Verteidigung beeinflussen",
+  "item.cobblemon.green_mint_leaf": "Grünes Minzblatt",
+  "item.cobblemon.green_mint_leaf.tooltip": "Kann ein Pokémon's Initiative beeinflussen",
+  "item.cobblemon.white_mint_leaf": "Weißes Minzblatt",
+  "item.cobblemon.white_mint_leaf.tooltip": "Kann das Wesen eines Pokémon neutralisieren",
+  "item.cobblemon.lonely_mint": "Solo-Minze",
+  "item.cobblemon.adamant_mint": "Hart-Minze",
+  "item.cobblemon.naughty_mint": "Frech-Minze",
+  "item.cobblemon.brave_mint": "Mutig-Minze",
+  "item.cobblemon.bold_mint": "Kühn-Minze",
+  "item.cobblemon.impish_mint": "Pfiffig-Minze",
+  "item.cobblemon.lax_mint": "Lasch-Minze",
+  "item.cobblemon.relaxed_mint": "Locker-Minze",
+  "item.cobblemon.modest_mint": "Mäßig-Minze",
+  "item.cobblemon.mild_mint": "Mild-Minze",
+  "item.cobblemon.rash_mint": "Hitzig-Minze",
+  "item.cobblemon.quiet_mint": "Ruhig-Minze",
+  "item.cobblemon.calm_mint": "Still-Minze",
+  "item.cobblemon.gentle_mint": "Zart-Minze",
+  "item.cobblemon.careful_mint": "Sacht-Minze",
+  "item.cobblemon.sassy_mint": "Forsch-Minze",
+  "item.cobblemon.timid_mint": "Scheu-Minze",
+  "item.cobblemon.hasty_mint": "Hastig-Minze",
+  "item.cobblemon.jolly_mint": "Froh-Minze",
+  "item.cobblemon.naive_mint": "Naiv-Minze",
+  "item.cobblemon.serious_mint": "Ernst-Minze",
  "item.cobblemon.assault_vest": "Offensivweste",
  "item.cobblemon.auspicious_armor": "Glorienrüstung",
-  "item.cobblemon.big_root": "Großwurzel",
+  "item.cobblemon.malicious_armor": "Fluchrüstung",
  "item.cobblemon.black_belt": "Schwarzgurt",
  "item.cobblemon.black_glasses": "Schattenbrille",
  "item.cobblemon.black_sludge": "Giftschleim",
@@ -138,6 +174,21 @@
  "item.cobblemon.spell_tag": "Bannsticker",
  "item.cobblemon.twisted_spoon": "Krummlöffel",
  "item.cobblemon.wise_glasses": "Schlaubrille",
+  "item.cobblemon.mental_herb": "Mentalkraut",
+  "item.cobblemon.mirror_herb": "Kopierkraut",
+  "item.cobblemon.power_herb": "Energiekraut",
+  "item.cobblemon.white_herb": "Schlohkraut",
+  "item.cobblemon.bright_powder": "Blendpuder",
+  "item.cobblemon.metal_powder": "Metallstaub",
+  "item.cobblemon.quick_powder": "Flottstaub",
+  "item.cobblemon.destiny_knot": "Fatumknoten",
+  "item.cobblemon.everstone": "Ewigstein",
+  "item.cobblemon.power_anklet": "Machtkette",
+  "item.cobblemon.power_band": "Machtband",
+  "item.cobblemon.power_belt": "Machtgurt",
+  "item.cobblemon.power_bracer": "Machtreif",
+  "item.cobblemon.power_lens": "Machtlinse",
+  "item.cobblemon.power_weight": "Machtgewicht",
  "item.cobblemon.poke_ball.tooltip": "1× Fangquote",
  "item.cobblemon.slate_ball.tooltip": "1× Fangquote",
  "item.cobblemon.azure_ball.tooltip": "1× Fangquote",
@@ -170,6 +221,56 @@
  "item.cobblemon.park_ball.tooltip": "2.5x Effektivität in allen Wald- und Ebenenbiomen",
  "item.cobblemon.dream_ball.tooltip": "4x Effektivität bei schlafenden Pokémon",
  "item.cobblemon.beast_ball.tooltip": "5x Effektivität bei Ultrabestien, 0.1x Effektivität bei allen anderen Pokémon",
+  "item.cobblemon.mulch_base": "Mulch",
+  "item.cobblemon.coarse_mulch": "Raumulch",
+  "item.cobblemon.growth_mulch": "Wachsmulch",
+  "item.cobblemon.humid_mulch": "Feuchter Mulch",
+  "item.cobblemon.loamy_mulch": "Lehmmulch",
+  "item.cobblemon.peat_mulch": "Torfmulch",
+  "item.cobblemon.rich_mulch": "Sprießmulch",
+  "item.cobblemon.sandy_mulch": "Sandmulch",
+  "item.cobblemon.surprise_mulch": "Wundermulch",
+  "item.cobblemon.medicinal_leek": "Fitlauch",
+  "item.cobblemon.energy_root": "Kraftwurzel",
+  "item.cobblemon.revival_herb": "Vitalkraut",
+  "item.cobblemon.roasted_leek": "Gebratener Lauch",
+  "item.cobblemon.leek_and_potato_stew": "Lauch-Kartoffeleintopf",
+  "item.cobblemon.braised_vivichoke": "Geschmorte Vitalknospe",
+  "item.cobblemon.vivichoke_dip": "Vivichoke Dip",
+  "item.cobblemon.berry_juice": "Berry Juice",
+  "item.cobblemon.remedy": "Arznei",
+  "item.cobblemon.fine_remedy": "Superarznei",
+  "item.cobblemon.superb_remedy": "Hyperarznei",
+  "item.cobblemon.heal_powder": "Heilpuder",
+  "item.cobblemon.medicinal_brew": "Medizinisches Gebräu",
+  "item.cobblemon.revive": "Beleber",
+  "item.cobblemon.max_revive": "Top-Beleber",
+  "item.cobblemon.pp_up": "AP-Plus",
+  "item.cobblemon.pp_max": "AP-Top",
+  "item.cobblemon.x_attack": "X-Angriff",
+  "item.cobblemon.x_defence": "X-Verteidigung",
+  "item.cobblemon.x_accuracy": "X-Genauigkeit",
+  "item.cobblemon.x_speed": "X-Initiative",
+  "item.cobblemon.x_special_defence": "X-Sp.-Vert.",
+  "item.cobblemon.x_special_attack": "X-Sp.-Ang.",
+  "item.cobblemon.dire_hit": "Treffervitamine",
+  "item.cobblemon.guard_spec": "Megablock",
+  "item.cobblemon.full_heal": "Hyperheiler",
+  "item.cobblemon.antidote": "Gegengift",
+  "item.cobblemon.awakening": "Aufwecker",
+  "item.cobblemon.burn_heal": "Feuerheiler",
+  "item.cobblemon.ice_heal": "Eisheiler",
+  "item.cobblemon.paralyze_heal": "Para-Heiler",
+  "item.cobblemon.ether": "Äther",
+  "item.cobblemon.max_ether": "Top-Äther",
+  "item.cobblemon.elixir": "Elixier",
+  "item.cobblemon.max_elixir": "Top-Elixier",
+  "itemGroup.cobblemon.blocks": "Blöcke",
+  "itemGroup.cobblemon.pokeball": "Pokébälle",
+  "itemGroup.cobblemon.agriculture": "Agrikultur",
+  "itemGroup.cobblemon.consumables": "Verwendbare Items",
+  "itemGroup.cobblemon.held_item": "Getragene Items",
+  "itemGroup.cobblemon.evolution_item": "Entwicklungs Items",
  "block.cobblemon.apricorn_log": "Aprikoko Stamm",
  "block.cobblemon.stripped_apricorn_log": "Entrindeter Aprikoko Stamm",
  "block.cobblemon.apricorn_wood": "Aprikoko Holz",
@@ -183,6 +284,7 @@
  "block.cobblemon.apricorn_button": "Aprikokoknopf",
  "block.cobblemon.apricorn_slab": "Aprikoko Stufe",
  "block.cobblemon.apricorn_fence_gate": "Aprikoko Zauntor",
+  "block.cobblemon.big_root": "Großwurzel",
  "block.cobblemon.black_apricorn_sapling": "Schwarzer Aprikoko Setzling",
  "block.cobblemon.blue_apricorn_sapling": "Blauer Aprikoko Setzling",
  "block.cobblemon.green_apricorn_sapling": "Grüner Aprikoko Setzling",
@@ -196,12 +298,24 @@
  "block.cobblemon.healing_machine.tooltip1": "Muss sich nach dem Platzieren aufladen.",
  "block.cobblemon.healing_machine.tooltip2": "Lädt sich über Zeit auf.",
  "block.cobblemon.pc": "PC",
+  "block.cobblemon.red_mint": "Rote Minzesamen",
+  "block.cobblemon.blue_mint": "Blaue Minzesamen",
+  "block.cobblemon.cyan_mint": "Cyan Minzesamen",
+  "block.cobblemon.pink_mint": "Rosa Minzesamen",
+  "block.cobblemon.green_mint": "Grüne Minzesamen",
+  "block.cobblemon.white_mint": "Weiße Minzesamen",
+  "block.cobblemon.vivichoke_seeds": "Vitalknospensamen",
+  "block.cobblemon.pep_up_flower": "Ätherkraut",
+  "block.cobblemon.potted_pep_up_flower": "Potted Pep-Up Flower",
  "cobblemon.overflow_no_pc": "Deine Party war voll und du hast keinen PC!",
  "cobblemon.overflow_no_space": "Deine und %1$s Party war voll!",
  "cobblemon.overflow_to_pc": "Deine Party war voll! %1$s wurde zu %2$s hinzugefügt.",
  "cobblemon.your_pc": "Dein PC",
-  "cobblemon.command.pokespawn.invalid-pokemon": "Ungültiger Pokémon Name.",
+  "cobblemon.command.pokespawn.invalid-pokemon": "Ungültiger Pokémon Name",
  "cobblemon.command.pokespawn.invalid-move": "Ungültige Attacke",
+  "cobblemon.command.clearparty.nonethere": "Es sind keine Pokémon in %1$s's Party.",
+  "cobblemon.command.clearparty.cleared": "%1$s's Party wurde gelöscht.",
+  "cobblemon.command.clearpc.cleared": "%1$s's PC wurde gelöscht.",
  "cobblemon.ui.generic.yes": "Ja",
  "cobblemon.ui.generic.no": "Nein",
  "cobblemon.ui.pokenav.title": "PokéNavi",
@@ -211,6 +325,8 @@
  "cobblemon.ui.starter.alreadyselected": "Du hast bereits einen Starter ausgewählt!!",
  "cobblemon.ui.starter.cannotchoose": "Du kannst aktuell keinen Starter auswählen.",
  "cobblemon.ui.starter.hasalreadychosen": "%1$s hat bereits einen Starter ausgewählt.",
+  "cobblemon.ui.starter.choose_starter_title": "Wähle deinen Starter!",
+  "cobblemon.ui.starter.choose_starter_description": "Drücke die \"%1$s\" Taste",
  "cobblemon.ui.starter.chooseyourstarter": "Drücke %1$s um ein Pokémon auszuwählen und deine Reise zu beginnen!",
  "cobblemon.ui.moves": "Attacken",
  "cobblemon.ui.moves.switch": "Attacke wechseln",
@@ -237,6 +353,12 @@
  "cobblemon.ui.info.ability": "Fähigkeit",
  "cobblemon.ui.info.experience_points": "EP",
  "cobblemon.ui.info.to_next_level": "Bis zum nächsten Lvl.",
+  "cobblemon.ui.trade": "Tausch",
+  "cobblemon.trade.occupied": "%1$s ist beschäftigt.",
+  "cobblemon.trade.request_expired": "Die Anfrage zum Handeln mit %1$s ist abgelaufen.",
+  "cobblemon.trade.request_already_expired": "Ihr Tauschangebot war bereits abgelaufen.",
+  "cobblemon.trade.request_sent": "Tauschangebot an %1$s gesendet",
+  "cobblemon.trade.offer": "%1$s will mit dir Pokémon tauschen.",
  "cobblemon.ui.party": "Team",
  "cobblemon.ui.power": "Stärke",
  "cobblemon.ui.accuracy": "Genauigkeit",
@@ -245,6 +367,10 @@
  "cobblemon.ui.exit": "Verlassen",
  "cobblemon.ui.pc.box.title": "Box %1$s",
  "cobblemon.ui.pc.release": "Version",
+  "cobblemon.ui.pasture": "Weide",
+  "cobblemon.ui.pasture.recall_all": "Alle Zurückrufen",
+  "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)",
+  "cobblemon.pasture.too_many_nearby": "Es befinden sich zu viele Pokémon in der Nähe.",
  "key.cobblemon.upshiftparty": "Party Auswahl nach oben",
  "key.cobblemon.downshiftparty": "Party Auswahl nach unten",
  "key.cobblemon.hideparty": "Party verstecken",
@@ -291,9 +417,150 @@
  "cobblemon.label.lv": "Lvl. %1$s",
  "cobblemon.challenge_label": "Drücke %1$s um zu kämpfen.",
  "cobblemon.challenge.sender": "Du hast %1$s zu einem Kampf herausgefordert!",
-  "cobblemon.challenge.receiver": "%1$s hat dich zu einem Kampf herausgefordert! Drück %2$s während du deinen Gegner anschaust um zu kämpfen.",
+  "cobblemon.challenge.receiver": "%1$s hat dich zum Kampf herausgefordert!",
  "cobblemon.drop.item.inventory": "Du erhältst %2$s (%1$sx).",
  "cobblemon.drop.item.full": "Dein Inventar war voll, %1$s wurde fallen gelassen.",
+  "cobblemon.mint.interact": "%1$s's Statuswerte haben sich geändert!",
+  "cobblemon.mint.same_nature": "%1$s's stats seem unaffected by the %2$s.",
+  "itemGroup.cobblemon.plants": "Pflanzen",
+  "item.cobblemon.aguav_berry": "Gauvebeere",
+  "item.cobblemon.aguav_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -SpD Nature",
+  "item.cobblemon.apicot_berry": "Apikobeere",
+  "item.cobblemon.apicot_berry.tooltip": "Raises holder's Sp. Def by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.aspear_berry": "Wilbirbeere",
+  "item.cobblemon.aspear_berry.tooltip": "Holder is cured if it is frozen",
+  "item.cobblemon.babiri_berry": "Babiribeere",
+  "item.cobblemon.babiri_berry.tooltip": "Halves damage taken from a supereffective Steel-type attack",
+  "item.cobblemon.belue_berry": "Myrtilbeere",
+  "item.cobblemon.belue_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.bluk_berry": "Morbbeere",
+  "item.cobblemon.bluk_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.charti_berry": "Chiaribeere",
+  "item.cobblemon.charti_berry.tooltip": "Halves damage taken from a supereffective Rock-type attack",
+  "item.cobblemon.cheri_berry": "Amrenabeere",
+  "item.cobblemon.cheri_berry.tooltip": "Holder cures itself if it is paralyzed",
+  "item.cobblemon.chesto_berry": "Maronbeere",
+  "item.cobblemon.chesto_berry.tooltip": "Holder wakes up if it is asleep",
+  "item.cobblemon.chilan_berry": "Latchibeere",
+  "item.cobblemon.chilan_berry.tooltip": "Halves damage taken from a Normal-type attack",
+  "item.cobblemon.chople_berry": "Rospelbeere",
+  "item.cobblemon.chople_berry.tooltip": "Als getragenes Item schwächt diese Beere sehr effektive gegnerische Attacken vom Typ Kampf.",
+  "item.cobblemon.coba_berry": "Kobabeere",
+  "item.cobblemon.coba_berry.tooltip": "Als getragenes Item schwächt diese Beere sehr effektive gegnerische Attacken vom Typ Flug.",
+  "item.cobblemon.colbur_berry": "Burleobeere",
+  "item.cobblemon.colbur_berry.tooltip": "Als getragenes Item schwächt diese Beere sehr effektive gegnerische Attacken vom Typ Unlicht.",
+  "item.cobblemon.cornn_berry": "Saimbeere",
+  "item.cobblemon.cornn_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.custap_berry": "Eipfelbeere",
+  "item.cobblemon.custap_berry.tooltip": "Holder moves first in its priority bracket when at 1/4 max HP or less",
+  "item.cobblemon.durin_berry": "Durinbeere",
+  "item.cobblemon.durin_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.enigma_berry": "Enigmabeere",
+  "item.cobblemon.enigma_berry.tooltip": "Als getragenes Item füllt diese Beere 1/4 KP eines Pokémon auf, wenn es von sehr effektiven Attacken getroffen wird.",
+  "item.cobblemon.figy_berry": "Giefebeere",
+  "item.cobblemon.figy_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -Atk Nature",
+  "item.cobblemon.ganlon_berry": "Linganbeere",
+  "item.cobblemon.ganlon_berry.tooltip": "Raises holder's Defense by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.grepa_berry": "Labrusbeere",
+  "item.cobblemon.grepa_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.haban_berry": "Terirobeere",
+  "item.cobblemon.haban_berry.tooltip": "Halves damage taken from a supereffective Dragon-type attack",
+  "item.cobblemon.hondew_berry": "Honmelbeere",
+  "item.cobblemon.hondew_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.hopo_berry": "Pfohbeere",
+  "item.cobblemon.hopo_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.iapapa_berry": "Yapabeere",
+  "item.cobblemon.iapapa_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -Def Nature",
+  "item.cobblemon.jaboca_berry": "Jabocabeere",
+  "item.cobblemon.jaboca_berry.tooltip": "If holder is hit by a physical move, attacker loses 1/8 of its max HP",
+  "item.cobblemon.kasib_berry": "Zitarzbeere",
+  "item.cobblemon.kasib_berry.tooltip": "Halves damage taken from a supereffective Ghost-type attack",
+  "item.cobblemon.kebia_berry": "Grarzbeere",
+  "item.cobblemon.kebia_berry.tooltip": "Halves damage taken from a supereffective Poison-type attack",
+  "item.cobblemon.kee_berry": "Akibeere",
+  "item.cobblemon.kee_berry.tooltip": "Raises holder's Defense by 1 stage after it is hit by a physical attack",
+  "item.cobblemon.kelpsy_berry": "Setangbeere",
+  "item.cobblemon.kelpsy_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.lansat_berry": "Lansatbeere",
+  "item.cobblemon.lansat_berry.tooltip": "Holder gains the Focus Energy effect when at 1/4 max HP or less",
+  "item.cobblemon.leppa_berry": "Jonagobeere",
+  "item.cobblemon.leppa_berry.tooltip": "Restores 10 PP to the first of the holder's moves to reach 0 PP",
+  "item.cobblemon.liechi_berry": "Lydzibeere",
+  "item.cobblemon.liechi_berry.tooltip": "Raises holder's Attack by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.lum_berry": "Prunusbeere",
+  "item.cobblemon.lum_berry.tooltip": "Holder cures itself if it has a non-volatile status or is confused",
+  "item.cobblemon.mago_berry": "Magobeere",
+  "item.cobblemon.mago_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -Spe Nature",
+  "item.cobblemon.magost_berry": "Magostbeere",
+  "item.cobblemon.magost_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.maranga_berry": "Tarabeere",
+  "item.cobblemon.maranga_berry.tooltip": "Raises holder's Sp. Def by 1 stage after it is hit by a special attack",
+  "item.cobblemon.micle_berry": "Wunfrubeere",
+  "item.cobblemon.micle_berry.tooltip": "Holder's next move has 1.2x accuracy when at 1/4 max HP or less",
+  "item.cobblemon.nanab_berry": "Nanabbeere",
+  "item.cobblemon.nanab_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.touga_berry": "Tougabeere",
+  "item.cobblemon.touga_berry.tooltip": "Holder is cured if it is confused",
+  "item.cobblemon.nomel_berry": "Tronzibeere",
+  "item.cobblemon.nomel_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.occa_berry": "Koakobeere",
+  "item.cobblemon.occa_berry.tooltip": "Halves damage taken from a supereffective Fire-type attack",
+  "item.cobblemon.oran_berry": "Sinelbeere",
+  "item.cobblemon.oran_berry.tooltip": "Restores 10 HP when at 1/2 max HP or less",
+  "item.cobblemon.pamtre_berry": "Pallmbeere",
+  "item.cobblemon.pamtre_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.passho_berry": "Foepasbeere",
+  "item.cobblemon.passho_berry.tooltip": "Halves damage taken from a supereffective Water-type attack",
+  "item.cobblemon.payapa_berry": "Pyapabeere",
+  "item.cobblemon.payapa_berry.tooltip": "Halves damage taken from a supereffective Psychic-type attack",
+  "item.cobblemon.pecha_berry": "Pirsifbeere",
+  "item.cobblemon.pecha_berry.tooltip": "Holder is cured if it is poisoned",
+  "item.cobblemon.persim_berry": "Persimbeere",
+  "item.cobblemon.persim_berry.tooltip": "Holder is cured if it is confused",
+  "item.cobblemon.petaya_berry": "Tahaybeere",
+  "item.cobblemon.petaya_berry.tooltip": "Raises holder's Sp. Atk by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.pinap_berry": "Sananabeere",
+  "item.cobblemon.pinap_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.pomeg_berry": "Granabeere",
+  "item.cobblemon.pomeg_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.qualot_berry": "Qualotbeere",
+  "item.cobblemon.qualot_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.rabuta_berry": "Rabutabeere",
+  "item.cobblemon.rabuta_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.rawst_berry": "Fragiabeere",
+  "item.cobblemon.rawst_berry.tooltip": "Holder is cured if it is burned",
+  "item.cobblemon.razz_berry": "Himmihbeere",
+  "item.cobblemon.razz_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.rindo_berry": "Grindobeere",
+  "item.cobblemon.rindo_berry.tooltip": "Halves damage taken from a supereffective Grass-type attack",
+  "item.cobblemon.roseli_berry": "Hibisbeere",
+  "item.cobblemon.roseli_berry.tooltip": "Halves damage taken from a supereffective Fairy-type attack",
+  "item.cobblemon.rowap_berry": "Roselbeere",
+  "item.cobblemon.rowap_berry.tooltip": "If holder is hit by a special move, attacker loses 1/8 of its max HP",
+  "item.cobblemon.salac_berry": "Salkabeere",
+  "item.cobblemon.salac_berry.tooltip": "Raises holder's Speed by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.shuca_berry": "Schukebeere",
+  "item.cobblemon.shuca_berry.tooltip": "Halves damage taken from a supereffective Ground-type attack",
+  "item.cobblemon.sitrus_berry": "Tsitrubeere",
+  "item.cobblemon.sitrus_berry.tooltip": "Restores 1/4 max HP when at 1/2 max HP or less",
+  "item.cobblemon.spelon_berry": "Kiwanbeere",
+  "item.cobblemon.spelon_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.starf_berry": "Krambobeere",
+  "item.cobblemon.starf_berry.tooltip": "Raises a random stat by 2 when at 1/4 max HP or less",
+  "item.cobblemon.tamato_berry": "Tamotbeere",
+  "item.cobblemon.tamato_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.tanga_berry": "Tanigabeere",
+  "item.cobblemon.tanga_berry.tooltip": "Halves damage taken from a supereffective Bug-type attack",
+  "item.cobblemon.wacan_berry": "Kerzalbeere",
+  "item.cobblemon.wacan_berry.tooltip": "Halves damage taken from a supereffective Electric-type attack",
+  "item.cobblemon.watmel_berry": "Wasmelbeere",
+  "item.cobblemon.watmel_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.wepear_berry": "Nirbebeere",
+  "item.cobblemon.wepear_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.wiki_berry": "Wikibeere",
+  "item.cobblemon.wiki_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -SpA Nature",
+  "item.cobblemon.yache_berry": "Kiroyabeere",
+  "item.cobblemon.yache_berry.tooltip": "Als getragenes Item schwächt diese Beere sehr effektive gegnerische Attacken vom Typ Eis.",
  "cobblemon.command.general.invalid-party-slot": "In Slot %1$s befindet sich kein Pokémon!",
  "cobblemon.command.givepokemon.give": "%1$s wurde zu %2$s gegeben.",
  "cobblemon.command.pokemonedit": "%2$s' %1$s editiert.",
@@ -305,10 +572,19 @@
  "cobblemon.command.spawnpokemon.nospecies": "Fehler: Du musst entweder ein Pokémon oder 'random' angeben",
  "cobblemon.command.held_item": "%1$s' %2$s wurde das Item %3$s zum Tragen gegeben.",
  "cobblemon.command.pokeheal.in_battle": "Du kannst dein Team nicht heilen während du dich in einem Kampf befindest!",
+  "cobblemon.command.spawnpokemonfrompool": "Ein %1$s ist in der Nähe gespawnt.",
+  "cobblemon.command.spawnpokemonfrompool.unable_to_spawn": "Ein Pokémon konnte nicht gespawnt werden.",
+  "cobblemon.command.pokebox.box_does_not_exist": "Dieser Spieler hat keine Box %1$s.",
+  "cobblemon.command.pokebox.box_is_full": "Box %1$s dieses Spielers ist voll.",
+  "cobblemon.command.pokebox.storage_is_full": "Der Speicher dieses Spielers ist voll.",
+  "cobblemon.command.pokebox.last_pokemon": "Der letzte Pokémon dieses Spielers wurde nicht an den PC geschickt.",
+  "cobblemon.command.pokemonrestart": "%1$s's Party und PC wurden gelöscht.",
  "advancements.cobblemon.root": "Die Welt von Cobblemon!",
-  "advancements.cobblemon.obtain_leftovers": "Reduce, Reuse, Recycle!",
-  "advancements.cobblemon.obtain_leftovers.description": "Keep the leftovers after eating an apple.",
  "advancements.cobblemon.root.description": "Wähle ein Starterpokémon und beginne ein neues Abenteuer",
+  "advancements.cobblemon.obtain_leftovers": "Reduzieren, Wiederverwenden, Recyceln!",
+  "advancements.cobblemon.obtain_leftovers.description": "Behalte die Überreste nach dem Essen eines Apfels.",
+  "advancements.cobblemon.any_plant": "Mutter Natur's Geschenk",
+  "advancements.cobblemon.any_plant.description": "Hoffentlich hast du einen grünen Daumen!",
  "advancements.cobblemon.harvest_apricorn": "Ist es eine Frucht oder eine Nuss?",
  "advancements.cobblemon.harvest_apricorn.description": "Rechtsklick, um eine ausgewachsene Aprikoko zu ernten",
  "advancements.cobblemon.harvest_apricorn_seed": "Meinen Teil machen",
@@ -328,7 +604,7 @@
  "advancements.cobblemon.first_catch": "Ein neuer Freund!",
  "advancements.cobblemon.first_catch.description": "Benutze einen Pokéball und fange dein erstes Pokémon",
  "advancements.cobblemon.full_party": "Volles Haus",
-  "advancements.cobblemon.full_party.description": "Fange 5 weitere Pokémon und bekomme ein volles Team",
+  "advancements.cobblemon.full_party.description": "Catch more Pokémon and make a full party of 6",
  "advancements.cobblemon.first_evolution": "Harte Arbeit und Hingabe",
  "advancements.cobblemon.first_evolution.description": "Erreiche die Entwicklungsanforderungen eines Pokémon und entwickle es über das Teammenü",
  "advancements.cobblemon.first_battle_victory": "Wo ist meine Siegeshymne?",
@@ -337,6 +613,55 @@
  "advancements.cobblemon.first_shiny_catch.description": "Fange dein erstes schillerndes Pokémon",
  "advancements.cobblemon.healing_machine": "Heilkraft",
  "advancements.cobblemon.healing_machine.description": "Warte bis die Heilmaschine aufgeladen ist und heile dann dein Team",
+  "advancements.cobblemon.obtain_leek": "There's a Leek in the Boat!",
+  "advancements.cobblemon.obtain_leek.description": "Obtain a Medicinal Leek, a wild crop that grows in freshwater",
+  "advancements.cobblemon.medicinal_brew": "Lokale Apotheke",
+  "advancements.cobblemon.medicinal_brew.description": "Brew a Medicinal Leek to create the basis for your healing needs",
+  "advancements.cobblemon.brew_potion": "You cannot handle my Potions",
+  "advancements.cobblemon.brew_potion.description": "Brew an Oran Berry into Medicinal Brew to create a Potion",
+  "advancements.cobblemon.brew_full_restore": "Champion's Choice",
+  "advancements.cobblemon.brew_full_restore.description": "Follow the brewing tree and create a Full Restore with a Lum Berry and Max Potion",
+  "advancements.cobblemon.brew_all": "Double Double Toil & Trouble",
+  "advancements.cobblemon.brew_all.description": "Brew every possible item using Medicinal Brew",
+  "advancements.cobblemon.obtain_mint": "Minty Fresh",
+  "advancements.cobblemon.obtain_mint.description": "Obtain a Nature Mint, a wild crop that grows high in the mountains",
+  "advancements.cobblemon.obtain_all_mints": "A Big Commit-mint",
+  "advancements.cobblemon.obtain_all_mints.description": "Obtain all 6 colors of Nature Mint and gain access to a full array of natures",
+  "advancements.cobblemon.obtain_revival_herb": "Herb your Enthusiasm",
+  "advancements.cobblemon.obtain_revival_herb.description": "Obtain a Revival Herb, a wild crop that grows in lush caves",
+  "advancements.cobblemon.use_revive": "Live to fight another day!",
+  "advancements.cobblemon.use_revive.description": "Use a Revive, Max Revive, or Revival Herb to revive a fainted Pokémon",
+  "advancements.cobblemon.obtain_big_root": "The Root of Basic Healing",
+  "advancements.cobblemon.obtain_big_root.description": "Obtain a Big Root, a wild crop that grows in dirt caves close to the surface",
+  "advancements.cobblemon.craft_remedy": "Basic Healing",
+  "advancements.cobblemon.craft_remedy.description": "Craft a Remedy, an early-game healing item that can be crafted into stronger forms",
+  "advancements.cobblemon.obtain_vivichoke": "Oki-Doki Vivichokey",
+  "advancements.cobblemon.obtain_vivichoke.description": "Obtain a Vivichoke, grown from strangely scarce Vivichoke Seeds",
+  "advancements.cobblemon.obtain_berry": "Very Berry",
+  "advancements.cobblemon.obtain_berry.description": "Obtain any Berry, wild crops that grow on the surface and have many uses",
+  "advancements.cobblemon.obtain_mutated_berry": "An Unexpected Result",
+  "advancements.cobblemon.obtain_mutated_berry.description": "Plant Berry Trees of different types next to each other and witness Mutation in action",
+  "advancements.cobblemon.obtain_all_berries": "Oops, all Berries!",
+  "advancements.cobblemon.obtain_all_berries.description": "Obtain one of every Berry in Cobblemon",
+  "advancements.cobblemon.use_pasture": "Free Roam: Enabled",
+  "advancements.cobblemon.use_pasture.description": "Craft a Pasture Block and allow your friends to wander",
+  "advancements.cobblemon.catch_all_vivillon": "Gemusterte Flügel",
+  "advancements.cobblemon.catch_all_vivillon.description": "Obtain all patterns of Vivillon",
+  "advancements.cobblemon.evolve_veevees": "Valued Veevees",
+  "advancements.cobblemon.evolve_veevees.description": "Evolve Eevee into 8 different forms",
+  "advancements.cobblemon.evolve_shedinja": "Ghost in the Shell",
+  "advancements.cobblemon.evolve_shedinja.description": "Have an extra Poké Ball in your inventory and obtain a Shedinja",
+  "advancements.cobblemon.trade_pokemon": "Take Good Care!",
+  "advancements.cobblemon.trade_pokemon.description": "Trade a Pokémon with another Trainer",
+  "advancements.cobblemon.trade_shelmet_karrablast": "I'd like to report a theft!",
+  "advancements.cobblemon.trade_shelmet_karrablast.description": "Trade a Shelmet and Karrablast",
+  "advancements.cobblemon.max_level_baby": "Darwin? Kenn ich nicht.",
+  "advancements.cobblemon.max_level_baby.description": "Take a first-stage Pokémon capable of evolution up to level 100",
+  "advancements.cobblemon.use_candy": "Süßer Zahn",
+  "advancements.cobblemon.use_candy.description": "Verwende ein beliebiges EP-Bonbon auf einem Pokémon",
+  "advancements.cobblemon.own_zangoose_seviper": "Freunde widerwillen",
+  "advancements.cobblemon.own_zangoose_seviper.description": "Habe gleichzeitig einen Zangoose und Seviper in deiner Party",
+  "cobblemon.battle.crash": "Ein Kampffehler ist aufgetreten. Wenn du Einzelspieler spielst, melde dies dem Mod-Team. Ansonsten, melde dies dem Serveradministrator.",
  "cobblemon.battle.damage_dealt": "%1$s hat %2$s Schaden genommen!",
  "cobblemon.battle.used_move": "%1$s hat %2$s benutzt!",
  "cobblemon.battle.used_move_on": "%1$s hat %2$s auf %3$s benutzt!",
@@ -356,14 +681,19 @@
  "cobblemon.battle.crit": "Ein Volltreffer!",
  "cobblemon.battle.nothing": "Nichts geschieht!",
  "cobblemon.battle.clearallboost": "Werteveränderungen wurden zurückgesetzt.",
+  "cobblemon.battle.clearallnegativeboost": "%1$s's negative stat changes were removed!",
+  "cobblemon.battle.clearallnegativeboost.zeffect": "Z-Kraft von %1$s stellt seine Statuswerte wieder her!",
  "cobblemon.battle.unboost.slight": "%1$s's %2$s ist gesunken.",
  "cobblemon.battle.unboost.sharp": "%1$s's %2$s ist stark gesunken.",
  "cobblemon.battle.unboost.severe": "%1$s's %2$s ist drastisch gesunken.",
  "cobblemon.battle.unboost.cap.single": "%1$s's %2$s kann nicht weiter sinken.",
  "cobblemon.battle.unboost.cap.multiple": "%1$s's Werte können nicht weiter sinken.",
  "cobblemon.battle.boost.slight": "%1$s's %2$s ist gestiegen.",
+  "cobblemon.battle.boost.slight.zeffect": "%2$s von %1$s wurde durch Z-Kraft erhöht!",
  "cobblemon.battle.boost.sharp": "%1$s's %2$s ist stark gestiegen.",
+  "cobblemon.battle.boost.sharp.zeffect": "%2$s von %1$s wurde durch Z-Kraft stark erhöht!",
  "cobblemon.battle.boost.severe": "%1$s's %2$s ist drastisch gestiegen.",
+  "cobblemon.battle.boost.severe.zeffect": "%2$s von %1$s wurde durch Z-Kraft drastisch erhöht!",
  "cobblemon.battle.boost.cap.single": "%1$s's %2$s kann nicht weiter steigen.",
  "cobblemon.battle.boost.cap.multiple": "%1$s's Werte können nicht weiter steigen.",
  "cobblemon.battle.setboost.bellydrum": "%1$s halbiert seine KP und maximiert seinen Angriff!",
@@ -381,162 +711,247 @@
  "cobblemon.capture.not_single": "Du kannst wilde Pokémon nur in einem 1v1 Kampf fangen.",
  "cobblemon.you_in_battle": "Du kannst das während eines Kampfes nicht tun!",
  "cobblemon.battle.turn": "Es ist jetzt Runde %1$s",
-  "cobblemon.battle.rain_dance": "Es fängt an zu regnen!",
-  "cobblemon.battle.rain_dance_upkeep": "Es regnet weiterhin.",
-  "cobblemon.battle.sandstorm": "Ein Sandsturm kommt auf!",
-  "cobblemon.battle.sandstorm_buffeted": "Der Sandsturm fügt %1$s Schaden zu.",
-  "cobblemon.battle.sandstorm_upkeep": "Der Sandsturm wütet.",
-  "cobblemon.battle.sunny_day": "Das Sonnenlicht wird stärker!",
-  "cobblemon.battle.sunny_day_upkeep": "Das Sonnenlicht ist stark.",
-  "cobblemon.battle.hail": "Es fängt an zu hageln!",
-  "cobblemon.battle.hail_upkeep": "Es hagelt weiter.",
-  "cobblemon.battle.hail_buffeted": "%1$s wurde vom Hagel Schaden zugefügt.",
-  "cobblemon.battle.no_weather": "Das Wetter normalisiert sich.",
-  "cobblemon.battle.confusion_start": "%1$s ist verwirrt!",
-  "cobblemon.battle.confusion_activate": "Es hat sich vor Verwirrung selbst verletzt!",
-  "cobblemon.battle.confusion_snapped": "%1$s ist nicht mehr verwirrt!",
-  "cobblemon.battle.protect_start": "%1$s schützt sich selbst!",
-  "cobblemon.battle.protect_activate": "%1$s schützt sich selbst!",
-  "cobblemon.battle.magnitude_level": "Intensität %1$s!",
-  "cobblemon.battle.bide_start": "%1$s speichert Energie!",
-  "cobblemon.battle.bide_activate": "%1$s speichert weiter Energie!",
-  "cobblemon.battle.bide_end": "%1$s setzt Energie frei!",
-  "cobblemon.battle.field_start.electric_terrain": "Elektrische Energie fließt durch den Boden!",
-  "cobblemon.battle.field_start.grassy_terrain": "Dichtes Gras schießt aus dem Boden!",
-  "cobblemon.battle.field_start.gravity": "Die Erdanziehung wurde verstärkt!",
-  "cobblemon.battle.field_start.magic_room": "Es entsteht ein Raum, in dem getragene Items ihre Wirkung verlieren!",
-  "cobblemon.battle.field_start.misty_terrain": "Am Boden breitet sich dichter Nebel aus!",
-  "cobblemon.battle.field_start.mud_sport": "Die Stärke aller Elektroattacken wurde geschwächt!",
-  "cobblemon.battle.field_start.psychic_terrain": "Der Boden fühlt sich seltsam an!",
-  "cobblemon.battle.field_start.trick_room": "%1$s hat die Dimensionen verdreht!",
-  "cobblemon.battle.field_start.water_sport": "Die Stärke aller Feuerattacken wurde geschwächt!",
-  "cobblemon.battle.field_start.wonder_room": "Es entsteht ein Raum, in dem Verteidigung und Spezial-Verteidigung miteinander vertauscht sind!",
-  "cobblemon.battle.field_end.electric_terrain": "Die Elektrizität ist aus dem Boden verschwunden.",
-  "cobblemon.battle.field_end.grassy_terrain": "Das dichte Gras ist vom Boden verschwunden.",
-  "cobblemon.battle.field_end.gravity": "Die Erdanziehung hat sich wieder normalisiert!",
-  "cobblemon.battle.field_end.magic_room": "Der Magieraum ist verschwunden und getragene Items funktionieren wieder!",
-  "cobblemon.battle.field_end.misty_terrain": "Der Nebel ist vom Boden verschwunden.",
-  "cobblemon.battle.field_end.mud_sport": "Die Effekte von Lehmsuhler sind verschwunden.",
-  "cobblemon.battle.field_end.psychic_terrain": "Der Boden fühlt sich nicht mehr seltsam an!",
-  "cobblemon.battle.field_end.trick_room": "Die Dimensionen sind nicht länger verdreht!",
-  "cobblemon.battle.field_end.water_sport": "Die Effekte von Nassmacher sind verschwunden.",
-  "cobblemon.battle.field_end.wonder_room": "Der Wunderraum ist verschwunden und die Verteidigungs- sowie Spezial-Verteidigungswerte sind wieder normal!",
-  "cobblemon.battle.cant.generic_block": "%1$s kann %2$s nicht benutzen!",
+  "cobblemon.battle.side_subject.ally": "dein",
+  "cobblemon.battle.side_subject.opponent": "der feindlicher",
+  "cobblemon.battle.weather.raindance.start": "Es fängt an zu regnen!",
+  "cobblemon.battle.weather.raindance.upkeep": "Der strömende Regen lässt nicht nach!",
+  "cobblemon.battle.weather.raindance.end": "Der Regen lässt nach!",
+  "cobblemon.battle.weather.sandstorm.start": "Ein Sandsturm kommt auf!",
+  "cobblemon.battle.weather.sandstorm.upkeep": "Der Sandsturm tobt!",
+  "cobblemon.battle.weather.sandstorm.end": "Der Sandsturm legt sich!",
+  "cobblemon.battle.weather.sunnyday.start": "Das Sonnenlicht wird stärker!",
+  "cobblemon.battle.weather.sunnyday.upkeep": "Das starke Sonnenlicht lässt nicht nach!",
+  "cobblemon.battle.weather.sunnyday.end": "Das Sonnenlicht verliert wieder an Intensität!",
+  "cobblemon.battle.weather.hail.start": "Es fängt an zu hageln!",
+  "cobblemon.battle.weather.hail.upkeep": "Der Hagelsturm tobt!",
+  "cobblemon.battle.weather.hail.end": "Es hat aufgehört zu hageln!",
+  "cobblemon.battle.start.bide": "%1$s speichert Energie!",
+  "cobblemon.battle.start.yawn": "%1$s wurde schläfrig gemacht!",
+  "cobblemon.battle.start.perish": "Abgesang von %1$s steht bei %2$s!",
+  "cobblemon.battle.start.leechseed": "%1$s wurde bepflanzt!",
+  "cobblemon.battle.start.aquaring": "%1$s umgibt sich mit einem Wasserring!",
+  "cobblemon.battle.start.charge": "%1$s lädt sich auf!",
+  "cobblemon.battle.start.taunt": "%1$s fällt auf Verhöhner herein!",
+  "cobblemon.battle.start.autotomize": "Initiative von %1$s steigt stark!",
+  "cobblemon.battle.start.attract": "%1$s hat sich verliebt!",
+  "cobblemon.battle.start.focusenergy": "%1$s pumpt sich auf!",
+  "cobblemon.battle.start.uproar": "%1$s verursacht Aufruhr!",
+  "cobblemon.battle.start.curse": "%1$s nimmt einen Teil seiner KP und legt einen Fluch auf %2$s!",
+  "cobblemon.battle.start.miracleeye": "%1$s wurde erkannt!",
+  "cobblemon.battle.start.dynamax": "%1$s Dynamaxed!",
+  "cobblemon.battle.start.gmax": "%1$s Gigantamaxed!",
+  "cobblemon.battle.fieldstart.electricterrain": "Elektrische Energie fließt durch den Boden!",
+  "cobblemon.battle.fieldstart.grassyterrain": "Dichtes Gras schießt aus dem Boden!",
+  "cobblemon.battle.fieldstart.gravity": "Die Erdanziehung wurde verstärkt!",
+  "cobblemon.battle.fieldstart.magicroom": "Es entsteht ein Raum, in dem getragene Items ihre Wirkung verlieren!",
+  "cobblemon.battle.fieldstart.mistyterrain": "Am Boden breitet sich dichter Nebel aus!",
+  "cobblemon.battle.fieldstart.mudsport": "Die Stärke aller Elektro-Attacken wurde reduziert!",
+  "cobblemon.battle.fieldstart.psychicterrain": "Der Boden fühlt sich seltsam an!",
+  "cobblemon.battle.fieldstart.trickroom": "%1$s hat die Dimensionen verdreht!",
+  "cobblemon.battle.fieldstart.watersport": "Die Stärke aller Feuer-Attacken wurde reduziert!",
+  "cobblemon.battle.fieldstart.wonderroom": "Es entsteht ein Raum, in dem Verteidigung und Spezial-Verteidigung miteinander vertauscht sind!",
+  "cobblemon.battle.fieldend.electricterrain": "Das Elektrofeld ist wieder verschwunden!",
+  "cobblemon.battle.fieldend.grassyterrain": "Das Grasfeld ist wieder verschwunden!",
+  "cobblemon.battle.fieldend.gravity": "Die Erdanziehung ist wieder normal!",
+  "cobblemon.battle.fieldend.magicroom": "Der Magieraum verpufft. Getragene Items erhalten ihre Wirkung zurück!",
+  "cobblemon.battle.fieldend.mistyterrain": "Das Nebelfeld ist wieder verschwunden!",
+  "cobblemon.battle.fieldend.mudsport": "Lehmsuhler hört auf zu wirken!",
+  "cobblemon.battle.fieldend.psychicterrain": "Das Psychofeld ist wieder verschwunden!",
+  "cobblemon.battle.fieldend.trickroom": "Die verdrehte Dimension ist wieder normal!",
+  "cobblemon.battle.fieldend.watersport": "Nassmacher hört auf zu wirken!",
+  "cobblemon.battle.fieldend.wonderroom": "Der Wunderraum verpufft. Verteidigung und Spezial-Verteidigung werden wieder zurückgesetzt!",
+  "cobblemon.battle.fieldactivate.perishsong": "Alle Pokémon, die dem Abgesang gelauscht haben, gehen nach drei Runden K.O.!",
+  "cobblemon.battle.sidestart.stealthrock": "Um die Pokémon auf gegnerischer Seite schweben spitze Steine!",
+  "cobblemon.battle.sidestart.spikes": "Die Pokémon auf %1$s's Seite sind von Stacheln umgeben!",
+  "cobblemon.battle.sidestart.toxicspikes": "Die Pokémon auf %1$s's Seite sind überall von giftigen Stacheln umgeben!",
+  "cobblemon.battle.sidestart.stickyweb": "Am Boden um die Pokémon auf %1$s's Seite entspinnt sich ein Klebenetz!",
+  "cobblemon.battle.sidestart.reflect": "Reflektor stärkt %1$s's Pokémon gegen physische Attacken!",
+  "cobblemon.battle.sidestart.lightscreen": "Lichtschild stärkt %1$s's Pokémon gegen Spezial-Attacken!",
+  "cobblemon.battle.sidestart.auroraveil": "Auroraschleier stärkt %1$s's Pokémon gegen physische und Spezial-Attacken!",
+  "cobblemon.battle.sidestart.tailwind": "%1$s's Pokémon erhalten Rückenwind!",
+  "cobblemon.battle.sidestart.safeguard": "%1$s's Team wird von einem Schleier umhüllt!",
+  "cobblemon.battle.sideend.stealthrock": "Die Stacheln, die auf %1$s's Seite herumlagen, sind verschwunden!",
+  "cobblemon.battle.sideend.spikes": "Die Stacheln, die auf %1$s's Seite herumlagen, sind verschwunden!",
+  "cobblemon.battle.sideend.toxicspikes": "Die giftigen Stacheln, die auf %1$s's Seite herumlagen, sind verschwunden!",
+  "cobblemon.battle.sideend.stickyweb": "Das Klebenetz auf %1$s's Seite ist wieder verschwunden!",
+  "cobblemon.battle.sideend.reflect": "Reflektor auf %1$s's Seite hört auf zu wirken!",
+  "cobblemon.battle.sideend.lightscreen": "Lichtschild auf %1$s's Seite hört auf zu wirken!",
+  "cobblemon.battle.sideend.auroraveil": "Der Auroraschleier, der %1$s's Team umgab, hat sich gelüftet!",
+  "cobblemon.battle.sideend.tailwind": "Der Rückenwind auf %1$s's Seite hat sich gelegt!",
+  "cobblemon.battle.sideend.safeguard": "Der mystische Schleier, der %1$s's Team umgab, hat sich gelüftet!",
+  "cobblemon.battle.cant.generic": "%1$s kann %2$s nicht benutzen!",
  "cobblemon.battle.cant.truant": "%1$s faulenzt!",
-  "cobblemon.battle.cant.flinched": "%1$s ist zurückgeschreckt!",
+  "cobblemon.battle.cant.flinch": "%1$s ist zurückgeschreckt und kann nicht angreifen!",
  "cobblemon.battle.cant.recharge": "%1$s muss sich ausruhen!",
  "cobblemon.battle.cant.attract": "%1$s ist starr vor Liebe!",
  "cobblemon.battle.cant.disable": "%1$s' %2$s ist blockiert!",
-  "cobblemon.battle.cant.focus_punch": "%1$s hat seinen Fokus verloren und kann nicht angreifen!",
-  "cobblemon.battle.cant.heal_block": "%1$s kann %2$s wegen Heilblockade nicht benutzen!",
+  "cobblemon.battle.cant.focuspunch": "%1$s kann sich nicht mehr konzentrieren. Es kann nicht angreifen!",
+  "cobblemon.battle.cant.healblock": "%1$s kann %2$s aufgrund von Heilblockade nicht einsetzen.",
  "cobblemon.battle.cant.imprison": "%1$s kann seine versiegelte Attacke %2$s nicht benutzen!",
  "cobblemon.battle.cant.gravity": "%1$s kann %2$s wegen der erhöhten Erdanziehung nicht benutzen!",
-  "cobblemon.battle.cant.shell_trap": "%1$s's Panzerfalle ist fehlgeschlagen!",
+  "cobblemon.battle.cant.shelltrap": "Die Panzerfalle von %1$s wurde nicht ausgelöst!",
  "cobblemon.battle.cant.taunt": "%1$s kann %2$s nach Verhöhner nicht benutzen!",
-  "cobblemon.battle.cant.throat_chop": "Die Auswirkungen von Neck Strike halten %1$s davon ab, bestimmte Attacken einzusetzen!",
-  "cobblemon.battle.cant.no_pp": "%1$s hat versucht, %2$s einzusetzen aber es hatte keine AP mehr übrig!",
+  "cobblemon.battle.cant.throatchop": "%1$s kann die Attacke durch die Wirkung von Neck Strike nicht einsetzen!",
+  "cobblemon.battle.activate.confusion": "%1$s ist verwirrt!",
  "cobblemon.battle.activate.gravity": "%1$s kann wegen der erhöhten Erdanziehung nicht mehr in der Luft bleiben!",
-  "cobblemon.battle.activate.misty_terrain": "%1$s umgibt sich selbst mit einem schützenden Nebel!",
-  "cobblemon.battle.activate.psychic_terrain": "%1$s umgibt sich selbst mit Psychoterrain!",
-  "cobblemon.battle.activate.heal_bell": "Eine Glocke läutet!",
+  "cobblemon.battle.activate.mistyterrain": "%1$s wird von Nebelfeld geschützt!",
+  "cobblemon.battle.activate.psychicterrain": "%1$s wird von Psychofeld geschützt!",
+  "cobblemon.battle.activate.healbell": "Eine Glocke läutet!",
  "cobblemon.battle.activate.aromatherapy": "Ein wohltuendes Aroma breitet sich aus!",
  "cobblemon.battle.activate.trapped": "%1$s kann nicht mehr fliehen!",
-  "cobblemon.battle.activate.bind": "%1$s was squeezed by %2$s!",
-  "cobblemon.battle.activate.court_change": "%1$s swapped the battle effects affecting each side of the field!",
-  "cobblemon.battle.activate.guard_split": "%1$s shared its guard with the target!",
-  "cobblemon.battle.activate.spite": "It reduced the PP of %1$s's %2$s by %3$s!",
-  "cobblemon.battle.prepare.bounce": "%1$s sprang up!",
-  "cobblemon.battle.prepare.dig": "%1$s burrowed its way under the ground!",
-  "cobblemon.battle.prepare.dive": "%1$s hid underwater!",
-  "cobblemon.battle.prepare.fly": "%1$s flew up high!",
-  "cobblemon.battle.prepare.freeze_shock": "%1$s became cloaked in a freezing light!",
-  "cobblemon.battle.prepare.geomancy": "%1$s is absorbing power!",
-  "cobblemon.battle.prepare.ice_burn": "%1$s became cloaked in freezing air!",
-  "cobblemon.battle.prepare.meteor_beam": "%1$s is overflowing with space power!",
-  "cobblemon.battle.prepare.phantom_force": "%1$s vanished instantly!",
-  "cobblemon.battle.prepare.razor_wind": "%1$s whipped up a whirlwind!",
-  "cobblemon.battle.prepare.skull_bash": "%1$s tucked in its head!",
-  "cobblemon.battle.prepare.sky_attack": "%1$s became cloaked in a harsh light!",
-  "cobblemon.battle.prepare.sky_drop": "%1$s took its target into the sky!",
-  "cobblemon.battle.prepare.solar_beam": "%1$s absorbed light!",
-  "cobblemon.battle.swapboost.generic": "%1$s swapped stat boosts with %2$s!",
-  "cobblemon.battle.singleturn.protect": "%1$s protected itself!",
-  "cobblemon.battle.singleturn.endure": "%1$s braced itself!",
-  "cobblemon.battle.singleturn.crafty_shield": "Crafty Shield protected %1$s's team!",
-  "cobblemon.battle.singleturn.powder": "%1$s is covered in powder!",
-  "cobblemon.battle.singleturn.follow_me": "%1$s became the center of attention!",
-  "cobblemon.battle.singleturn.snatch": "%1$s is waiting for a target to make a move!",
-  "cobblemon.battle.singleturn.quick_guard": "Quick Guard protected %1$s's team!",
-  "cobblemon.battle.singleturn.wide_guard": "Wide Guard protected %1$s's team!",
+  "cobblemon.battle.activate.bind": "%1$s wurde durch Klammergriff von %2$s verletzt!",
+  "cobblemon.battle.activate.wrap": "%1$s wurde von %2$s umwickelt!",
+  "cobblemon.battle.activate.struggle": "%1$s hat keine Attacken mehr übrig!",
+  "cobblemon.battle.activate.courtchange": "%1$s hat die Effekte, die auf den beiden Seiten des Kampffeldes wirken, miteinander getauscht!",
+  "cobblemon.battle.activate.guardsplit": "%1$s addiert seine Schutzkräfte mit jenen des Zieles und teilt sie gerecht auf!",
+  "cobblemon.battle.activate.spite": "%2$s von %1$s wird um %3$s AP reduziert!",
+  "cobblemon.battle.activate.lockon": "%1$s zielt auf %2$s!",
+  "cobblemon.battle.activate.protosynthesis": "The harsh sunlight activated %1$s's Protosynthesis!",
+  "cobblemon.battle.activate.bide": "%1$s speichert Energie!",
+  "cobblemon.battle.activate.protect": "%1$s schützt sich selbst!",
+  "cobblemon.battle.activate.magnitude": "Intensität %1$s!",
+  "cobblemon.battle.activate.destinybond": "%1$s nimmt den Angreifer mit sich!",
+  "cobblemon.battle.activate.synchronize": "[%1$s's Synchro]",
+  "cobblemon.battle.activate.endure": "%1$s übersteht die Attacke!",
+  "cobblemon.battle.activate.attract": "%1$s hat sich in in %2$s verliebt!",
+  "cobblemon.battle.activate.firespin": "%1$s wurde in wirbelndem Feuer eingeschlossen!",
+  "cobblemon.battle.activate.trick": "%1$s tauscht Items mit dem Ziel!",
+  "cobblemon.battle.activate.quickclaw": "%1$s can act faster than normal, thanks to its Quick Claw!",
+  "cobblemon.battle.activate.focusband": "%1$s hält mithilfe des Items %2$s durch!",
+  "cobblemon.battle.activate.forewarn": "%1$s von %2$s wurde enthüllt!",
+  "cobblemon.battle.activate.disguise": "Sein Kostüm hat die Attacke absorbiert!",
+  "cobblemon.battle.activate.liquidooze": "%1$s saugt Kloakensoße auf!",
+  "cobblemon.battle.activate.whirlpool": "%1$s wird in dem Strudel gefangen!",
+  "cobblemon.battle.activate.clamp": "%1$s wurde von %2$s geschnappt!",
+  "cobblemon.battle.prepare.bounce": "%1$s springt hoch in die Luft!",
+  "cobblemon.battle.prepare.dig": "%1$s vergräbt sich in der Erde!",
+  "cobblemon.battle.prepare.dive": "%1$s taucht unter!",
+  "cobblemon.battle.prepare.fly": "%1$s fliegt hoch empor!",
+  "cobblemon.battle.prepare.freezeshock": "%1$s wird von einem kühlen Licht umhüllt!",
+  "cobblemon.battle.prepare.geomancy": "%1$s saugt Kraft in sich auf!",
+  "cobblemon.battle.prepare.iceburn": "%1$s wird in klirrend kalte Luft gehüllt!",
+  "cobblemon.battle.prepare.meteorbeam": "Kosmische Kräfte strömen aus %1$s!",
+  "cobblemon.battle.prepare.phantomforce": "%1$s verschwindet augenblicklich!",
+  "cobblemon.battle.prepare.razorwind": "%1$s erzeugt eine Windböe!",
+  "cobblemon.battle.prepare.skullbash": "%1$s zieht seinen Kopf ein!",
+  "cobblemon.battle.prepare.skyattack": "%1$s leuchtet grell!",
+  "cobblemon.battle.prepare.skydrop": "%1$s took its target into the sky!",
+  "cobblemon.battle.prepare.solarbeam": "%1$s absorbiert Sonnenlicht!",
+  "cobblemon.battle.swapboost.generic": "%1$s tauscht die Statuswertveränderungen mit %2$s!",
+  "cobblemon.battle.singleturn.protect": "%1$s schützt sich selbst!",
+  "cobblemon.battle.singleturn.endure": "%1$s macht sich bereit!",
+  "cobblemon.battle.singleturn.craftyshield": "Die Pokémon auf %1$s's Seite werden von Trickschutz behütet!",
+  "cobblemon.battle.singleturn.powder": "Auf %1$s wurde Pulver geschleudert!",
+  "cobblemon.battle.singleturn.followme": "%1$s zieht alle Aufmerksamkeit auf sich!",
+  "cobblemon.battle.singleturn.snatch": "%1$s wartet auf einen Angriff!",
+  "cobblemon.battle.singleturn.quickguard": "Die Pokémon auf %1$s's Seite werden von Rapidschutz behütet!",
+  "cobblemon.battle.singleturn.wideguard": "Die Pokémon auf %1$s's Seite werden von Rundumschutz behütet!",
  "cobblemon.battle.singleturn.roost": "(%1$s loses Flying type this turn.)",
-  "cobblemon.battle.singleturn.mat_block": "%1$s intends to flip up a mat and block incoming attacks!",
-  "cobblemon.battle.singleturn.max_guard": "%1$s protected itself!",
-  "cobblemon.battle.singleturn.instruct": "%1$s followed %2$s's instructions!",
-  "cobblemon.battle.singleturn.focus_punch": "%1$s is tightening its focus!",
-  "cobblemon.battle.singleturn.electrify": "%1$s's moves have been electrified!",
-  "cobblemon.battle.singleturn.beak_blast": "%1$s started heating up its beak!",
-  "cobblemon.battle.singleturn.helping_hand": "%2$s is ready to help %1$s!",
-  "cobblemon.battle.singleturn.magic_coat": "%1$s shrouded itself with Magic Coat!",
-  "cobblemon.battle.singleturn.rage_powder": "%1$s became the center of attention!",
-  "cobblemon.battle.singleturn.shell_trap": "%1$s set a shell trap!",
-  "cobblemon.battle.singleturn.spotlight": "%1$s became the center of attention!",
-  "cobblemon.battle.singlemove.destiny_bond": "%1$s is hoping to take its attacker down with it!",
-  "cobblemon.battle.singlemove.glaive_rush": "%1$s throws itself into a reckless charge!",
-  "cobblemon.battle.singlemove.grudge": "%1$s wants its target to bear a grudge!",
-  "cobblemon.battle.singlemove.rage": "%1$s goes into a rage!",
+  "cobblemon.battle.singleturn.matblock": "%1$s bringt seinen Tatami-Schild in Position!",
+  "cobblemon.battle.singleturn.maxguard": "%1$s schützt sich selbst!",
+  "cobblemon.battle.singleturn.instruct": "%1$s führt seine zuletzt eingesetzte Attacke auf Befehl von %2$s erneut aus!",
+  "cobblemon.battle.singleturn.focuspunch": "%1$s konzentriert sich!",
+  "cobblemon.battle.singleturn.electrify": "Die nächste Attacke von %1$s nimmt durch Elektrifizierung den Typ Elektro an!",
+  "cobblemon.battle.singleturn.beakblast": "%1$s erhitzt seinen Schnabel!",
+  "cobblemon.battle.singleturn.helpinghand": "%2$s will %1$s helfen!",
+  "cobblemon.battle.singleturn.magiccoat": "%1$s hüllt sich selbst in einen Magiemantel!",
+  "cobblemon.battle.singleturn.ragepowder": "%1$s zieht alle Aufmerksamkeit auf sich!",
+  "cobblemon.battle.singleturn.shelltrap": "%1$s hat eine Panzerfalle gelegt!",
+  "cobblemon.battle.singleturn.spotlight": "%1$s zieht alle Aufmerksamkeit auf sich!",
+  "cobblemon.battle.singlemove.destinybond": "%1$s versucht, den Angreifer mit sich zu nehmen!",
+  "cobblemon.battle.singlemove.glaiverush": "%1$s throws itself into a reckless charge!",
+  "cobblemon.battle.singlemove.grudge": "%1$s möchte, dass der Gegner ein Nachspiel erträgt!",
+  "cobblemon.battle.singlemove.rage": "%1$s gerät in Rage!",
+  "cobblemon.battle.damage.wrap": "%1$s was hurt by wrap!",
+  "cobblemon.battle.damage.confusion": "%1$s hat sich vor Verwirrung selbst verletzt!",
+  "cobblemon.battle.damage.leechseed": "Egelsamen schadet %1$s!",
+  "cobblemon.battle.damage.sandstorm": "Der Sandsturm fügt %1$s Schaden zu!",
+  "cobblemon.battle.damage.hail": "%1$s wird von Hagelkörnern getroffen!",
+  "cobblemon.battle.damage.stealthrock": "%1$s wird von spitzen Steinen getroffen!",
+  "cobblemon.battle.damage.spikes": "%1$s wurde durch Stachler verletzt!",
+  "cobblemon.battle.damage.recoil": "%1$s erleidet Schaden durch Rückstoß!",
+  "cobblemon.battle.damage.item": "%1$s wurde durch das Item %2$s verletzt!",
+  "cobblemon.battle.damage.lifeorb": "%1$s verliert einige KP!",
+  "cobblemon.battle.damage.rockyhelmet": "%1$s erleidet durch den Beulenhelm Schaden!",
+  "cobblemon.battle.damage.generic": "%1$s was hurt!",
+  "cobblemon.battle.damage.pokemonmimikyubusted": "Die Tarnung von %1$s ist aufgeflogen!",
+  "cobblemon.battle.damage.whirlpool": "%1$s was hurt by Whirlpool!",
+  "cobblemon.battle.damage.clamp": "%1$s was hurt by Clamp!",
+  "cobblemon.battle.damage.curse": "%1$s wurde durch den Fluch verletzt!",
  "cobblemon.battle.end.bind": "%1$s is no longer being squeezed!",
-  "cobblemon.battle.set_hp.pain_split": "Die Kontrahenten teilen sich ihre KP!",
-  "cobblemon.battle.ability.sturdy": "%1$s endured the hit!",
-  "cobblemon.battle.ability.speed_boost": "%1$s's Speed Boost activated!",
-  "cobblemon.battle.ability.intimidate": "%1$s's Intimidate activated!",
-  "cobblemon.battle.ability.unnerve": "%1$s made the opponent too nervous to eat berries!",
-  "cobblemon.battle.ability.anticipation": "%1$s shuddered in anticipation!",
-  "cobblemon.battle.ability.air_lock": "The effects of the weather disappeared.",
+  "cobblemon.battle.end.wrap": "%1$s wurde von Wickel befreit!",
+  "cobblemon.battle.end.disable": "Die Attacke von %1$s ist nicht mehr blockiert!",
+  "cobblemon.battle.end.protosynthesis": "The effects of %1$s's Protosynthesis wore off!",
+  "cobblemon.battle.end.taunt": "Verhöhner wirkt nicht mehr auf %1$s!",
+  "cobblemon.battle.end.firespin": "%1$s wurde von Feuerwirbel befreit!",
+  "cobblemon.battle.end.bide": "%1$s setzt Energie frei!",
+  "cobblemon.battle.end.confusion": "%1$s ist nicht mehr verwirrt!",
+  "cobblemon.battle.end.whirlpool": "%1$s wurde von Whirlpool befreit!",
+  "cobblemon.battle.end.clamp": "%1$s wurde von Schnapper befreit!",
+  "cobblemon.battle.end.dynamax": "%1$s returned to normal!",
+  "cobblemon.battle.sethp.painsplit": "Die Kontrahenten teilen sich ihre KP!",
+  "cobblemon.battle.ability.sturdy": "%1$s übersteht die Attacke!",
+  "cobblemon.battle.ability.unnerve": "%1$s machte den Gegner zu nervös, um Beeren zu essen!",
+  "cobblemon.battle.ability.anticipation": "%1$s erschaudert!",
+  "cobblemon.battle.ability.airlock": "Die wetterbedingten Effekte wurden aufgehoben!",
  "cobblemon.battle.ability.generic": "%1$s's %2$s activated!",
+  "cobblemon.battle.ability.magicbounce": "%2$s von %1$s wurde zurückgelenkt!",
  "cobblemon.battle.errors.busy": "%1$s ist beschäftigt!",
  "cobblemon.battle.error.in_battle": "%1$s ist bereits im Kampf.",
  "cobblemon.battle.error.in_battle.personal": "Du bist bereits im Kampf!",
  "cobblemon.battle.error.no_pokemon": "Du hast keine nutzbaren Pokémon mehr!",
+  "cobblemon.battle.error.no_pokemon_opponent": "Your opponent doesn't have any usable Pokémon!",
  "cobblemon.battle.error.insufficient_pokemon": "%1$s hat %2 Pokémon doch %3 sind nötig.",
  "cobblemon.battle.error.insufficient_pokemon.personal": "Du hast %1 nutzbare Pokémon doch du brauchst %2.",
+  "cobblemon.battle.error.pokemon_is_trapped": "[Unverfügbare Auswahl] Kann nicht austauschen: Der aktive Pokémon ist gefangen",
  "cobblemon.battle.immune": "Aber %1$s ist immun!",
  "cobblemon.battle.missed": "Aber es ging daneben.",
  "cobblemon.battle.hit_count": "%1$s-mal getroffen!",
  "cobblemon.battle.hit_count_singular": "1-mal getroffen!",
-  "cobblemon.battle.item.air_balloon.start": "%1$s schwebt mit seinem Luftballon über dem Boden!",
-  "cobblemon.battle.item.recycle_or_pickup.start": "%1$s hat ein Exemplar %2$s gefunden!",
-  "cobblemon.battle.item.frisk.start": "%1$s schnüffelte an %2$s und hat sein Item %3$s gefunden!",
-  "cobblemon.battle.item.take_item.start": "%1$s stiehlt %3$s von %2$s!",
-  "cobblemon.battle.item.harvest.start": "%1$s erntet eine %2$s!",
-  "cobblemon.battle.item.bestow.start": "%1$s erhält %2$s von %3$s!",
-  "cobblemon.battle.item.tricked.start": "%1$s tauscht Items mit dem Ziel!",
-  "cobblemon.battle.item.eat.end": "%1$s isst seine %2$s!",
-  "cobblemon.battle.item.fling.end": "%1$s schleudert sein Item %2$s!",
-  "cobblemon.battle.item.knock_off.end": "%1$s schlug das Item %3$s von %2$s weg!",
-  "cobblemon.battle.item.gem.end": "Das %1$s verstärkt die Kraft von %2$s!",
-  "cobblemon.battle.item.incinerate.end": "%2$s von %1$s ist verbrannt und somit nutzlos geworden!",
-  "cobblemon.battle.item.air_balloon.end": "Der Luftballon von %1$s ist geplatzt!",
-  "cobblemon.battle.item.hung_on.end": "%1$s hält mit Hilfe des Items %2$s durch!",
-  "cobblemon.battle.item.red_card.end": "%1$s hält %2$s seine Rote Karte hin!",
-  "cobblemon.battle.item.steal_eat.end": "%1$s hat %2$s seine %3$s gestohlen und sie ihm weggegessen!",
-  "cobblemon.battle.item.berry_juice.end": "%1$s's Beerensaft wurde aktiviert!",
-  "cobblemon.battle.item.used_its.end": "%1$s hat sein Item %2$s benutzt!",
-  "cobblemon.battle.item.mental_herb.end": "%1$s hebt mentale Effekte mit seinem Mentalkraut auf!",
-  "cobblemon.battle.item.power_herb.end": "%1$s wurde durch sein Energiekraut vollständig aufgeladen!",
-  "cobblemon.battle.item.mirror_herb.end": "%1$s hat die Statuswerteerhöhungen mit seinem Kopierkraut übernommen!",
-  "cobblemon.battle.item.white_herb.end": "Die negativen Statuswertveränderungen von %1$s wurden durch das Schlohkraut aufgehoben!",
-  "cobblemon.battle.item.quick_claw.end": "%1$s kann dank seiner Flinkklaue schneller agieren als sonst!",
-  "cobblemon.battle.heal.z_effect": "%1$s's KP wurden durch die Z-Kraft wieder aufgefüllt!",
+  "cobblemon.battle.item.airballoon": "%1$s gerät durch den Luftballon in die Schwebe!",
+  "cobblemon.battle.item.recycle": "%1$s hat das Item %2$s recycelt!",
+  "cobblemon.battle.item.frisk": "%3$s hat das Item %2$s von %1$s erschnüffelt!\n",
+  "cobblemon.battle.item.thief": "%1$s hat %3$s das Item %2$s geklaut!",
+  "cobblemon.battle.item.harvest": "%1$s harvested one %2$s!",
+  "cobblemon.battle.item.bestow": "%1$s erhält %2$s von %3$s!",
+  "cobblemon.battle.item.trick": "%1$s erhält das Item %2$s!",
+  "cobblemon.battle.item.eat": "%1$s ate its %2$s.",
+  "cobblemon.battle.enditem.eat": "%1$s ate its %2$s!",
+  "cobblemon.battle.enditem.fling": "%1$s schleudert das Item %2$s!",
+  "cobblemon.battle.enditem.knockoff": "%3$s schlägt das Item %2$s von %1$s weg!",
+  "cobblemon.battle.enditem.gem": "%2$s erhöht die Stärke von %1$s!",
+  "cobblemon.battle.enditem.incinerate": "%2$s von %1$s ist verbrannt und somit nutzlos geworden!",
+  "cobblemon.battle.enditem.airballoon": "Der Luftballon von %1$s ist geplatzt!",
+  "cobblemon.battle.enditem.redcard": "%1$s zeigt %3$s die Rote Karte!",
+  "cobblemon.battle.enditem.pluck": "%3$s hat dem %1$s seine %2$s weggefuttert!",
+  "cobblemon.battle.enditem.berryjuice": "%1$s's Berry Juice activated!",
+  "cobblemon.battle.enditem.generic": "%1$s used its %2$s!",
+  "cobblemon.battle.enditem.mentalherb": "%1$s shook off mental effects due to its Mental Herb!",
+  "cobblemon.battle.enditem.powerherb": "%1$s became fully charged due to its Power Herb!",
+  "cobblemon.battle.enditem.mirrorherb": "%1$s copied stat changes with its Mirror Herb!",
+  "cobblemon.battle.enditem.whiteherb": "%1$s returned its status to normal using its White Herb!",
+  "cobblemon.battle.heal.zeffect": "%1$s hat durch Z-Kraft seine KP aufgefrischt!",
  "cobblemon.battle.heal.wish": "Der Wunsch von %1$s ging in Erfüllung!",
  "cobblemon.battle.heal.drain": "%1$s wurden KP abgesaugt!",
-  "cobblemon.battle.heal.healing_wish": "Das Heilopfer erreicht %1$s!",
-  "cobblemon.battle.heal.revival_blessing": "%1$s wurde wiederbelebt und ist wieder bereit zu Kämpfen!",
-  "cobblemon.battle.heal.aqua_ring": "Der Wasserring stellt KP von %1$s wieder her!",
+  "cobblemon.battle.heal.healingwish": "Das Heilopfer erreicht %1$s!",
+  "cobblemon.battle.heal.revivalblessing": "%1$s ist wieder fit und kampfbereit!",
+  "cobblemon.battle.heal.aquaring": "Der Wasserring stellt KP von %1$s wieder her!",
  "cobblemon.battle.heal.ingrain": "%1$s nimmt über seine Wurzeln Nährstoffe auf!",
-  "cobblemon.battle.heal.grassy_terrain": "%1$s's KP wurden wiederhergestellt.",
-  "cobblemon.battle.heal.leftovers": "%1$s stellt ein paar KP mit seinen Überresten wieder her!",
-  "cobblemon.battle.heal.rain_dish": "%1$s restored HP from Rain Dish!",
+  "cobblemon.battle.heal.grassyterrain": "%1$s's HP was restored.",
+  "cobblemon.battle.heal.leftovers": "%2$s von %1$s füllt einige KP auf!",
+  "cobblemon.battle.heal.item": "%2$s füllt KP von %1$s auf!",
+  "cobblemon.battle.heal.raindish": "%1$s restored HP from Rain Dish!",
  "cobblemon.battle.heal.generic": "%1$s hat seine KP wiederhergestellt.",
+  "cobblemon.battle.heal.bagitempotion": "It restored %1$s's HP",
+  "cobblemon.battle.curestatus.naturalcure": "%1$s is cured by its Natural Cure!",
+  "cobblemon.battle.bagitem.use": "%1$s used a %2$s on %3$s!",
+  "cobblemon.battle.bagitem.cannot": "You cannot use items right now.",
+  "cobblemon.battle.bagitem.invalid": "This item would not work.",
+  "cobblemon.battle.zpower": "%1$s surrounded itself with its Z-Power!",
+  "cobblemon.battle.zbroken": "%1$s couldn't fully protect itself and got hurt!",
+  "cobblemon.battle.terastallize": "%1$s has Terastallized into the %2$s-type!",
+  "cobblemon.battle.detailschange.mega": "%1$s is reacting to the Key Stone!",
+  "cobblemon.battle.mega": "%1$s has Mega Evolved!",
  "cobblemon.experience.gained": "%1$s bekam %2$s Erfahrung.",
  "cobblemon.experience.level_up": "%1$s stieg auf Level %2$s!",
  "cobblemon.experience.learned_move": "%1$s hat %2$s gelernt.",
@@ -609,16 +1024,19 @@
  "cobblemon.move.category.status": "Status",
  "cobblemon.status.sleep.apply": "%1$s ist eingeschlafen!",
  "cobblemon.status.sleep.is": "%1$s schläft tief und fest.",
-  "cobblemon.status.sleep.woke": "%1$s ist aufgewacht!",
+  "cobblemon.status.sleep.cure": "%1$s ist aufgewacht!",
  "cobblemon.status.paralysis.apply": "%1$s wurde paralysiert!",
  "cobblemon.status.paralysis.is": "%1$s ist paralysiert und kann nicht angreifen",
+  "cobblemon.status.paralysis.cure": "Die Paralyse von %1$s wurde aufgehoben!",
  "cobblemon.status.poison.apply": "%1$s wurde vergiftet!",
+  "cobblemon.status.poison.cure": "Die Vergiftung von %1$s wurde geheilt!",
  "cobblemon.status.poisonbadly.apply": "%1$s wurde schwer vergiftet!",
-  "cobblemon.status.poison.hurt": "%1$s hat durch das Gift Schaden genommen",
+  "cobblemon.status.poison.hurt": "%1$s wird durch Gift verletzt!",
  "cobblemon.status.burn.apply": "%1$s erleidet Verbrennungen!",
  "cobblemon.status.burn.hurt": "%1$s nimmt Schaden durch die Verbrennungen!",
+  "cobblemon.status.burn.cure": "Die Verbrennungen von %1$s wurden geheilt!",
  "cobblemon.status.frozen.apply": "%1$s wurde eingefroren!",
-  "cobblemon.status.frozen.thawed": "%1$s ist aufgetaut!",
+  "cobblemon.status.frozen.cure": "%1$s wurde aufgetaut!",
  "cobblemon.status.frozen.is": "%1$s ist eingefroren!",
  "block.cobblemon.dawn_stone_ore": "Funkelsteinerz",
  "block.cobblemon.dusk_stone_ore": "Finstersteinerz",
@@ -641,10 +1059,47 @@
  "block.cobblemon.deepslate_thunder_stone_ore": "Tiefenschiefer-Donnersteinerz",
  "block.cobblemon.deepslate_water_stone_ore": "Tiefenschiefer-Wassersteinerz",
  "block.cobblemon.dripstone_moon_stone_ore": "Tropf-Mondstein Erz",
+  "block.cobblemon.pasture": "Weidenblock",
  "gamerule.doPokemonSpawning": "Pokémon spawnen",
+  "gamerule.doShinyStarters": "Starters will be shiny",
  "cobblemon.command.checkspawns.invalid-bucket": "Ungültiger Spawneimer",
  "cobblemon.command.checkspawns.spawns": "Spawns",
  "cobblemon.command.checkspawns.nothing": "Hier kann gerade nichts spawnen.",
+  "cobblemon.interaction.ev.add": "%1$s' %2$s EVs increased by %3$s!",
+  "cobblemon.interaction.ev.deduct": "%1$s' %2$s EVs decreased by %3$s!",
+  "cobblemon.interaction.pp.restore": "You restore the PP of %1$s.",
+  "cobblemon.interaction.friendsip.add": "%1$s grows closer to you!",
+  "cobblemon.interaction.status.cure": "%1$s is cured of its status condition!",
+  "cobblemon.interaction.hp.heal": "%1$s restored its HP a bit!",
+  "tag.item.cobblemon.apricorn_logs": "Apricorn Logs",
+  "tag.item.cobblemon.apricorn_sprouts": "Apricorn Sprouts",
+  "tag.item.cobblemon.apricorns": "Aprikokos",
+  "tag.item.cobblemon.azalea_tree": "Azalea Trees",
+  "tag.item.cobblemon.berries": "Beeren",
+  "tag.item.cobblemon.cobblemon_seeds": "Samen",
+  "tag.item.cobblemon.evolution_items": "Evolution Items",
+  "tag.item.cobblemon.evolution_stones": "Evolution Stones",
+  "tag.item.cobblemon.experience_candies": "Experience Candies",
+  "tag.item.cobblemon.held.destiny_knot": "Fatumknoten",
+  "tag.item.cobblemon.held.everstone": "Ewigsteine",
+  "tag.item.cobblemon.held.experience_share": "Experience Shares",
+  "tag.item.cobblemon.held.is_held_item": "Held Items",
+  "tag.item.cobblemon.held.lucky_egg": "Lucky Eggs",
+  "tag.item.cobblemon.held.power_anklet": "Machtketten",
+  "tag.item.cobblemon.held.power_band": "Machtbände",
+  "tag.item.cobblemon.held.power_belt": "Machtgurte",
+  "tag.item.cobblemon.held.power_bracer": "Machtreife",
+  "tag.item.cobblemon.held.power_lens": "Machtlinsen",
+  "tag.item.cobblemon.held.power_weight": "Machtgewichte",
+  "tag.item.cobblemon.herbs": "Kräuter",
+  "tag.item.cobblemon.mint_leaf": "Mint Leaves",
+  "tag.item.cobblemon.mints": "Minzen",
+  "tag.item.cobblemon.mutated_berries": "Mutation Berries",
+  "tag.item.cobblemon.plants": "Pflanzen",
+  "tag.item.cobblemon.poke_balls": "Pokébälle",
+  "tag.item.cobblemon.protein_ingredients": "Protein Ingredients",
+  "tag.item.cobblemon.zinc_ingredients": "Zinc Ingredients",
+  "tag.item.cobblemon.seeds": "Samen",

  "cobblemon.ability.adaptability": "Anpassung",
  "cobblemon.ability.adaptability.desc": "Erhöht die Stärke von Attacken, die dem Typ des Pokémon entsprechen.",
@@ -1,5 +1,4 @@
 {
-  "itemGroup.cobblemon.pokeball": "Monster capturers",
  "item.cobblemon.poke_ball": "Monster ball",
  "item.cobblemon.slate_ball": "Cannonball",
  "item.cobblemon.azure_ball": "Ball o' water's hue",
@@ -46,7 +45,8 @@
  "item.cobblemon.red_apricorn": "Red fruitnut",
  "item.cobblemon.white_apricorn": "White fruitnut",
  "item.cobblemon.yellow_apricorn": "Yellow fruitnut",
-  "itemGroup.cobblemon.evolution_item": "Transmogrification treasures",
+  "item.cobblemon.vivichoke_seeds": "Seed o' vivichokity",
+  "item.cobblemon.vivichoke": "Vivichoke",
  "item.cobblemon.link_cable": "Connection rope",
  "item.cobblemon.dragon_scale": "Scale o' th' drakes",
  "item.cobblemon.kings_rock": "Crown o' th' seas",
@@ -88,7 +88,6 @@
  "item.cobblemon.sun_stone": "Stone o' th' sun",
  "item.cobblemon.thunder_stone": "Stone o' thund'r",
  "item.cobblemon.water_stone": "Stone o' th' sea",
-  "itemGroup.cobblemon.medicine": "Tomes o' th' dark arts",
  "item.cobblemon.rare_candy": "Rare treat",
  "item.cobblemon.exp_candy_xs": "Smallest boon",
  "item.cobblemon.exp_candy_s": "Small boon",
@@ -101,10 +100,47 @@
  "item.cobblemon.iron": "Syrup o' strength",
  "item.cobblemon.protein": "Syrup o' power",
  "item.cobblemon.zinc": "Syrup o' resilience",
-  "itemGroup.cobblemon.held_item": "Tools o' th' monsters",
+  "item.cobblemon.potion": "Brew o' creature healin'",
+  "item.cobblemon.super_potion": "Strong brew o' creature healin'",
+  "item.cobblemon.hyper_potion": "Pow'rful brew o' creature healin'",
+  "item.cobblemon.max_potion": "Full brew o' creature healin'",
+  "item.cobblemon.full_restore": "Restoration brew",
+  "item.cobblemon.red_mint_leaf": "Scarlet leaf o' mint",
+  "item.cobblemon.red_mint_leaf.tooltip": "Influences ya monster's power value",
+  "item.cobblemon.blue_mint_leaf": "Violet leaf o' mint",
+  "item.cobblemon.blue_mint_leaf.tooltip": "Influences ya monster's strength value",
+  "item.cobblemon.cyan_mint_leaf": "Shore leaf o' mint",
+  "item.cobblemon.cyan_mint_leaf.tooltip": "Influences ya monster's magic value",
+  "item.cobblemon.pink_mint_leaf": "Flowery leaf o' mint",
+  "item.cobblemon.pink_mint_leaf.tooltip": "Influences ya monster's resilience value",
+  "item.cobblemon.green_mint_leaf": "Leafy leaf o' mint",
+  "item.cobblemon.green_mint_leaf.tooltip": "Influences ya monster's speed value",
+  "item.cobblemon.white_mint_leaf": "Bland leaf o' mint",
+  "item.cobblemon.white_mint_leaf.tooltip": "Influences ya monster's values to floorboard",
+  "item.cobblemon.lonely_mint": "Outcast mint",
+  "item.cobblemon.adamant_mint": "Stiff board mint",
+  "item.cobblemon.naughty_mint": "Rascal mint",
+  "item.cobblemon.brave_mint": "Adventur'us mint",
+  "item.cobblemon.bold_mint": "Resolute mint",
+  "item.cobblemon.impish_mint": "Jaunty mint",
+  "item.cobblemon.lax_mint": "Sloppy mint",
+  "item.cobblemon.relaxed_mint": "Sea breezy mint",
+  "item.cobblemon.modest_mint": "Prud'nt mint",
+  "item.cobblemon.mild_mint": "Balmy mint",
+  "item.cobblemon.rash_mint": "Daring mint",
+  "item.cobblemon.quiet_mint": "Clamm'd mint",
+  "item.cobblemon.calm_mint": "Serene mint",
+  "item.cobblemon.gentle_mint": "Affable mint",
+  "item.cobblemon.careful_mint": "Leery mint",
+  "item.cobblemon.sassy_mint": "Cheeky mint",
+  "item.cobblemon.timid_mint": "Feeble mint",
+  "item.cobblemon.hasty_mint": "Rapids mint",
+  "item.cobblemon.jolly_mint": "Chipp'r mint",
+  "item.cobblemon.naive_mint": "Green mint",
+  "item.cobblemon.serious_mint": "Sober mint",
  "item.cobblemon.assault_vest": "Combat coat",
  "item.cobblemon.auspicious_armor": "Plate o' th' favor'd",
-  "item.cobblemon.big_root": "Healthy treeleg",
+  "item.cobblemon.malicious_armor": "Plate o' th' detest'd",
  "item.cobblemon.black_belt": "Belt o' mast'ry",
  "item.cobblemon.black_glasses": "Tinted dual eyepatches",
  "item.cobblemon.black_sludge": "Slop",
@@ -138,6 +174,21 @@
  "item.cobblemon.spell_tag": "Voodoo page",
  "item.cobblemon.twisted_spoon": "Useless spoon",
  "item.cobblemon.wise_glasses": "Dual eyepatches",
+  "item.cobblemon.mental_herb": "Herb o' mind",
+  "item.cobblemon.mirror_herb": "Herb o' reflect'n",
+  "item.cobblemon.power_herb": "Herb o' speed",
+  "item.cobblemon.white_herb": "Herb o' neutral'ty",
+  "item.cobblemon.bright_powder": "Flash powder",
+  "item.cobblemon.metal_powder": "Metal powder",
+  "item.cobblemon.quick_powder": "Swift powder",
+  "item.cobblemon.destiny_knot": "String o' fate",
+  "item.cobblemon.everstone": "Anchor'd stone",
+  "item.cobblemon.power_anklet": "Anklet o' pow'r",
+  "item.cobblemon.power_band": "Band o' pow'r",
+  "item.cobblemon.power_belt": "Belt o' pow'r",
+  "item.cobblemon.power_bracer": "Bracer o' pow'r",
+  "item.cobblemon.power_lens": "Lens o' pow'r",
+  "item.cobblemon.power_weight": "Weight o' pow'r",
  "item.cobblemon.poke_ball.tooltip": "Standard rate o' catch",
  "item.cobblemon.slate_ball.tooltip": "Standard rate o' catch",
  "item.cobblemon.azure_ball.tooltip": "Standard rate o' catch",
@@ -170,6 +221,56 @@
  "item.cobblemon.park_ball.tooltip": "Bit o'er double th' rate o' catch in forests 'n' plains",
  "item.cobblemon.dream_ball.tooltip": "Four lots th' rate o' catch on napping monsters",
  "item.cobblemon.beast_ball.tooltip": "Five lots th' rate o' catch on beings from th' fourth seas, oth'rwise a tenth",
+  "item.cobblemon.mulch_base": "Fert'l'zer",
+  "item.cobblemon.coarse_mulch": "Rough fert'l'zer",
+  "item.cobblemon.growth_mulch": "Boon fert'l'zer",
+  "item.cobblemon.humid_mulch": "Temp'rate fert'l'zer",
+  "item.cobblemon.loamy_mulch": "Loamy fert'l'zer",
+  "item.cobblemon.peat_mulch": "Muddy fert'l'zer",
+  "item.cobblemon.rich_mulch": "Fruitful fert'l'zer",
+  "item.cobblemon.sandy_mulch": "Beachy fert'l'zer",
+  "item.cobblemon.surprise_mulch": "Myst'ry fert'l'zer",
+  "item.cobblemon.medicinal_leek": "Leek o' health",
+  "item.cobblemon.energy_root": "Root o' energy",
+  "item.cobblemon.revival_herb": "Herb o' resurrection",
+  "item.cobblemon.roasted_leek": "Roast leek",
+  "item.cobblemon.leek_and_potato_stew": "Leek an' tater stew",
+  "item.cobblemon.braised_vivichoke": "Brais'd vitalchoke",
+  "item.cobblemon.vivichoke_dip": "Dip o' vivichokity",
+  "item.cobblemon.berry_juice": "Juice o' th' berry",
+  "item.cobblemon.remedy": "Rough remedy",
+  "item.cobblemon.fine_remedy": "Fine remedy",
+  "item.cobblemon.superb_remedy": "Suparr remedy",
+  "item.cobblemon.heal_powder": "Powder o' health",
+  "item.cobblemon.medicinal_brew": "Brew o' potions",
+  "item.cobblemon.revive": "Candy o' resurrection",
+  "item.cobblemon.max_revive": "Candy o' total resurrection",
+  "item.cobblemon.pp_up": "Syrup o' PP increase",
+  "item.cobblemon.pp_max": "Syrup o' PP limit",
+  "item.cobblemon.x_attack": "Power pills",
+  "item.cobblemon.x_defence": "Strength pills",
+  "item.cobblemon.x_accuracy": "Shot rate pills",
+  "item.cobblemon.x_speed": "Speed pills",
+  "item.cobblemon.x_special_defence": "Resilience pills",
+  "item.cobblemon.x_special_attack": "Magic pills",
+  "item.cobblemon.dire_hit": "Critical pills",
+  "item.cobblemon.guard_spec": "Lockin' pills",
+  "item.cobblemon.full_heal": "Scurvy cure",
+  "item.cobblemon.antidote": "Antitoxin",
+  "item.cobblemon.awakening": "Splash up",
+  "item.cobblemon.burn_heal": "Flame calmer",
+  "item.cobblemon.ice_heal": "Bottle o' defrost",
+  "item.cobblemon.paralyze_heal": "Shock clearer",
+  "item.cobblemon.ether": "Skill brew",
+  "item.cobblemon.max_ether": "Full skill brew",
+  "item.cobblemon.elixir": "All skill brew",
+  "item.cobblemon.max_elixir": "All full skill brew",
+  "itemGroup.cobblemon.blocks": "Blocks",
+  "itemGroup.cobblemon.pokeball": "Monster capturers",
+  "itemGroup.cobblemon.agriculture": "Farmer's supplies",
+  "itemGroup.cobblemon.consumables": "Galley",
+  "itemGroup.cobblemon.held_item": "Tools o' th' monsters",
+  "itemGroup.cobblemon.evolution_item": "Transmogrification treasures",
  "block.cobblemon.apricorn_log": "Log o' fruitnut",
  "block.cobblemon.stripped_apricorn_log": "Bare log o' fruitnut",
  "block.cobblemon.apricorn_wood": "Fruitnut timber",
@@ -183,6 +284,7 @@
  "block.cobblemon.apricorn_button": "Knob o' fruitnut",
  "block.cobblemon.apricorn_slab": "Slab o' fruitnut",
  "block.cobblemon.apricorn_fence_gate": "Picket gate o' fruitnut",
+  "block.cobblemon.big_root": "Healthy root",
  "block.cobblemon.black_apricorn_sapling": "Black fruitnut meager shrub",
  "block.cobblemon.blue_apricorn_sapling": "Blue fruitnut meager shrub",
  "block.cobblemon.green_apricorn_sapling": "Green fruitnut meager shrub",
@@ -196,12 +298,24 @@
  "block.cobblemon.healing_machine.tooltip1": "Pow'rs up aft'r bein placed.",
  "block.cobblemon.healing_machine.tooltip2": "Gains pow'r o'er time.",
  "block.cobblemon.pc": "Box o' monsters",
+  "block.cobblemon.red_mint": "Scarlet seed o' mint",
+  "block.cobblemon.blue_mint": "Violet seed o' mint",
+  "block.cobblemon.cyan_mint": "Shore seed o' mint",
+  "block.cobblemon.pink_mint": "Flowery seed o' mint",
+  "block.cobblemon.green_mint": "Leafy seed o' mint",
+  "block.cobblemon.white_mint": "Bland seed o' mint",
+  "block.cobblemon.vivichoke_seeds": "Seed o' vitachoke",
+  "block.cobblemon.pep_up_flower": "Flower o' pep",
+  "block.cobblemon.potted_pep_up_flower": "Potted flower o' pep",
  "cobblemon.overflow_no_pc": "Ye crew be full, with nowhere ta' go!",
  "cobblemon.overflow_no_space": "Ye crew be full, and so be %1$s!",
  "cobblemon.overflow_to_pc": "Ye crew be full! %1$s be stowed away in %2$s.",
  "cobblemon.your_pc": "Ye box o' monsters",
  "cobblemon.command.pokespawn.invalid-pokemon": "Invalid monster name",
  "cobblemon.command.pokespawn.invalid-move": "Invalid action name",
+  "cobblemon.command.clearparty.nonethere": "There be no monsters in %1$s's crew.",
+  "cobblemon.command.clearparty.cleared": "Mutinied %1$s's crew.",
+  "cobblemon.command.clearpc.cleared": "Mutinied %1$s's box o' monsters.",
  "cobblemon.ui.generic.yes": "Aye",
  "cobblemon.ui.generic.no": "Nay",
  "cobblemon.ui.pokenav.title": "Navigator",
@@ -211,6 +325,8 @@
  "cobblemon.ui.starter.alreadyselected": "Ye already have a first mate!",
  "cobblemon.ui.starter.cannotchoose": "Ye cannot get a first mate now.",
  "cobblemon.ui.starter.hasalreadychosen": "%1$s has already picked a first mate.",
+  "cobblemon.ui.starter.choose_starter_title": "Choose ye first mate!",
+  "cobblemon.ui.starter.choose_starter_description": "Press th' \"%1$s\" key",
  "cobblemon.ui.starter.chooseyourstarter": "Press %1$s to pick a first mate and adventure!",
  "cobblemon.ui.moves": "Actions",
  "cobblemon.ui.moves.switch": "Switch actions",
@@ -237,6 +353,12 @@
  "cobblemon.ui.info.ability": "Trait",
  "cobblemon.ui.info.experience_points": "Magic orbs",
  "cobblemon.ui.info.to_next_level": "Lef ta' go",
+  "cobblemon.ui.trade": "Trade",
+  "cobblemon.trade.occupied": "%1$s be busy.",
+  "cobblemon.trade.request_expired": "Th' request to trade crewmates w'th %1$s be unwelcomed.",
+  "cobblemon.trade.request_already_expired": "Their crew trade request be expired already.",
+  "cobblemon.trade.request_sent": "Offer'd to trade w'th %1$s",
+  "cobblemon.trade.offer": "%1$s offer'd to trade crewmates with ye.",
  "cobblemon.ui.party": "Crew",
  "cobblemon.ui.power": "Damage",
  "cobblemon.ui.accuracy": "Shot rate",
@@ -245,6 +367,10 @@
  "cobblemon.ui.exit": "Shut",
  "cobblemon.ui.pc.box.title": "Box o' mates %1$s",
  "cobblemon.ui.pc.release": "Set free",
+  "cobblemon.ui.pasture": "Crew deck",
+  "cobblemon.ui.pasture.recall_all": "Recall roamin' crew",
+  "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)",
+  "cobblemon.pasture.too_many_nearby": "There be too many monster's nearby.",
  "key.cobblemon.upshiftparty": "Crew shift up",
  "key.cobblemon.downshiftparty": "Crew shift down",
  "key.cobblemon.hideparty": "Hide crew listing",
@@ -291,9 +417,150 @@
  "cobblemon.label.lv": "Lv. %1$s",
  "cobblemon.challenge_label": "Press %1$s to challenge.",
  "cobblemon.challenge.sender": "Ye challenged %1$s to battle!",
-  "cobblemon.challenge.receiver": "%1$s has challenged ye to battle! Press %2$s while lookin' at 'em to battle.",
+  "cobblemon.challenge.receiver": "%1$s challenged ye to combat!",
  "cobblemon.drop.item.inventory": "Ye received %2$s (%1$sx).",
  "cobblemon.drop.item.full": "Ya loot bag be full, so th' %1$s fell out.",
+  "cobblemon.mint.interact": "%1$s's stats be influenc'd!",
+  "cobblemon.mint.same_nature": "%1$s's values seem uninfluenced by th' %2$s.",
+  "itemGroup.cobblemon.plants": "Plants",
+  "item.cobblemon.aguav_berry": "Aguav berry",
+  "item.cobblemon.aguav_berry.tooltip": "Restores a third o' a monster's health, confuses those with lower'd Res, eaten at quarter health",
+  "item.cobblemon.apicot_berry": "Apicot berry",
+  "item.cobblemon.apicot_berry.tooltip": "Raises eater's Res by a stage, eaten at quarter health",
+  "item.cobblemon.aspear_berry": "Aspear berry",
+  "item.cobblemon.aspear_berry.tooltip": "Eater is unfrozen",
+  "item.cobblemon.babiri_berry": "Babiri berry",
+  "item.cobblemon.babiri_berry.tooltip": "Those weak to Metal attacks take less damage",
+  "item.cobblemon.belue_berry": "Belue berry",
+  "item.cobblemon.belue_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.bluk_berry": "Bluk berry",
+  "item.cobblemon.bluk_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.charti_berry": "Charti berry",
+  "item.cobblemon.charti_berry.tooltip": "Those weak to Stone attacks take less damage",
+  "item.cobblemon.cheri_berry": "Cheri berry",
+  "item.cobblemon.cheri_berry.tooltip": "Eater is cured of shocks",
+  "item.cobblemon.chesto_berry": "Chesto berry",
+  "item.cobblemon.chesto_berry.tooltip": "Eater wakes up",
+  "item.cobblemon.chilan_berry": "Chilan berry",
+  "item.cobblemon.chilan_berry.tooltip": "Basic attacks do less damage",
+  "item.cobblemon.chople_berry": "Chople berry",
+  "item.cobblemon.chople_berry.tooltip": "Those weak to Attacker attacks take less damage",
+  "item.cobblemon.coba_berry": "Coba berry",
+  "item.cobblemon.coba_berry.tooltip": "Those weak to Soarer attacks take less damage",
+  "item.cobblemon.colbur_berry": "Colbur berry",
+  "item.cobblemon.colbur_berry.tooltip": "Those weak to Demon attacks take less damage",
+  "item.cobblemon.cornn_berry": "Cornn berry",
+  "item.cobblemon.cornn_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.custap_berry": "Custap berry",
+  "item.cobblemon.custap_berry.tooltip": "Eater swiftly moves, at quarter health",
+  "item.cobblemon.durin_berry": "Durin berry",
+  "item.cobblemon.durin_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.enigma_berry": "Enigma berry",
+  "item.cobblemon.enigma_berry.tooltip": "Eater restores quarter health if hit with a weakness",
+  "item.cobblemon.figy_berry": "Figy berry",
+  "item.cobblemon.figy_berry.tooltip": "Restores a third o' a monster's health, confuses those with lower'd Power, eaten at quarter health",
+  "item.cobblemon.ganlon_berry": "Ganlon berry",
+  "item.cobblemon.ganlon_berry.tooltip": "Raises eater's Strength by a stage, eaten at quarter health",
+  "item.cobblemon.grepa_berry": "Grepa berry",
+  "item.cobblemon.grepa_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.haban_berry": "Haban berry",
+  "item.cobblemon.haban_berry.tooltip": "Those weak to Drake attacks take less damage",
+  "item.cobblemon.hondew_berry": "Hondew berry",
+  "item.cobblemon.hondew_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.hopo_berry": "Hopo berry",
+  "item.cobblemon.hopo_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.iapapa_berry": "Iapapa berry",
+  "item.cobblemon.iapapa_berry.tooltip": "Restores a third o' a monster's health, confuses those with lower'd Strength, eaten at quarter health",
+  "item.cobblemon.jaboca_berry": "Jaboca berry",
+  "item.cobblemon.jaboca_berry.tooltip": "Eater does an eighth damage to the creature who last hit it",
+  "item.cobblemon.kasib_berry": "Kasib berry",
+  "item.cobblemon.kasib_berry.tooltip": "Those weak to Spirit attacks take less damage",
+  "item.cobblemon.kebia_berry": "Kebia berry",
+  "item.cobblemon.kebia_berry.tooltip": "Those weak to Toxin attacks take less damage",
+  "item.cobblemon.kee_berry": "Kee berry",
+  "item.cobblemon.kee_berry.tooltip": "Raises eater's Strength by a stage, when melee'd",
+  "item.cobblemon.kelpsy_berry": "Kelpsy berry",
+  "item.cobblemon.kelpsy_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.lansat_berry": "Lansat berry",
+  "item.cobblemon.lansat_berry.tooltip": "Eater gains energy o' focus at quarter health",
+  "item.cobblemon.leppa_berry": "Leppa berry",
+  "item.cobblemon.leppa_berry.tooltip": "Restores 10PP to an action",
+  "item.cobblemon.liechi_berry": "Liechi berry",
+  "item.cobblemon.liechi_berry.tooltip": "Raises eater's Power by a stage, eaten at quarter health",
+  "item.cobblemon.lum_berry": "Lum berry",
+  "item.cobblemon.lum_berry.tooltip": "Eater heals status",
+  "item.cobblemon.mago_berry": "Mago berry",
+  "item.cobblemon.mago_berry.tooltip": "Restores a third o' a monster's health, confuses those with lower'd Speed, eaten at quarter health",
+  "item.cobblemon.magost_berry": "Magost berry",
+  "item.cobblemon.magost_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.maranga_berry": "Maranga berry",
+  "item.cobblemon.maranga_berry.tooltip": "Raises eater's Res by a stage, when magically attack'd",
+  "item.cobblemon.micle_berry": "Micle berry",
+  "item.cobblemon.micle_berry.tooltip": "Eater gains a 1.2x accuracy, eaten at quarter health",
+  "item.cobblemon.nanab_berry": "Nanab berry",
+  "item.cobblemon.nanab_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.touga_berry": "Touga berry",
+  "item.cobblemon.touga_berry.tooltip": "Eater is rebalanced",
+  "item.cobblemon.nomel_berry": "Nomel berry",
+  "item.cobblemon.nomel_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.occa_berry": "Occa berry",
+  "item.cobblemon.occa_berry.tooltip": "Those weak to Flame attacks take less damage",
+  "item.cobblemon.oran_berry": "Oran berry",
+  "item.cobblemon.oran_berry.tooltip": "Heals 10 health, eaten under half health",
+  "item.cobblemon.pamtre_berry": "Pamtre berry",
+  "item.cobblemon.pamtre_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.passho_berry": "Passho berry",
+  "item.cobblemon.passho_berry.tooltip": "Those weak to Ocean attacks take less damage",
+  "item.cobblemon.payapa_berry": "Payapa berry",
+  "item.cobblemon.payapa_berry.tooltip": "Those weak to Mental attacks take less damage",
+  "item.cobblemon.pecha_berry": "Pecha berry",
+  "item.cobblemon.pecha_berry.tooltip": "Eater is detoxin'd",
+  "item.cobblemon.persim_berry": "Persim berry",
+  "item.cobblemon.persim_berry.tooltip": "Eater is rebalanced",
+  "item.cobblemon.petaya_berry": "Petaya berry",
+  "item.cobblemon.petaya_berry.tooltip": "Raises eater's Magic by a stage, eaten at quarter health",
+  "item.cobblemon.pinap_berry": "Pinap berry",
+  "item.cobblemon.pinap_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.pomeg_berry": "Pomeg berry",
+  "item.cobblemon.pomeg_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.qualot_berry": "Qualot berry",
+  "item.cobblemon.qualot_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.rabuta_berry": "Rabuta berry",
+  "item.cobblemon.rabuta_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.rawst_berry": "Rawst berry",
+  "item.cobblemon.rawst_berry.tooltip": "Eater is extinguished",
+  "item.cobblemon.razz_berry": "Razz berry",
+  "item.cobblemon.razz_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.rindo_berry": "Rindo berry",
+  "item.cobblemon.rindo_berry.tooltip": "Those weak to Plant attacks take less damage",
+  "item.cobblemon.roseli_berry": "Roseli berry",
+  "item.cobblemon.roseli_berry.tooltip": "Those weak to Fae attacks take less damage",
+  "item.cobblemon.rowap_berry": "Rowap berry",
+  "item.cobblemon.rowap_berry.tooltip": "Eater does an eighth damage to the creature who last cast on it",
+  "item.cobblemon.salac_berry": "Salac berry",
+  "item.cobblemon.salac_berry.tooltip": "Raises eater's Speed by a stage, eaten at quarter health",
+  "item.cobblemon.shuca_berry": "Shuca berry",
+  "item.cobblemon.shuca_berry.tooltip": "Those weak to Land attacks take less damage",
+  "item.cobblemon.sitrus_berry": "Sitrus berry",
+  "item.cobblemon.sitrus_berry.tooltip": "Heals quarter health, eaten under half health",
+  "item.cobblemon.spelon_berry": "Spelon berry",
+  "item.cobblemon.spelon_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.starf_berry": "Starf berry",
+  "item.cobblemon.starf_berry.tooltip": "Raises stat harshly at quarter health",
+  "item.cobblemon.tamato_berry": "Tamato berry",
+  "item.cobblemon.tamato_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.tanga_berry": "Tanga berry",
+  "item.cobblemon.tanga_berry.tooltip": "Those weak to Critter attacks take less damage",
+  "item.cobblemon.wacan_berry": "Wacan berry",
+  "item.cobblemon.wacan_berry.tooltip": "Those weak to Thund'r attacks take less damage",
+  "item.cobblemon.watmel_berry": "Watmel berry",
+  "item.cobblemon.watmel_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.wepear_berry": "Wepear berry",
+  "item.cobblemon.wepear_berry.tooltip": "Can't be eaten directly",
+  "item.cobblemon.wiki_berry": "Wiki berry",
+  "item.cobblemon.wiki_berry.tooltip": "Restores a third o' a monster's health, confuses those with lower'd Magic, eaten at quarter health",
+  "item.cobblemon.yache_berry": "Yache berry",
+  "item.cobblemon.yache_berry.tooltip": "Those weak to Frozen attacks take less damage",
  "cobblemon.command.general.invalid-party-slot": "There be no monster in slot %1$s!",
  "cobblemon.command.givepokemon.give": "Given %1$s to %2$s.",
  "cobblemon.command.pokemonedit": "Modified %2$s's %1$s.",
@@ -305,10 +572,19 @@
  "cobblemon.command.spawnpokemon.nospecies": "Arr, ye need to include a monster's name or 'random'",
  "cobblemon.command.held_item": "%1$s' %2$s was given th' %3$s ta' hold.",
  "cobblemon.command.pokeheal.in_battle": "Ye cannot heal your crew while in combat!",
+  "cobblemon.command.spawnpokemonfrompool": "Bewarn, %1$s be spawned around ye.",
+  "cobblemon.command.spawnpokemonfrompool.unable_to_spawn": "Can't ship a monster here.",
+  "cobblemon.command.pokebox.box_does_not_exist": "That captain don't have a box %1$s.",
+  "cobblemon.command.pokebox.box_is_full": "That captain's box %1$s already be at capacity.",
+  "cobblemon.command.pokebox.storage_is_full": "That captain's cargo be max'd.",
+  "cobblemon.command.pokebox.last_pokemon": "That captain's last monster wasn't shipped ta' the box o' monsters.",
+  "cobblemon.command.pokemonrestart": "Mutinied all o' %1$s's crew.",
  "advancements.cobblemon.root": "Th' Seas of Cobblemon!",
+  "advancements.cobblemon.root.description": "Pick a first mate, and set sail!",
  "advancements.cobblemon.obtain_leftovers": "Reuse o' th' core!",
  "advancements.cobblemon.obtain_leftovers.description": "Keep th' scurvy's cure core as a scrap o' apple.",
-  "advancements.cobblemon.root.description": "Pick a first mate, and set sail!",
+  "advancements.cobblemon.any_plant": "Bounty o' mother nature",
+  "advancements.cobblemon.any_plant.description": "Get a landlubber's green thumb on!",
  "advancements.cobblemon.harvest_apricorn": "Be it a Fruit or a Nut?",
  "advancements.cobblemon.harvest_apricorn.description": "Right-click to harvest a fully-grown fruitnut",
  "advancements.cobblemon.harvest_apricorn_seed": "Spreadin' seeds",
@@ -328,7 +604,7 @@
  "advancements.cobblemon.first_catch": "Second mate!",
  "advancements.cobblemon.first_catch.description": "Use a monster capturer and catch a monster",
  "advancements.cobblemon.full_party": "All hands on deck",
-  "advancements.cobblemon.full_party.description": "Fill your crew with monsters",
+  "advancements.cobblemon.full_party.description": "Fill your active crew with monsters",
  "advancements.cobblemon.first_evolution": "Monster magic",
  "advancements.cobblemon.first_evolution.description": "Transmogrify a monster from their breakdown page",
  "advancements.cobblemon.first_battle_victory": "No time to parley",
@@ -337,9 +613,58 @@
  "advancements.cobblemon.first_shiny_catch.description": "Catch a rare color monster",
  "advancements.cobblemon.healing_machine": "Voodoo power",
  "advancements.cobblemon.healing_machine.description": "Wait around for a bed o' science to have enough magic to heal yer crew",
+  "advancements.cobblemon.obtain_leek": "Leek in th' ship!",
+  "advancements.cobblemon.obtain_leek.description": "Collect a medicinal leek, a crop that grows on th' waters",
+  "advancements.cobblemon.medicinal_brew": "Witchdoctor's brews",
+  "advancements.cobblemon.medicinal_brew.description": "Brew a brew o' potions outta a medicinal leek",
+  "advancements.cobblemon.brew_potion": "Brews o' restoration",
+  "advancements.cobblemon.brew_potion.description": "Use an oran berry to brew a brew o' healing out o' a brew o' potions",
+  "advancements.cobblemon.brew_full_restore": "Powerful brew",
+  "advancements.cobblemon.brew_full_restore.description": "Brew potions stronger, until ye get a restoration brew from a full brew o' creature healin' and a lum berry",
+  "advancements.cobblemon.brew_all": "Brews on brews",
+  "advancements.cobblemon.brew_all.description": "Brew all possible brews",
+  "advancements.cobblemon.obtain_mint": "Freshest mints",
+  "advancements.cobblemon.obtain_mint.description": "Find a mint o' nature, some leaves that grow on the grass o' mountains",
+  "advancements.cobblemon.obtain_all_mints": "Barrel o' mints",
+  "advancements.cobblemon.obtain_all_mints.description": "Gather all six types of leaves o' mint",
+  "advancements.cobblemon.obtain_revival_herb": "Caved herbs",
+  "advancements.cobblemon.obtain_revival_herb.description": "Find a herb o' resurrection, a crop growing in the moldy caves",
+  "advancements.cobblemon.use_revive": "Ship shape once more!",
+  "advancements.cobblemon.use_revive.description": "Use any form o' th' resurrection crops to bring a monster back to life",
+  "advancements.cobblemon.obtain_big_root": "Root o' healin'",
+  "advancements.cobblemon.obtain_big_root.description": "Find a healthy root, growing under the surface",
+  "advancements.cobblemon.craft_remedy": "Remedic healing",
+  "advancements.cobblemon.craft_remedy.description": "Create a remedy, a solid form o' healing for the early days",
+  "advancements.cobblemon.obtain_vivichoke": "Oki-Doki Vivichokey",
+  "advancements.cobblemon.obtain_vivichoke.description": "Get a seed o' vivichokes, a scarce 'nd rare treasure",
+  "advancements.cobblemon.obtain_berry": "Many o' berry",
+  "advancements.cobblemon.obtain_berry.description": "Find a berry, a set o' crops with many a use",
+  "advancements.cobblemon.obtain_mutated_berry": "Unexpected berries",
+  "advancements.cobblemon.obtain_mutated_berry.description": "Plant some berry trees together, and let them mingle",
+  "advancements.cobblemon.obtain_all_berries": "All th' berries!",
+  "advancements.cobblemon.obtain_all_berries.description": "Obtain all o' th' berry species",
+  "advancements.cobblemon.use_pasture": "Crew, on deck",
+  "advancements.cobblemon.use_pasture.description": "Craft a block o' crew deck, and let ye crew walk about",
+  "advancements.cobblemon.catch_all_vivillon": "Worldwide wings",
+  "advancements.cobblemon.catch_all_vivillon.description": "Find all th' patterns a Vivillon can have",
+  "advancements.cobblemon.evolve_veevees": "Veevee vault",
+  "advancements.cobblemon.evolve_veevees.description": "Transmogrify the monster Eevee 8 different ways",
+  "advancements.cobblemon.evolve_shedinja": "Stowaway",
+  "advancements.cobblemon.evolve_shedinja.description": "Have a spare monster capturer on ye, and get the husk Shedinja",
+  "advancements.cobblemon.trade_pokemon": "Parlay!",
+  "advancements.cobblemon.trade_pokemon.description": "Trade monsters with another captain",
+  "advancements.cobblemon.trade_shelmet_karrablast": "Pirate on deck!",
+  "advancements.cobblemon.trade_shelmet_karrablast.description": "Trade Shelmet 'nd Karrablast",
+  "advancements.cobblemon.max_level_baby": "Law of the seas",
+  "advancements.cobblemon.max_level_baby.description": "Take a monster who never transmogrified, but could, all the way to level 100",
+  "advancements.cobblemon.use_candy": "Candies o' growths",
+  "advancements.cobblemon.use_candy.description": "Use a candy o' experiences on a monster",
+  "advancements.cobblemon.own_zangoose_seviper": "Undesired alliances",
+  "advancements.cobblemon.own_zangoose_seviper.description": "Force a Zangoose 'nd Seviper to fight for the same crew",
+  "cobblemon.battle.crash": "A battle error occurred. If on a lonely voyage, report this to th' dev crew. Otherwise, report this to the server's crew.",
  "cobblemon.battle.damage_dealt": "%1$s took %2$s hurt!",
-  "cobblemon.battle.used_move": "%1$s used %2$s!",
-  "cobblemon.battle.used_move_on": "%1$s used %2$s on %3$s!",
+  "cobblemon.battle.used_move": "%1$s be usin' %2$s!",
+  "cobblemon.battle.used_move_on": "%1$s be usin' %2$s on %3$s!",
  "cobblemon.battle.choose_actions": "What will ye do?",
  "cobblemon.battle.owned_pokemon": "%1$s's %2$s",
  "cobblemon.battle.fainted": "%1$s's been scuttled!",
@@ -356,14 +681,19 @@
  "cobblemon.battle.crit": "It was a critical blow!",
  "cobblemon.battle.nothing": "Avast! Nothin' 'appened!",
  "cobblemon.battle.clearallboost": "Improvements were careened.",
+  "cobblemon.battle.clearallnegativeboost": "%1$s's reduct've stat changes be cleared!",
+  "cobblemon.battle.clearallnegativeboost.zeffect": "%1$s's reduct've stat changes be cleared, thanks to th' Z-Power!",
  "cobblemon.battle.unboost.slight": "%1$s's %2$s was reduced.",
  "cobblemon.battle.unboost.sharp": "%1$s's %2$s be falling quick.",
  "cobblemon.battle.unboost.severe": "%1$s's %2$s is becalmed.",
  "cobblemon.battle.unboost.cap.single": "%1$s's %2$s be at Davy Jones' Locker.",
  "cobblemon.battle.unboost.cap.multiple": "%1$s's values be at Davy Jones' Locker.",
  "cobblemon.battle.boost.slight": "%1$s's %2$s improved.",
+  "cobblemon.battle.boost.slight.zeffect": "%1$s increased %2$s using th' Z-Power!",
  "cobblemon.battle.boost.sharp": "%1$s's %2$s rose handsomely.",
+  "cobblemon.battle.boost.sharp.zeffect": "%1$s increased %2$s harshly using th' Z-Power!",
  "cobblemon.battle.boost.severe": "%1$s's %2$s comes about.",
+  "cobblemon.battle.boost.severe.zeffect": "%1$s increased %2$s full sail using th' Z-Power!",
  "cobblemon.battle.boost.cap.single": "%1$s's %2$s be at the crow's nest.",
  "cobblemon.battle.boost.cap.multiple": "%1$s's be at the crow's nest.",
  "cobblemon.battle.setboost.bellydrum": "%1$s cut its own life to maximise its power!",
@@ -381,162 +711,247 @@
  "cobblemon.capture.not_single": "Ye can only capture wild monsters in a one on one duel.",
  "cobblemon.you_in_battle": "Ye can't do that while in combat!",
  "cobblemon.battle.turn": "It now be round %1$s",
-  "cobblemon.battle.rain_dance": "It started rainin'!",
-  "cobblemon.battle.rain_dance_upkeep": "Rain continues to bucket.",
-  "cobblemon.battle.sandstorm": "A sandstorm brews!",
-  "cobblemon.battle.sandstorm_buffeted": "%1$s was buffeted by th' sandstorm.",
-  "cobblemon.battle.sandstorm_upkeep": "Th' sandstorm rages.",
-  "cobblemon.battle.sunny_day": "Th' sunlight turned harsh!",
-  "cobblemon.battle.sunny_day_upkeep": "Th' sunlight is cookin'.",
-  "cobblemon.battle.hail": "Th' sky spits ice!",
-  "cobblemon.battle.hail_upkeep": "Th' hail is crashing down.",
-  "cobblemon.battle.hail_buffeted": "%1$s was smacked upside by hail.",
-  "cobblemon.battle.no_weather": "Th' weather clears up.",
-  "cobblemon.battle.confusion_start": "%1$s be confused!",
-  "cobblemon.battle.confusion_activate": "%1$s hit itself, th' darn thing's confused!",
-  "cobblemon.battle.confusion_snapped": "%1$s snapped out o' its confusion!",
-  "cobblemon.battle.protect_start": "%1$s battons down!",
-  "cobblemon.battle.protect_activate": "%1$s be protected!",
-  "cobblemon.battle.magnitude_level": "Rockin' shakes %1$s!",
-  "cobblemon.battle.bide_start": "%1$s be storin' power!",
-  "cobblemon.battle.bide_activate": "%1$s be storin' power!",
-  "cobblemon.battle.bide_end": "%1$s released their power!",
-  "cobblemon.battle.field_start.electric_terrain": "Th' ground be charged!",
-  "cobblemon.battle.field_start.grassy_terrain": "Th' ground gets mossy!",
-  "cobblemon.battle.field_start.gravity": "Everything be pulled t'wards th' ground!",
-  "cobblemon.battle.field_start.magic_room": "Th' field forces loot to stop workin'!",
-  "cobblemon.battle.field_start.misty_terrain": "Mist swirls around th' area!",
-  "cobblemon.battle.field_start.mud_sport": "Thund'r elementals be weakened!",
-  "cobblemon.battle.field_start.psychic_terrain": "Th' battlefield got weird!",
-  "cobblemon.battle.field_start.trick_room": "%1$s twisted th' dimensions!",
-  "cobblemon.battle.field_start.water_sport": "Flames be weakened!",
-  "cobblemon.battle.field_start.wonder_room": "Ye strength and resilience be swapped!",
-  "cobblemon.battle.field_end.electric_terrain": "Th' electricity disappeared from th' battlefield.",
-  "cobblemon.battle.field_end.grassy_terrain": "Th' moss disappeared from th' battlefield.",
-  "cobblemon.battle.field_end.gravity": "Grav'ty be calmed now!",
-  "cobblemon.battle.field_end.magic_room": "Magic room wore off, and held items' effects returned to normal!",
-  "cobblemon.battle.field_end.misty_terrain": "Th' mist disappeared from th' battlefield.",
-  "cobblemon.battle.field_end.mud_sport": "Th' effects of mud sport have faded.",
-  "cobblemon.battle.field_end.psychic_terrain": "Th' weirdness disappeared from th' battlefield!",
-  "cobblemon.battle.field_end.trick_room": "Th' twisted dimensions returned to normal!",
-  "cobblemon.battle.field_end.water_sport": "Th' effects of water sport have faded.",
-  "cobblemon.battle.field_end.wonder_room": "Wonder room wore off, and strength and resilience returned to normal!",
-  "cobblemon.battle.cant.generic_block": "%1$s ain't able ta' use %2$s!",
+  "cobblemon.battle.side_subject.ally": "yer",
+  "cobblemon.battle.side_subject.opponent": "th' enemy",
+  "cobblemon.battle.weather.raindance.start": "It started rainin'!",
+  "cobblemon.battle.weather.raindance.upkeep": "Rain continues to bucket.",
+  "cobblemon.battle.weather.raindance.end": "Th' storm subsides.",
+  "cobblemon.battle.weather.sandstorm.start": "A sandstorm brews!",
+  "cobblemon.battle.weather.sandstorm.upkeep": "Th' sandstorm rages.",
+  "cobblemon.battle.weather.sandstorm.end": "Th' sandstorm dies down.",
+  "cobblemon.battle.weather.sunnyday.start": "Th' sunlight turned harsh!",
+  "cobblemon.battle.weather.sunnyday.upkeep": "Th' sunlight is cookin'.",
+  "cobblemon.battle.weather.sunnyday.end": "Th' sunlight fades out.",
+  "cobblemon.battle.weather.hail.start": "Th' sky spits ice!",
+  "cobblemon.battle.weather.hail.upkeep": "Th' hail is crashing down.",
+  "cobblemon.battle.weather.hail.end": "Th' hailin' ice subsides.",
+  "cobblemon.battle.start.bide": "%1$s be storin' power!",
+  "cobblemon.battle.start.yawn": "%1$s be gettin' drowsy!",
+  "cobblemon.battle.start.perish": "%2$s rounds left 'til th' siren song claims %1$s.",
+  "cobblemon.battle.start.leechseed": "%1$s be plantered!",
+  "cobblemon.battle.start.aquaring": "%1$s be cloak'd in th' veiling waves!",
+  "cobblemon.battle.start.charge": "%1$s be buildin' charge!",
+  "cobblemon.battle.start.taunt": "%1$s be taunted!",
+  "cobblemon.battle.start.autotomize": "%1$s be nimble!",
+  "cobblemon.battle.start.attract": "%1$s's heart be captured!",
+  "cobblemon.battle.start.focusenergy": "%1$s be gettin' pumped!",
+  "cobblemon.battle.start.uproar": "%1$s rallied a mutiny!",
+  "cobblemon.battle.start.curse": "%1$s sacrificed its health ta' curse %2$s!",
+  "cobblemon.battle.start.miracleeye": "%1$s be identified!",
+  "cobblemon.battle.start.dynamax": "%1$s grew like a kraken!",
+  "cobblemon.battle.start.gmax": "%1$s grew into a kraken!",
+  "cobblemon.battle.fieldstart.electricterrain": "Th' ground be charged!",
+  "cobblemon.battle.fieldstart.grassyterrain": "Th' ground gets mossy!",
+  "cobblemon.battle.fieldstart.gravity": "Everything be pulled t'wards th' ground!",
+  "cobblemon.battle.fieldstart.magicroom": "Th' field forces loot to stop workin'!",
+  "cobblemon.battle.fieldstart.mistyterrain": "Mist swirls around th' area!",
+  "cobblemon.battle.fieldstart.mudsport": "Thund'r elementals be weakened!",
+  "cobblemon.battle.fieldstart.psychicterrain": "Th' battlefield got weird!",
+  "cobblemon.battle.fieldstart.trickroom": "%1$s twisted th' dimensions!",
+  "cobblemon.battle.fieldstart.watersport": "Flames be weakened!",
+  "cobblemon.battle.fieldstart.wonderroom": "Ye strength and resilience be swapped!",
+  "cobblemon.battle.fieldend.electricterrain": "Th' electricity disappeared from th' battlefield.",
+  "cobblemon.battle.fieldend.grassyterrain": "Th' moss disappeared from th' battlefield.",
+  "cobblemon.battle.fieldend.gravity": "Grav'ty be calmed now!",
+  "cobblemon.battle.fieldend.magicroom": "Magic room wore off, an' held items' effects be back to normal!",
+  "cobblemon.battle.fieldend.mistyterrain": "Th' mist disappeared from th' battlefield.",
+  "cobblemon.battle.fieldend.mudsport": "Th' effects of mud sport have faded.",
+  "cobblemon.battle.fieldend.psychicterrain": "Th' weirdness disappeared from th' battlefield!",
+  "cobblemon.battle.fieldend.trickroom": "Th' twisted dimensions returned to normal!",
+  "cobblemon.battle.fieldend.watersport": "Th' effects of water sport have faded.",
+  "cobblemon.battle.fieldend.wonderroom": "Wonder room wore off, and strength and resilience returned to normal!",
+  "cobblemon.battle.fieldactivate.perishsong": "All monsters tha' heard th' siren song will fall in three rounds!",
+  "cobblemon.battle.sidestart.stealthrock": "Sharp stones be scattered o'er %1$s deck!",
+  "cobblemon.battle.sidestart.spikes": "Spike traps be scattered across %1$s deck!",
+  "cobblemon.battle.sidestart.toxicspikes": "Tainted spike traps be scattered across %1$s deck!",
+  "cobblemon.battle.sidestart.stickyweb": "%1$s deck be coated in cobweb!",
+  "cobblemon.battle.sidestart.reflect": "Th' reflector wall makes %1$s crew strong 'gainst power attacks!",
+  "cobblemon.battle.sidestart.lightscreen": "Th' screen o' light makes %1$s crew resistant ta' magic!",
+  "cobblemon.battle.sidestart.auroraveil": "Th' veil o' aurora makes %1$s crew strong 'n' resiliant 'gainst all foe attacks!",
+  "cobblemon.battle.sidestart.tailwind": "%1$s crew's sails be full o' wind!",
+  "cobblemon.battle.sidestart.safeguard": "%1$s's crew be cloaked in a mystic'l veil!",
+  "cobblemon.battle.sideend.stealthrock": "Th' sharp stones be swept off %1$s deck!",
+  "cobblemon.battle.sideend.spikes": "Th' spike traps be swept off %1$s deck!",
+  "cobblemon.battle.sideend.toxicspikes": "Th' tainted spike traps be swept off %1$s deck!",
+  "cobblemon.battle.sideend.stickyweb": "Th' cobwebs be swept off %1$s deck",
+  "cobblemon.battle.sideend.reflect": "%1$s crew's reflector wall rotted out!",
+  "cobblemon.battle.sideend.lightscreen": "%1$s crew's screen o' light rotted out!",
+  "cobblemon.battle.sideend.auroraveil": "%1$s crew's veil set o'er the horizon!",
+  "cobblemon.battle.sideend.tailwind": "%1$s crew's sails be emptied out!",
+  "cobblemon.battle.sideend.safeguard": "%1$s's crew be unsafeguard'd now!",
+  "cobblemon.battle.cant.generic": "%1$s ain't able ta' use %2$s!",
  "cobblemon.battle.cant.truant": "%1$s be loafin' around!",
-  "cobblemon.battle.cant.flinched": "Bilge-sucker! %1$s flinched!",
+  "cobblemon.battle.cant.flinch": "Bilge-sucker! %1$s flinched!",
  "cobblemon.battle.cant.recharge": "%1$s must rechart!",
  "cobblemon.battle.cant.attract": "%1$s be stilled by affections of th' heart!",
  "cobblemon.battle.cant.disable": "%1$s' %2$s be disabled!",
-  "cobblemon.battle.cant.focus_punch": "%1$s lost focus, bilge rats!",
-  "cobblemon.battle.cant.heal_block": "%1$s can't use %2$s because o' th' healin' blockade!",
+  "cobblemon.battle.cant.focuspunch": "%1$s lost focus, bilge rats!",
+  "cobblemon.battle.cant.healblock": "%1$s can't use %2$s because o' th' healin' blockade!",
  "cobblemon.battle.cant.imprison": "%2$s be sealed, %1$s can't use it!",
  "cobblemon.battle.cant.gravity": "%1$s can't use %2$s because o' grav'ty!",
-  "cobblemon.battle.cant.shell_trap": "%1$s's shell trap didn't spring!",
+  "cobblemon.battle.cant.shelltrap": "%1$s's shell trap didn't spring!",
  "cobblemon.battle.cant.taunt": "%1$s be taunted by the enemy, no time to use %2$s!",
-  "cobblemon.battle.cant.throat_chop": "Th' throat chop be preventin' %1$s from vocalizin'!",
-  "cobblemon.battle.cant.no_pp": "%1$s can't use %2$s, it be out of PP!",
+  "cobblemon.battle.cant.throatchop": "Th' throat chop be preventin' %1$s from vocalizin'!",
+  "cobblemon.battle.activate.confusion": "%1$s be confused!",
  "cobblemon.battle.activate.gravity": "%1$s couldn't stay airborne because o' th' grav'ty!",
-  "cobblemon.battle.activate.misty_terrain": "%1$s be shrouded in protective mists!",
-  "cobblemon.battle.activate.psychic_terrain": "%1$s be surrounded in th' weirdness!",
-  "cobblemon.battle.activate.heal_bell": "A bell be chiming!",
+  "cobblemon.battle.activate.mistyterrain": "%1$s be shrouded in protective mists!",
+  "cobblemon.battle.activate.psychicterrain": "%1$s be surrounded in th' weirdness!",
+  "cobblemon.battle.activate.healbell": "A bell be chiming!",
  "cobblemon.battle.activate.aromatherapy": "A soothing aroma wafted by!",
  "cobblemon.battle.activate.trapped": "%1$s be trapped, no chance of fleeing!",
-  "cobblemon.battle.activate.bind": "%1$s was squeezed by %2$s!",
-  "cobblemon.battle.activate.court_change": "%1$s swapped th' battle effects affecting each side o' th' field!",
-  "cobblemon.battle.activate.guard_split": "%1$s shared their guard with th' target!",
+  "cobblemon.battle.activate.bind": "%1$s be squeezed by %2$s!",
+  "cobblemon.battle.activate.wrap": "%1$s be wrapped by %2$s!",
+  "cobblemon.battle.activate.struggle": "%1$s be out o' actions!",
+  "cobblemon.battle.activate.courtchange": "%1$s swapped th' battle effects affecting each side o' th' field!",
+  "cobblemon.battle.activate.guardsplit": "%1$s shared their guard with th' target!",
  "cobblemon.battle.activate.spite": "Th' PP o' %1$s's %2$s reduced by %3$s!",
-  "cobblemon.battle.prepare.bounce": "%1$s sprang up!",
+  "cobblemon.battle.activate.lockon": "%1$s locked sights on %2$s!",
+  "cobblemon.battle.activate.protosynthesis": "Th' scorchin' sun trigger'd %1$s's protosynthesis!",
+  "cobblemon.battle.activate.bide": "%1$s be storin' power!",
+  "cobblemon.battle.activate.protect": "%1$s be protected!",
+  "cobblemon.battle.activate.magnitude": "Rockin' shakes %1$s!",
+  "cobblemon.battle.activate.destinybond": "%1$s dragged th' foe down to Davy Jones with 'em!",
+  "cobblemon.battle.activate.synchronize": "%1$s synchronizes",
+  "cobblemon.battle.activate.endure": "%1$s endured th' blow!",
+  "cobblemon.battle.activate.attract": "%1$s be charm'd by %2$s!",
+  "cobblemon.battle.activate.firespin": "%1$s be caught in th' raging fire!",
+  "cobblemon.battle.activate.trick": "%1$s traded loot!",
+  "cobblemon.battle.activate.quickclaw": "%1$s be able to break away and act, thanks to th' sneaky swift claw!",
+  "cobblemon.battle.activate.focusband": "%1$s be hung standin' thanks ta' th' %2$s!",
+  "cobblemon.battle.activate.forewarn": "%1$s's %2$s be known!",
+  "cobblemon.battle.activate.disguise": "It's disguise was a good decoy!",
+  "cobblemon.battle.activate.liquidooze": "%1$s sucked up th' ooze!",
+  "cobblemon.battle.activate.whirlpool": "%1$s be caught in th' raging waves!",
+  "cobblemon.battle.activate.clamp": "%2$s clamp'd down on %1$s!",
+  "cobblemon.battle.prepare.bounce": "%1$s launched skyward!",
  "cobblemon.battle.prepare.dig": "%1$s burrowed its way under th' ground!",
-  "cobblemon.battle.prepare.dive": "%1$s hid underwater!",
-  "cobblemon.battle.prepare.fly": "%1$s flew up high!",
-  "cobblemon.battle.prepare.freeze_shock": "%1$s became cloaked in a freezing light!",
-  "cobblemon.battle.prepare.geomancy": "%1$s is absorbing power!",
-  "cobblemon.battle.prepare.ice_burn": "%1$s became cloaked in freezing air!",
-  "cobblemon.battle.prepare.meteor_beam": "%1$s is overflowing with space power!",
-  "cobblemon.battle.prepare.phantom_force": "%1$s vanished instantly!",
-  "cobblemon.battle.prepare.razor_wind": "%1$s whipped up a whirlwind!",
-  "cobblemon.battle.prepare.skull_bash": "%1$s tucked in its head!",
-  "cobblemon.battle.prepare.sky_attack": "%1$s became cloaked in a harsh light!",
-  "cobblemon.battle.prepare.sky_drop": "%1$s took its target into th' sky!",
-  "cobblemon.battle.prepare.solar_beam": "%1$s absorbed light!",
-  "cobblemon.battle.swapboost.generic": "%1$s swapped stat boosts with %2$s!",
-  "cobblemon.battle.singleturn.protect": "%1$s protected itself!",
-  "cobblemon.battle.singleturn.endure": "%1$s braced itself!",
-  "cobblemon.battle.singleturn.crafty_shield": "Crafty Shield protected %1$s's crew!",
-  "cobblemon.battle.singleturn.powder": "%1$s is covered in powder!",
-  "cobblemon.battle.singleturn.follow_me": "%1$s became th' court fool!",
-  "cobblemon.battle.singleturn.snatch": "%1$s is waiting for a target to make a move!",
-  "cobblemon.battle.singleturn.quick_guard": "Quick Guard protected %1$s's team!",
-  "cobblemon.battle.singleturn.wide_guard": "Wide Guard protected %1$s's team!",
-  "cobblemon.battle.singleturn.roost": "(%1$s loses Flying type this turn.)",
-  "cobblemon.battle.singleturn.mat_block": "%1$s intends to flip up a mat and block incoming attacks!",
-  "cobblemon.battle.singleturn.max_guard": "%1$s protected itself!",
-  "cobblemon.battle.singleturn.instruct": "%1$s followed %2$s's instructions!",
-  "cobblemon.battle.singleturn.focus_punch": "%1$s is tightening its focus!",
-  "cobblemon.battle.singleturn.electrify": "%1$s's moves have been electrified!",
-  "cobblemon.battle.singleturn.beak_blast": "%1$s started heating up its beak!",
-  "cobblemon.battle.singleturn.helping_hand": "%2$s is ready to help %1$s!",
-  "cobblemon.battle.singleturn.magic_coat": "%1$s shrouded itself with Magic Coat!",
-  "cobblemon.battle.singleturn.rage_powder": "%1$s became the center of attention!",
-  "cobblemon.battle.singleturn.shell_trap": "%1$s set a shell trap!",
+  "cobblemon.battle.prepare.dive": "%1$s dove b'neath th' waves!",
+  "cobblemon.battle.prepare.fly": "%1$s rose to th' skies!",
+  "cobblemon.battle.prepare.freezeshock": "%1$s be cloaked in frozen sparkin' light!",
+  "cobblemon.battle.prepare.geomancy": "%1$s be absorbing life energy!",
+  "cobblemon.battle.prepare.iceburn": "%1$s be cloaked in frozen burnin' air!",
+  "cobblemon.battle.prepare.meteorbeam": "Star pow'r flows out o' %1$s!",
+  "cobblemon.battle.prepare.phantomforce": "%1$s slipped to shadow!",
+  "cobblemon.battle.prepare.razorwind": "%1$s caused a whirlwind!",
+  "cobblemon.battle.prepare.skullbash": "%1$s pulled its head in!",
+  "cobblemon.battle.prepare.skyattack": "%1$s be glowin' with a harsh light!",
+  "cobblemon.battle.prepare.skydrop": "%1$s took its target into th' sky!",
+  "cobblemon.battle.prepare.solarbeam": "%1$s draws in light!",
+  "cobblemon.battle.swapboost.generic": "%1$s switched improvements with %2$s!",
+  "cobblemon.battle.singleturn.protect": "%1$s be protected!",
+  "cobblemon.battle.singleturn.endure": "%1$s be braced!",
+  "cobblemon.battle.singleturn.craftyshield": "Crafty shield protected %1$s's crew!",
+  "cobblemon.battle.singleturn.powder": "%1$s be coated with powder!",
+  "cobblemon.battle.singleturn.followme": "%1$s became th' court jester!",
+  "cobblemon.battle.singleturn.snatch": "%1$s be watching for a foe tryin' ta' improve!",
+  "cobblemon.battle.singleturn.quickguard": "%1$s's crew be protected by their hasty guard!",
+  "cobblemon.battle.singleturn.wideguard": "%1$s's crew be protected by th' wide defenses!",
+  "cobblemon.battle.singleturn.roost": "(%1$s no longer be a soarer for the round.)",
+  "cobblemon.battle.singleturn.matblock": "%1$s plans ta' flip up a floorboard to block attacks!",
+  "cobblemon.battle.singleturn.maxguard": "%1$s be protected!",
+  "cobblemon.battle.singleturn.instruct": "%1$s obeyed %2$s's orders!",
+  "cobblemon.battle.singleturn.focuspunch": "%1$s be focusing in!",
+  "cobblemon.battle.singleturn.electrify": "%1$s's moves be filled with thund'r!",
+  "cobblemon.battle.singleturn.beakblast": "%1$s be warming th' bill!",
+  "cobblemon.battle.singleturn.helpinghand": "%2$s lends %1$s a hand!",
+  "cobblemon.battle.singleturn.magiccoat": "%1$s shrouded itself in a magic coat!",
+  "cobblemon.battle.singleturn.ragepowder": "%1$s became th' court jester!",
+  "cobblemon.battle.singleturn.shelltrap": "%1$s traps th' shell!",
  "cobblemon.battle.singleturn.spotlight": "%1$s became th' court jester!",
-  "cobblemon.battle.singlemove.destiny_bond": "%1$s is hoping to take its attacker down with it!",
-  "cobblemon.battle.singlemove.glaive_rush": "%1$s throws itself into a reckless charge!",
-  "cobblemon.battle.singlemove.grudge": "%1$s wants its target to bear a grudge!",
-  "cobblemon.battle.singlemove.rage": "%1$s goes into a rage!",
-  "cobblemon.battle.end.bind": "%1$s is no longer being squeezed!",
-  "cobblemon.battle.set_hp.pain_split": "Th' battlers shared their pain!",
-  "cobblemon.battle.ability.sturdy": "%1$s endured the hit!",
-  "cobblemon.battle.ability.speed_boost": "%1$s's Speed Boost activated!",
-  "cobblemon.battle.ability.intimidate": "%1$s's Intimidate activated!",
+  "cobblemon.battle.singlemove.destinybond": "%1$s plans to go ta' Davy Jones with th' foe in tow!",
+  "cobblemon.battle.singlemove.glaiverush": "%1$s be chargin' recklessly!",
+  "cobblemon.battle.singlemove.grudge": "%1$s sets up th' foe to hold a grudge!",
+  "cobblemon.battle.singlemove.rage": "%1$s be in a rage fury!",
+  "cobblemon.battle.damage.wrap": "%1$s be wrapped too tight!",
+  "cobblemon.battle.damage.confusion": "%1$s hit itself, th' darn thing's confused!",
+  "cobblemon.battle.damage.leechseed": "%1$s's health be sapped by leeching seeds!",
+  "cobblemon.battle.damage.sandstorm": "%1$s was buffeted by th' sandstorm.",
+  "cobblemon.battle.damage.hail": "%1$s was smacked upside by hail.",
+  "cobblemon.battle.damage.stealthrock": "Sharp stones dug into %1$s!",
+  "cobblemon.battle.damage.spikes": "%1$s be stabbed by th' spike traps!",
+  "cobblemon.battle.damage.recoil": "%1$s's hurt from th' recoil!",
+  "cobblemon.battle.damage.item": "%1$s be hurt by its %2$s!",
+  "cobblemon.battle.damage.lifeorb": "%1$s lost some health!",
+  "cobblemon.battle.damage.rockyhelmet": "%1$s be hurt by %2$s's pointy helmet!",
+  "cobblemon.battle.damage.generic": "%1$s be hurt!",
+  "cobblemon.battle.damage.pokemonmimikyubusted": "%1$s's disguise be burst!",
+  "cobblemon.battle.damage.whirlpool": "%1$s be pull'd into th' whirlpool!",
+  "cobblemon.battle.damage.clamp": "%1$s be clamp'd tight!",
+  "cobblemon.battle.damage.curse": "%1$s be weaken'd by th' curse!",
+  "cobblemon.battle.end.bind": "%1$s be squeezed no longer!",
+  "cobblemon.battle.end.wrap": "%1$s be unwrapp'd!",
+  "cobblemon.battle.end.disable": "%1$s's skill be available now!",
+  "cobblemon.battle.end.protosynthesis": "Th' boons of %1$s's protosynthesis ran dry!",
+  "cobblemon.battle.end.taunt": "%1$s fought past th' taunt!",
+  "cobblemon.battle.end.firespin": "Th' raging fire trapping %1$s died out!",
+  "cobblemon.battle.end.bide": "%1$s unleashed fury!",
+  "cobblemon.battle.end.confusion": "%1$s snapped out o' its confusion!",
+  "cobblemon.battle.end.whirlpool": "Th' whirlpool 'round %1$s wash'd out!",
+  "cobblemon.battle.end.clamp": "%1$s be unclamp'd!",
+  "cobblemon.battle.end.dynamax": "%1$s shrunk back ta' crew!",
+  "cobblemon.battle.sethp.painsplit": "Th' battlers shared their pain!",
+  "cobblemon.battle.ability.sturdy": "%1$s endured th' blow!",
  "cobblemon.battle.ability.unnerve": "%1$s made th' opponent too nervous ta' snack!",
-  "cobblemon.battle.ability.anticipation": "%1$s shuddered in anticipation!",
-  "cobblemon.battle.ability.air_lock": "The effects o' weather disappeared.",
-  "cobblemon.battle.ability.generic": "%1$s's %2$s activated!",
+  "cobblemon.battle.ability.anticipation": "%1$s be shakin' in anticipation!",
+  "cobblemon.battle.ability.airlock": "The effects o' weather disappeared.",
+  "cobblemon.battle.ability.generic": "%1$s's %2$s trigger'd!",
+  "cobblemon.battle.ability.magicbounce": "%1$s bounced th' %2$s right back!",
  "cobblemon.battle.errors.busy": "%1$s be busy!",
  "cobblemon.battle.error.in_battle": "%1$s is already in combat.",
  "cobblemon.battle.error.in_battle.personal": "Ye are already in combat!",
  "cobblemon.battle.error.no_pokemon": "Ye don't have any usable monsters!",
+  "cobblemon.battle.error.no_pokemon_opponent": "Ye foe don't have any usable monsters!",
  "cobblemon.battle.error.insufficient_pokemon": "%1$s has %2 monsters when %3 be needed.",
  "cobblemon.battle.error.insufficient_pokemon.personal": "Ye have %1 usable monsters but in need o' %2.",
+  "cobblemon.battle.error.pokemon_is_trapped": "[Unavailable choice] Can't swap: th' active monster be trapped",
  "cobblemon.battle.immune": "But %1$s be immune!",
  "cobblemon.battle.missed": "The shot missed.",
  "cobblemon.battle.hit_count": "Landed %1$s shots!",
  "cobblemon.battle.hit_count_singular": "Hit once!",
-  "cobblemon.battle.item.air_balloon.start": "%1$s floats with them floaties!",
-  "cobblemon.battle.item.recycle_or_pickup.start": "%1$s found a %2$s!",
-  "cobblemon.battle.item.frisk.start": "%1$s frisked %2$s and found some %3$s!",
-  "cobblemon.battle.item.take_item.start": "%1$s plundered %2$s's %3$s!",
-  "cobblemon.battle.item.harvest.start": "%1$s harvested a %2$s!",
-  "cobblemon.battle.item.bestow.start": "%1$s received %2$s from %3$s!",
-  "cobblemon.battle.item.tricked.start": "%1$s traded loot!",
-  "cobblemon.battle.item.eat.end": "%1$s ate its %2$s!",
-  "cobblemon.battle.item.fling.end": "%1$s toss'd its %2$s!",
-  "cobblemon.battle.item.knock_off.end": "%1$s disarmed %2$s of %3$s!",
-  "cobblemon.battle.item.gem.end": "Th' %1$s strengthened %2$s's power!",
-  "cobblemon.battle.item.incinerate.end": "%1$s's %2$s be charrrr'd to smithereens!",
-  "cobblemon.battle.item.air_balloon.end": "%1$s's floaties burst!",
-  "cobblemon.battle.item.hung_on.end": "%1$s be hung standin' thanks ta' th' %2$s!",
-  "cobblemon.battle.item.red_card.end": "%1$s held up th' red card against %2$s!",
-  "cobblemon.battle.item.steal_eat.end": "%1$s plundered and pillaged %2$s's %3$s!",
-  "cobblemon.battle.item.berry_juice.end": "%1$s drank some berry rum!",
-  "cobblemon.battle.item.used_its.end": "%1$s made use o' %2$s!",
-  "cobblemon.battle.item.mental_herb.end": "%1$s shook off mental fatigue through th' herb!",
-  "cobblemon.battle.item.power_herb.end": "%1$s became fully charged through th' herb!",
-  "cobblemon.battle.item.mirror_herb.end": "%1$s copied stat changes through th' herb!",
-  "cobblemon.battle.item.white_herb.end": "%1$s restored statuses through th' herb!",
-  "cobblemon.battle.item.quick_claw.end": "%1$s be able to break away and act, thanks to th' sneaky swift claw!",
-  "cobblemon.battle.heal.z_effect": "%1$s's health went back up by th' Z voodoo!",
+  "cobblemon.battle.item.airballoon": "%1$s floats with them %2$s!",
+  "cobblemon.battle.item.recycle": "%1$s found a %2$s!",
+  "cobblemon.battle.item.frisk": "%3$s frisked %1$s and found some %2$s!",
+  "cobblemon.battle.item.thief": "%1$s plundered %3$s's %2$s!",
+  "cobblemon.battle.item.harvest": "%1$s harvested a %2$s!",
+  "cobblemon.battle.item.bestow": "%1$s got %2$s from %3$s!",
+  "cobblemon.battle.item.trick": "%1$s obtained a %2$s.",
+  "cobblemon.battle.item.eat": "%1$s nibbled on %2$s.",
+  "cobblemon.battle.enditem.eat": "%1$s nibbled on %2$s!",
+  "cobblemon.battle.enditem.fling": "%1$s toss'd its %2$s!",
+  "cobblemon.battle.enditem.knockoff": "%3$s disarmed %1$s of %2$s!",
+  "cobblemon.battle.enditem.gem": "Th' %2$s strengthened %1$s's power!",
+  "cobblemon.battle.enditem.incinerate": "%1$s's %2$s be charrrr'd to smithereens!",
+  "cobblemon.battle.enditem.airballoon": "%1$s's floaties burst!",
+  "cobblemon.battle.enditem.redcard": "%1$s held up th' red card against %3$s!",
+  "cobblemon.battle.enditem.pluck": "%3$s plundered and pillaged %1$s's %2$s!",
+  "cobblemon.battle.enditem.berryjuice": "%1$s drank some berry rum!",
+  "cobblemon.battle.enditem.generic": "%1$s made use o' %2$s!",
+  "cobblemon.battle.enditem.mentalherb": "%1$s shook off mental fatigue through th' herb!",
+  "cobblemon.battle.enditem.powerherb": "%1$s became fully charged through th' herb!",
+  "cobblemon.battle.enditem.mirrorherb": "%1$s copied stat changes through th' herb!",
+  "cobblemon.battle.enditem.whiteherb": "%1$s restored statuses through th' herb!",
+  "cobblemon.battle.heal.zeffect": "%1$s's health went back up by th' Z voodoo!",
  "cobblemon.battle.heal.wish": "%1$s's wish came to be!",
  "cobblemon.battle.heal.drain": "%1$s had its health drained!",
-  "cobblemon.battle.heal.healing_wish": "Th' healing wish for %1$s came to be!",
-  "cobblemon.battle.heal.revival_blessing": "%1$s was brought back from Davy Jones' Locker and is ship shape!",
-  "cobblemon.battle.heal.aqua_ring": "A veil o' th' seas restored %1$s's health!",
+  "cobblemon.battle.heal.healingwish": "Th' healing wish for %1$s came to be!",
+  "cobblemon.battle.heal.revivalblessing": "%1$s was brought back from Davy Jones' Locker and is ship shape!",
+  "cobblemon.battle.heal.aquaring": "A veil o' th' seas restored %1$s's health!",
  "cobblemon.battle.heal.ingrain": "%1$s absorbed nutrients from th' roots!",
-  "cobblemon.battle.heal.grassy_terrain": "%1$s's health be improved from th' moss.",
-  "cobblemon.battle.heal.leftovers": "%1$s snack'd on that scrap o' apple!",
-  "cobblemon.battle.heal.rain_dish": "%1$s restored HP from Rain Dish!",
+  "cobblemon.battle.heal.grassyterrain": "%1$s's health be improved from th' moss.",
+  "cobblemon.battle.heal.leftovers": "%1$s snack'd on that %2$s!",
+  "cobblemon.battle.heal.item": "%1$s healed up from th' %2$s!",
+  "cobblemon.battle.heal.raindish": "%1$s's rain dish restored some health!",
  "cobblemon.battle.heal.generic": "%1$s restored its health.",
+  "cobblemon.battle.heal.bagitempotion": "%1$s's HP restor'd",
+  "cobblemon.battle.curestatus.naturalcure": "%1$s be naturally cured!",
+  "cobblemon.battle.bagitem.use": "%1$s be usin' %2$s on %3$s!",
+  "cobblemon.battle.bagitem.cannot": "Ye can't use tools at current.",
+  "cobblemon.battle.bagitem.invalid": "No point in usin' that.",
+  "cobblemon.battle.zpower": "%1$s be cloak'd in th' Z-Power!",
+  "cobblemon.battle.zbroken": "%1$s's protection wasn't enough!",
+  "cobblemon.battle.terastallize": "%1$s be gemmed into th' %2$s-type!",
+  "cobblemon.battle.detailschange.mega": "%1$s be reactin' to the Key Stone!",
+  "cobblemon.battle.mega": "%1$s evolved beyond!",
  "cobblemon.experience.gained": "%1$s got %2$s booty.",
  "cobblemon.experience.level_up": "%1$s now be level %2$s!",
  "cobblemon.experience.learned_move": "%1$s knows %2$s now.",
@@ -559,31 +974,31 @@
  "cobblemon.type.rock": "Stones",
  "cobblemon.type.poison": "Toxin",
  "cobblemon.type.dragon": "Drake",
-  "cobblemon.nature.hardy": "Hardy",
-  "cobblemon.nature.lonely": "Lonely",
-  "cobblemon.nature.brave": "Brave",
-  "cobblemon.nature.adamant": "Adamant",
-  "cobblemon.nature.naughty": "Naughty",
-  "cobblemon.nature.docile": "Docile",
-  "cobblemon.nature.relaxed": "Relaxed",
-  "cobblemon.nature.impish": "Impish",
-  "cobblemon.nature.lax": "Lax",
-  "cobblemon.nature.timid": "Timid",
-  "cobblemon.nature.hasty": "Hasty",
-  "cobblemon.nature.serious": "Serious",
-  "cobblemon.nature.jolly": "Jolly",
-  "cobblemon.nature.naive": "Naive",
-  "cobblemon.nature.modest": "Modest",
-  "cobblemon.nature.mild": "Mild",
-  "cobblemon.nature.bashful": "Bashful",
-  "cobblemon.nature.rash": "Rash",
-  "cobblemon.nature.calm": "Calm",
-  "cobblemon.nature.gentle": "Gentle",
-  "cobblemon.nature.sassy": "Sassy",
-  "cobblemon.nature.careful": "Careful",
-  "cobblemon.nature.quirky": "Quirky",
-  "cobblemon.nature.bold": "Bold",
-  "cobblemon.nature.quiet": "Quiet",
+  "cobblemon.nature.hardy": "Rugg'd",
+  "cobblemon.nature.lonely": "Outcast",
+  "cobblemon.nature.brave": "Adventur'us",
+  "cobblemon.nature.adamant": "Stiff board",
+  "cobblemon.nature.naughty": "Rascal",
+  "cobblemon.nature.docile": "Meek",
+  "cobblemon.nature.relaxed": "Sea breezy",
+  "cobblemon.nature.impish": "Jaunty",
+  "cobblemon.nature.lax": "Sloppy",
+  "cobblemon.nature.timid": "Feeble",
+  "cobblemon.nature.hasty": "Rapids",
+  "cobblemon.nature.serious": "Sober",
+  "cobblemon.nature.jolly": "Chipp'r",
+  "cobblemon.nature.naive": "Green",
+  "cobblemon.nature.modest": "Prud'nt",
+  "cobblemon.nature.mild": "Balmy",
+  "cobblemon.nature.bashful": "Coy",
+  "cobblemon.nature.rash": "Daring",
+  "cobblemon.nature.calm": "Serene",
+  "cobblemon.nature.gentle": "Affable",
+  "cobblemon.nature.sassy": "Cheeky",
+  "cobblemon.nature.careful": "Leery",
+  "cobblemon.nature.quirky": "Gangplank'd",
+  "cobblemon.nature.bold": "Resolute",
+  "cobblemon.nature.quiet": "Clamm'd",
  "cobblemon.species.random": "Random monster",
  "cobblemon.species.unknown": "Unknown monster",
  "cobblemon.a_pokemon": "A monster",
@@ -609,16 +1024,19 @@
  "cobblemon.move.category.status": "Effect",
  "cobblemon.status.sleep.apply": "%1$s hit the caulk!",
  "cobblemon.status.sleep.is": "%1$s be sleeping.",
-  "cobblemon.status.sleep.woke": "%1$s be showing leg!",
+  "cobblemon.status.sleep.cure": "%1$s be showing leg!",
  "cobblemon.status.paralysis.apply": "%1$s be shocked!",
  "cobblemon.status.paralysis.is": "Arr, %1$s be shocked, moving is off th' table",
+  "cobblemon.status.paralysis.cure": "%1$s be free o' th' shocks!",
  "cobblemon.status.poison.apply": "%1$s be poisoned!",
+  "cobblemon.status.poison.cure": "%1$s be poisoned no longer!",
  "cobblemon.status.poisonbadly.apply": "%1$s be badly poisoned!",
-  "cobblemon.status.poison.hurt": "%1$s be sufferin' th' poison",
+  "cobblemon.status.poison.hurt": "%1$s be sufferin' th' poison!",
  "cobblemon.status.burn.apply": "%1$s be burnt!",
  "cobblemon.status.burn.hurt": "%1$s be sufferin' th' burns!",
+  "cobblemon.status.burn.cure": "%1$s be burnt no longer!",
  "cobblemon.status.frozen.apply": "%1$s be on ice!",
-  "cobblemon.status.frozen.thawed": "%1$s be off ice!",
+  "cobblemon.status.frozen.cure": "%1$s be off ice!",
  "cobblemon.status.frozen.is": "%1$s be an ice cube!",
  "block.cobblemon.dawn_stone_ore": "Orrre o' dawn",
  "block.cobblemon.dusk_stone_ore": "Orrre o' dusk",
@@ -641,8 +1059,45 @@
  "block.cobblemon.deepslate_thunder_stone_ore": "Tough orrre o' thund'r",
  "block.cobblemon.deepslate_water_stone_ore": "Tough orrre o' th' sea",
  "block.cobblemon.dripstone_moon_stone_ore": "Pointy orrre o' th' moon",
+  "block.cobblemon.pasture": "Block o' crew deck",
  "gamerule.doPokemonSpawning": "Spawn monsters",
+  "gamerule.doShinyStarters": "First mates will be sparkled",
  "cobblemon.command.checkspawns.invalid-bucket": "Invalid spawn bucket",
  "cobblemon.command.checkspawns.spawns": "Manifest o' spawns:",
-  "cobblemon.command.checkspawns.nothing": "Nothing be able to spawn here at time."
+  "cobblemon.command.checkspawns.nothing": "Nothing be able to spawn here at time.",
+  "cobblemon.interaction.ev.add": "%1$s gained %3$s %2$s EVs!",
+  "cobblemon.interaction.ev.deduct": "%1$s lost %3$s %2$s EVs!",
+  "cobblemon.interaction.pp.restore": "Ye restore th' PP o' %1$s.",
+  "cobblemon.interaction.friendsip.add": "%1$s grows closer t' ye!",
+  "cobblemon.interaction.status.cure": "%1$s be cured of th' status conditions!",
+  "cobblemon.interaction.hp.heal": "%1$s restored a bit o' health!",
+  "tag.item.cobblemon.apricorn_logs": "Logs o' fruitnut",
+  "tag.item.cobblemon.apricorn_sprouts": "Fruitnut meager shrubs",
+  "tag.item.cobblemon.apricorns": "Fruitnuts",
+  "tag.item.cobblemon.azalea_tree": "Trees o' azalea",
+  "tag.item.cobblemon.berries": "Berries",
+  "tag.item.cobblemon.cobblemon_seeds": "Seeds",
+  "tag.item.cobblemon.evolution_items": "Transmogrification treasures",
+  "tag.item.cobblemon.evolution_stones": "Transmogrification rocks",
+  "tag.item.cobblemon.experience_candies": "Candies o' experience",
+  "tag.item.cobblemon.held.destiny_knot": "Strings o' fate",
+  "tag.item.cobblemon.held.everstone": "Anchor'd stones",
+  "tag.item.cobblemon.held.experience_share": "Plunder shares",
+  "tag.item.cobblemon.held.is_held_item": "Pocketed loot",
+  "tag.item.cobblemon.held.lucky_egg": "Eggs o' luck",
+  "tag.item.cobblemon.held.power_anklet": "Anklets o' pow'r",
+  "tag.item.cobblemon.held.power_band": "Bands o' pow'r",
+  "tag.item.cobblemon.held.power_belt": "Belts o' pow'r",
+  "tag.item.cobblemon.held.power_bracer": "Bracers o' pow'r",
+  "tag.item.cobblemon.held.power_lens": "Lenses o' pow'r",
+  "tag.item.cobblemon.held.power_weight": "Weights o' pow'r",
+  "tag.item.cobblemon.herbs": "Herbs",
+  "tag.item.cobblemon.mint_leaf": "Leaves o' mint",
+  "tag.item.cobblemon.mints": "Mints",
+  "tag.item.cobblemon.mutated_berries": "Berries o' mutation",
+  "tag.item.cobblemon.plants": "Plants",
+  "tag.item.cobblemon.poke_balls": "Monster capturers",
+  "tag.item.cobblemon.protein_ingredients": "Protein ingredients",
+  "tag.item.cobblemon.zinc_ingredients": "Zinc ingredients",
+  "tag.item.cobblemon.seeds": "Seeds"
 }
@@ -761,6 +761,9 @@
  "cobblemon.battle.weather.hail.end": "The hail stopped.",

  "cobblemon.battle.start.bide": "%1$s begins storing energy!",
+  "cobblemon.battle.start.disable": "%1$s's %2$s was disabled!",
+  "cobblemon.battle.start.foresight": "%1$s was identified!",
+  "cobblemon.battle.start.telekinesis": "%1$s was hurled into the air!",
  "cobblemon.battle.start.yawn": "%1$s grew drowsy!",
  "cobblemon.battle.start.perish": "%1$s's perish count fell to %2$s.",
  "cobblemon.battle.start.leechseed": "%1$s was seeded!",
@@ -773,6 +776,7 @@
  "cobblemon.battle.start.uproar": "%1$s caused an uproar!",
  "cobblemon.battle.start.curse": "%1$s cut its own HP and put a curse on %2$s!",
  "cobblemon.battle.start.miracleeye": "%1$s was identified!",
+  "cobblemon.battle.start.laserfocus": "%1$s concentrated intensely!",
  "cobblemon.battle.start.dynamax": "%1$s Dynamaxed!",
  "cobblemon.battle.start.gmax": "%1$s Gigantamaxed!",

@@ -925,6 +929,7 @@
  "cobblemon.battle.damage.whirlpool": "%1$s was hurt by Whirlpool!",
  "cobblemon.battle.damage.clamp": "%1$s was hurt by Clamp!",
  "cobblemon.battle.damage.curse": "%1$s was afflicted by the curse!",
+  "cobblemon.battle.damage.firespin": "%1$s is hurt by Fire Spin!",

  "cobblemon.battle.end.bind": "%1$s is no longer being squeezed!",
  "cobblemon.battle.end.wrap": "%1$s was freed from wrap!",
@@ -937,6 +942,7 @@
  "cobblemon.battle.end.whirlpool": "%1$s was freed from the vortex!",
  "cobblemon.battle.end.clamp": "%1$s was freed from Clamp!",
  "cobblemon.battle.end.dynamax": "%1$s returned to normal!",
+  "cobblemon.battle.end.telekinesis": "%1$s was freed from the telekinesis!",

  "cobblemon.battle.sethp.painsplit": "The battlers shared their pain!",

@@ -1,5 +1,4 @@
 {
-  "itemGroup.cobblemon.pokeball": "Poké Balls",
  "item.cobblemon.poke_ball": "Poké Ball",
  "item.cobblemon.slate_ball": "Pizarra Ball",
  "item.cobblemon.azure_ball": "Azur Ball",
@@ -32,13 +31,13 @@
  "item.cobblemon.park_ball": "Parque Ball",
  "item.cobblemon.dream_ball": "Ensueño Ball",
  "item.cobblemon.beast_ball": "Ente Ball",
-  "item.cobblemon.black_apricorn_seed": "Semilla de Bonguri Negro",
-  "item.cobblemon.blue_apricorn_seed": "Semilla de Bonguri Azul",
-  "item.cobblemon.green_apricorn_seed": "Semilla de Bonguri Verde",
-  "item.cobblemon.pink_apricorn_seed": "Semilla de Bonguri Rosa",
-  "item.cobblemon.red_apricorn_seed": "Semilla de Bonguri Rojo",
-  "item.cobblemon.white_apricorn_seed": "Semilla de Bonguri Blanco",
-  "item.cobblemon.yellow_apricorn_seed": "Semilla de Bonguri Amarillo",
+  "item.cobblemon.black_apricorn_seed": "Brote de Bonguri Negro",
+  "item.cobblemon.blue_apricorn_seed": "Brote de Bonguri Azul",
+  "item.cobblemon.green_apricorn_seed": "Borte de Bonguri Verde",
+  "item.cobblemon.pink_apricorn_seed": "Brote de Bonguri Rosa",
+  "item.cobblemon.red_apricorn_seed": "Brote de Bonguri Rojo",
+  "item.cobblemon.white_apricorn_seed": "Brote de Bonguri Blanco",
+  "item.cobblemon.yellow_apricorn_seed": "Brote de Bonguri Amarillo",
  "item.cobblemon.black_apricorn": "Bonguri Negro",
  "item.cobblemon.blue_apricorn": "Bonguri Azul",
  "item.cobblemon.green_apricorn": "Bonguri Verde",
@@ -46,7 +45,8 @@
  "item.cobblemon.red_apricorn": "Bonguri Rojo",
  "item.cobblemon.white_apricorn": "Bonguri Blanco",
  "item.cobblemon.yellow_apricorn": "Bonguri Amarillo",
-  "itemGroup.cobblemon.evolution_item": "Objetos Evolutivos",
+  "item.cobblemon.vivichoke_seeds": "Semillas de Revibrote",
+  "item.cobblemon.vivichoke": "Revibrote",
  "item.cobblemon.link_cable": "Cable Link",
  "item.cobblemon.dragon_scale": "Escama Dragón",
  "item.cobblemon.kings_rock": "Roca del Rey",
@@ -88,7 +88,6 @@
  "item.cobblemon.sun_stone": "Piedra Solar",
  "item.cobblemon.thunder_stone": "Piedra Trueno",
  "item.cobblemon.water_stone": "Piedra Agua",
-  "itemGroup.cobblemon.medicine": "Botiquín",
  "item.cobblemon.rare_candy": "Caramelo Raro",
  "item.cobblemon.exp_candy_xs": "Caramelo Experiencia XS",
  "item.cobblemon.exp_candy_s": "Caramelo Experiencia S",
@@ -101,10 +100,47 @@
  "item.cobblemon.iron": "Hierro",
  "item.cobblemon.protein": "Proteína",
  "item.cobblemon.zinc": "Zinc",
-  "itemGroup.cobblemon.held_item": "Objetos Potenciadores",
+  "item.cobblemon.potion": "Potion",
+  "item.cobblemon.super_potion": "Super Potion",
+  "item.cobblemon.hyper_potion": "Hyper Potion",
+  "item.cobblemon.max_potion": "Max Potion",
+  "item.cobblemon.full_restore": "Full Restore",
+  "item.cobblemon.red_mint_leaf": "Hoja de Menta Roja",
+  "item.cobblemon.red_mint_leaf.tooltip": "Capaz de cambiar la estadística de ataque de un Pokémon",
+  "item.cobblemon.blue_mint_leaf": "Hoja de Menta Azul",
+  "item.cobblemon.blue_mint_leaf.tooltip": "Capaz de cambiar la estadística de defensa de un Pokémon",
+  "item.cobblemon.cyan_mint_leaf": "Hoja de Menta Cian",
+  "item.cobblemon.cyan_mint_leaf.tooltip": "Capaz de cambiar la estadística de ataque especial de un Pokémon",
+  "item.cobblemon.pink_mint_leaf": "Hoja de Menta Rosa",
+  "item.cobblemon.pink_mint_leaf.tooltip": "Capaz de cambiar la estadística de defensa especial de un Pokémon",
+  "item.cobblemon.green_mint_leaf": "Hoja de Menta Verde",
+  "item.cobblemon.green_mint_leaf.tooltip": "Capaz de cambiar la estadística de velocidad de un Pokémon",
+  "item.cobblemon.white_mint_leaf": "Hoja de Menta Blanca",
+  "item.cobblemon.white_mint_leaf.tooltip": "Capaz de neutralizar la naturaleza de un Pokémon",
+  "item.cobblemon.lonely_mint": "Menta Huraña",
+  "item.cobblemon.adamant_mint": "Menta Firme",
+  "item.cobblemon.naughty_mint": "Menta Pícara",
+  "item.cobblemon.brave_mint": "Menta Audaz",
+  "item.cobblemon.bold_mint": "Menta Osada",
+  "item.cobblemon.impish_mint": "Menta Agitada",
+  "item.cobblemon.lax_mint": "Menta Floja",
+  "item.cobblemon.relaxed_mint": "Menta Plácida",
+  "item.cobblemon.modest_mint": "Menta Modesta",
+  "item.cobblemon.mild_mint": "Menta Afable",
+  "item.cobblemon.rash_mint": "Menta Alocada",
+  "item.cobblemon.quiet_mint": "Menta Mansa",
+  "item.cobblemon.calm_mint": "Menta Serena",
+  "item.cobblemon.gentle_mint": "Menta Amable",
+  "item.cobblemon.careful_mint": "Menta Cauta",
+  "item.cobblemon.sassy_mint": "Menta Grosera",
+  "item.cobblemon.timid_mint": "Menta Miedosa",
+  "item.cobblemon.hasty_mint": "Menta Activa",
+  "item.cobblemon.jolly_mint": "Menta Alegre",
+  "item.cobblemon.naive_mint": "Menta Ingenua",
+  "item.cobblemon.serious_mint": "Menta Seria",
  "item.cobblemon.assault_vest": "Chaleco Asalto",
  "item.cobblemon.auspicious_armor": "Armadura Auspiciosa",
-  "item.cobblemon.big_root": "Raíz Grande",
+  "item.cobblemon.malicious_armor": "Malicious Armor",
  "item.cobblemon.black_belt": "Cinturón Negro",
  "item.cobblemon.black_glasses": "Gafas de Sol",
  "item.cobblemon.black_sludge": "Lodo Negro",
@@ -138,6 +174,21 @@
  "item.cobblemon.spell_tag": "Hechizo",
  "item.cobblemon.twisted_spoon": "Cuchara Torcida",
  "item.cobblemon.wise_glasses": "Gafas Especiales",
+  "item.cobblemon.mental_herb": "Mental Herb",
+  "item.cobblemon.mirror_herb": "Mirror Herb",
+  "item.cobblemon.power_herb": "Power Herb",
+  "item.cobblemon.white_herb": "White Herb",
+  "item.cobblemon.bright_powder": "Bright Powder",
+  "item.cobblemon.metal_powder": "Metal Powder",
+  "item.cobblemon.quick_powder": "Quick Powder",
+  "item.cobblemon.destiny_knot": "Destiny Knot",
+  "item.cobblemon.everstone": "Everstone",
+  "item.cobblemon.power_anklet": "Power Anklet",
+  "item.cobblemon.power_band": "Power Band",
+  "item.cobblemon.power_belt": "Power Belt",
+  "item.cobblemon.power_bracer": "Power Bracer",
+  "item.cobblemon.power_lens": "Power Lens",
+  "item.cobblemon.power_weight": "Power Weight",
  "item.cobblemon.poke_ball.tooltip": "Ratio de captura ×1",
  "item.cobblemon.slate_ball.tooltip": "Ratio de captura ×1",
  "item.cobblemon.azure_ball.tooltip": "Ratio de captura ×1",
@@ -170,6 +221,56 @@
  "item.cobblemon.park_ball.tooltip": "Ratio de captura ×2,5 en todos los biomas de Bosque o Llanuras",
  "item.cobblemon.dream_ball.tooltip": "Ratio de captura ×4 en Pokémon dormidos",
  "item.cobblemon.beast_ball.tooltip": "Ratio de captura ×5 en Ultraentes, ×0,1 en otro caso",
+  "item.cobblemon.mulch_base": "Abono",
+  "item.cobblemon.coarse_mulch": "Abono Grueso",
+  "item.cobblemon.growth_mulch": "Abono Rápido",
+  "item.cobblemon.humid_mulch": "Abono Húmedo",
+  "item.cobblemon.loamy_mulch": "Abono Arcilloso",
+  "item.cobblemon.peat_mulch": "Abono Turboso",
+  "item.cobblemon.rich_mulch": "Abono Fértil",
+  "item.cobblemon.sandy_mulch": "Abono Arenoso",
+  "item.cobblemon.surprise_mulch": "Abono Sorpresa",
+  "item.cobblemon.medicinal_leek": "Puerro Medicinal",
+  "item.cobblemon.energy_root": "Raíz Energía",
+  "item.cobblemon.revival_herb": "Hierba Revivir",
+  "item.cobblemon.roasted_leek": "Puerro Cocido",
+  "item.cobblemon.leek_and_potato_stew": "Estofado de Puerro y Patata",
+  "item.cobblemon.braised_vivichoke": "Revibrote Hervido",
+  "item.cobblemon.vivichoke_dip": "Vivichoke Dip",
+  "item.cobblemon.berry_juice": "Berry Juice",
+  "item.cobblemon.remedy": "Remedio",
+  "item.cobblemon.fine_remedy": "Superremedio",
+  "item.cobblemon.superb_remedy": "Hiperremedio",
+  "item.cobblemon.heal_powder": "Polvo Curación",
+  "item.cobblemon.medicinal_brew": "Poción Medicinal",
+  "item.cobblemon.revive": "Revivir",
+  "item.cobblemon.max_revive": "Revivir Máximo",
+  "item.cobblemon.pp_up": "Más PP",
+  "item.cobblemon.pp_max": "PP Máximo",
+  "item.cobblemon.x_attack": "Ataque X",
+  "item.cobblemon.x_defence": "X Defense",
+  "item.cobblemon.x_accuracy": "Precisión X",
+  "item.cobblemon.x_speed": "Velocidad X",
+  "item.cobblemon.x_special_defence": "X Special Defense",
+  "item.cobblemon.x_special_attack": "X Special Attack",
+  "item.cobblemon.dire_hit": "Dire Hit",
+  "item.cobblemon.guard_spec": "Guard Spec",
+  "item.cobblemon.full_heal": "Full Heal",
+  "item.cobblemon.antidote": "Antidote",
+  "item.cobblemon.awakening": "Awakening",
+  "item.cobblemon.burn_heal": "Burn Heal",
+  "item.cobblemon.ice_heal": "Ice Heal",
+  "item.cobblemon.paralyze_heal": "Paralyze Heal",
+  "item.cobblemon.ether": "Ether",
+  "item.cobblemon.max_ether": "Max Ether",
+  "item.cobblemon.elixir": "Elixir",
+  "item.cobblemon.max_elixir": "Max Elixir",
+  "itemGroup.cobblemon.blocks": "Bloques",
+  "itemGroup.cobblemon.pokeball": "Poké Balls",
+  "itemGroup.cobblemon.agriculture": "Agricultura",
+  "itemGroup.cobblemon.consumables": "Consumibles",
+  "itemGroup.cobblemon.held_item": "Objetos Potenciadores",
+  "itemGroup.cobblemon.evolution_item": "Objetos Evolutivos",
  "block.cobblemon.apricorn_log": "Tronco de Bonguri",
  "block.cobblemon.stripped_apricorn_log": "Tronco de Bonguri sin corteza",
  "block.cobblemon.apricorn_wood": "Leño de Bonguri",
@@ -183,6 +284,7 @@
  "block.cobblemon.apricorn_button": "Botón de Bonguri",
  "block.cobblemon.apricorn_slab": "Losa de Bonguri",
  "block.cobblemon.apricorn_fence_gate": "Puerta de valla de Bonguri",
+  "block.cobblemon.big_root": "Big Root",
  "block.cobblemon.black_apricorn_sapling": "Brote de Bonguri Negro",
  "block.cobblemon.blue_apricorn_sapling": "Brote de Bonguri Azul",
  "block.cobblemon.green_apricorn_sapling": "Brote de Bonguri Verde",
@@ -196,12 +298,24 @@
  "block.cobblemon.healing_machine.tooltip1": "Debe cargarse después de ser colocada.",
  "block.cobblemon.healing_machine.tooltip2": "Se carga a lo largo del tiempo.",
  "block.cobblemon.pc": "PC",
+  "block.cobblemon.red_mint": "Semillas de Menta Roja",
+  "block.cobblemon.blue_mint": "Semillas de Menta Azul",
+  "block.cobblemon.cyan_mint": "Semillas de Menta Cian",
+  "block.cobblemon.pink_mint": "Semillas de Menta Rosa",
+  "block.cobblemon.green_mint": "Semillas de Menta Verde",
+  "block.cobblemon.white_mint": "Semillas de Menta Blanca",
+  "block.cobblemon.vivichoke_seeds": "Semillas de Revibrote",
+  "block.cobblemon.pep_up_flower": "Pep-Up Flower",
+  "block.cobblemon.potted_pep_up_flower": "Potted Pep-Up Flower",
  "cobblemon.overflow_no_pc": "¡Tu equipo estaba lleno y no tienes un PC!",
  "cobblemon.overflow_no_space": "¡Tu equipo estaba lleno y también lo estaba %1$s!",
  "cobblemon.overflow_to_pc": "¡Tu equipo estaba lleno! %1$s ha sido añadido a %2$s.",
  "cobblemon.your_pc": "Tu PC",
  "cobblemon.command.pokespawn.invalid-pokemon": "Nombre de Pokémon inválido",
  "cobblemon.command.pokespawn.invalid-move": "Nombre de Movimiento inválido",
+  "cobblemon.command.clearparty.nonethere": "No hay Pokémon en el equipo de %1$s.",
+  "cobblemon.command.clearparty.cleared": "Se ha limpiado el equipo de %1$s.",
+  "cobblemon.command.clearpc.cleared": "Cleared %1$s's PC.",
  "cobblemon.ui.generic.yes": "Sí",
  "cobblemon.ui.generic.no": "No",
  "cobblemon.ui.pokenav.title": "PokéNav",
@@ -211,6 +325,8 @@
  "cobblemon.ui.starter.alreadyselected": "¡Ya has elegido un inicial!",
  "cobblemon.ui.starter.cannotchoose": "No puedes elegir un inicial ahora mismo.",
  "cobblemon.ui.starter.hasalreadychosen": "%1$s ya ha elegido un inicial.",
+  "cobblemon.ui.starter.choose_starter_title": "¡Elige tu inicial!",
+  "cobblemon.ui.starter.choose_starter_description": "Pulsa la tecla \"%1$s\"",
  "cobblemon.ui.starter.chooseyourstarter": "¡Pulsa %1$s para elegir tu Pokémon y comenzar tu viaje!",
  "cobblemon.ui.moves": "Movimientos",
  "cobblemon.ui.moves.switch": "Cambiar Movimientos",
@@ -237,6 +353,12 @@
  "cobblemon.ui.info.ability": "Habilidad",
  "cobblemon.ui.info.experience_points": "Puntos de Exp.",
  "cobblemon.ui.info.to_next_level": "Para subir de nivel",
+  "cobblemon.ui.trade": "Intercambio",
+  "cobblemon.trade.occupied": "%1$s está ocupado.",
+  "cobblemon.trade.request_expired": "La solicitud de intercambio con %1$s ha expirado.",
+  "cobblemon.trade.request_already_expired": "Su solicitud de intercambio ya ha expirado.",
+  "cobblemon.trade.request_sent": "Se ha ofrecido intercambiar con %1$s",
+  "cobblemon.trade.offer": "%1$s se ofrece a intercambiar Pokémon contigo.",
  "cobblemon.ui.party": "Equipo",
  "cobblemon.ui.power": "Potencia",
  "cobblemon.ui.accuracy": "Precisión",
@@ -245,6 +367,10 @@
  "cobblemon.ui.exit": "Salir",
  "cobblemon.ui.pc.box.title": "Caja %1$s",
  "cobblemon.ui.pc.release": "Liberar",
+  "cobblemon.ui.pasture": "Pastura",
+  "cobblemon.ui.pasture.recall_all": "Retirar Todo",
+  "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)",
+  "cobblemon.pasture.too_many_nearby": "Hay demasiados Pokémon cerca.",
  "key.cobblemon.upshiftparty": "Pokémon Superior",
  "key.cobblemon.downshiftparty": "Pokémon Inferior",
  "key.cobblemon.hideparty": "Esconder Equipo",
@@ -291,9 +417,150 @@
  "cobblemon.label.lv": "Nv. %1$s",
  "cobblemon.challenge_label": "Pulsa %1$s para luchar.",
  "cobblemon.challenge.sender": "¡Has desafiado a %1$s a un combate!",
-  "cobblemon.challenge.receiver": "¡%1$s te ha desafiado a un combate! Pulsa %2$s mientras le miras para combatir.",
+  "cobblemon.challenge.receiver": "¡%1$s te ha desafiado a un combate!",
  "cobblemon.drop.item.inventory": "Has recibido %2$s (%1$sx).",
  "cobblemon.drop.item.full": "Tu inventario estaba lleno, así que %1$s cayó al suelo.",
+  "cobblemon.mint.interact": "¡Las estadísticas de %1$s han cambiado!",
+  "cobblemon.mint.same_nature": "Las estadísticas de %1$s no parecen afectadas por la %2$s.",
+  "itemGroup.cobblemon.plants": "Plants",
+  "item.cobblemon.aguav_berry": "Aguav Berry",
+  "item.cobblemon.aguav_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -SpD Nature",
+  "item.cobblemon.apicot_berry": "Apicot Berry",
+  "item.cobblemon.apicot_berry.tooltip": "Raises holder's Sp. Def by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.aspear_berry": "Aspear Berry",
+  "item.cobblemon.aspear_berry.tooltip": "Holder is cured if it is frozen",
+  "item.cobblemon.babiri_berry": "Babiri Berry",
+  "item.cobblemon.babiri_berry.tooltip": "Halves damage taken from a supereffective Steel-type attack",
+  "item.cobblemon.belue_berry": "Belue Berry",
+  "item.cobblemon.belue_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.bluk_berry": "Bluk Berry",
+  "item.cobblemon.bluk_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.charti_berry": "Charti Berry",
+  "item.cobblemon.charti_berry.tooltip": "Halves damage taken from a supereffective Rock-type attack",
+  "item.cobblemon.cheri_berry": "Cheri Berry",
+  "item.cobblemon.cheri_berry.tooltip": "Holder cures itself if it is paralyzed",
+  "item.cobblemon.chesto_berry": "Chesto Berry",
+  "item.cobblemon.chesto_berry.tooltip": "Holder wakes up if it is asleep",
+  "item.cobblemon.chilan_berry": "Chilan Berry",
+  "item.cobblemon.chilan_berry.tooltip": "Halves damage taken from a Normal-type attack",
+  "item.cobblemon.chople_berry": "Chople Berry",
+  "item.cobblemon.chople_berry.tooltip": "Halves damage taken from a supereffective Fighting-type attack",
+  "item.cobblemon.coba_berry": "Coba Berry",
+  "item.cobblemon.coba_berry.tooltip": "Halves damage taken from a supereffective Flying-type attac",
+  "item.cobblemon.colbur_berry": "Colbur Berry",
+  "item.cobblemon.colbur_berry.tooltip": "Halves damage taken from a supereffective Dark-type attack",
+  "item.cobblemon.cornn_berry": "Cornn Berry",
+  "item.cobblemon.cornn_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.custap_berry": "Custap Berry",
+  "item.cobblemon.custap_berry.tooltip": "Holder moves first in its priority bracket when at 1/4 max HP or less",
+  "item.cobblemon.durin_berry": "Durin Berry",
+  "item.cobblemon.durin_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.enigma_berry": "Enigma Berry",
+  "item.cobblemon.enigma_berry.tooltip": "Restores 1/4 max HP after holder is hit by a supereffective move",
+  "item.cobblemon.figy_berry": "Figy Berry",
+  "item.cobblemon.figy_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -Atk Nature",
+  "item.cobblemon.ganlon_berry": "Ganlon Berry",
+  "item.cobblemon.ganlon_berry.tooltip": "Raises holder's Defense by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.grepa_berry": "Grepa Berry",
+  "item.cobblemon.grepa_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.haban_berry": "Haban Berry",
+  "item.cobblemon.haban_berry.tooltip": "Halves damage taken from a supereffective Dragon-type attack",
+  "item.cobblemon.hondew_berry": "Hondew Berry",
+  "item.cobblemon.hondew_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.hopo_berry": "Hopo Berry",
+  "item.cobblemon.hopo_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.iapapa_berry": "Iapapa Berry",
+  "item.cobblemon.iapapa_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -Def Nature",
+  "item.cobblemon.jaboca_berry": "Jaboca Berry",
+  "item.cobblemon.jaboca_berry.tooltip": "If holder is hit by a physical move, attacker loses 1/8 of its max HP",
+  "item.cobblemon.kasib_berry": "Kasib Berry",
+  "item.cobblemon.kasib_berry.tooltip": "Halves damage taken from a supereffective Ghost-type attack",
+  "item.cobblemon.kebia_berry": "Kebia Berry",
+  "item.cobblemon.kebia_berry.tooltip": "Halves damage taken from a supereffective Poison-type attack",
+  "item.cobblemon.kee_berry": "Kee Berry",
+  "item.cobblemon.kee_berry.tooltip": "Raises holder's Defense by 1 stage after it is hit by a physical attack",
+  "item.cobblemon.kelpsy_berry": "Kelpsy Berry",
+  "item.cobblemon.kelpsy_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.lansat_berry": "Lansat Berry",
+  "item.cobblemon.lansat_berry.tooltip": "Holder gains the Focus Energy effect when at 1/4 max HP or less",
+  "item.cobblemon.leppa_berry": "Leppa Berry",
+  "item.cobblemon.leppa_berry.tooltip": "Restores 10 PP to the first of the holder's moves to reach 0 PP",
+  "item.cobblemon.liechi_berry": "Liechi Berry",
+  "item.cobblemon.liechi_berry.tooltip": "Raises holder's Attack by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.lum_berry": "Lum Berry",
+  "item.cobblemon.lum_berry.tooltip": "Holder cures itself if it has a non-volatile status or is confused",
+  "item.cobblemon.mago_berry": "Mago Berry",
+  "item.cobblemon.mago_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -Spe Nature",
+  "item.cobblemon.magost_berry": "Magost Berry",
+  "item.cobblemon.magost_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.maranga_berry": "Maranga Berry",
+  "item.cobblemon.maranga_berry.tooltip": "Raises holder's Sp. Def by 1 stage after it is hit by a special attack",
+  "item.cobblemon.micle_berry": "Micle Berry",
+  "item.cobblemon.micle_berry.tooltip": "Holder's next move has 1.2x accuracy when at 1/4 max HP or less",
+  "item.cobblemon.nanab_berry": "Nanab Berry",
+  "item.cobblemon.nanab_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.touga_berry": "Touga Berry",
+  "item.cobblemon.touga_berry.tooltip": "Holder is cured if it is confused",
+  "item.cobblemon.nomel_berry": "Nomel Berry",
+  "item.cobblemon.nomel_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.occa_berry": "Occa Berry",
+  "item.cobblemon.occa_berry.tooltip": "Halves damage taken from a supereffective Fire-type attack",
+  "item.cobblemon.oran_berry": "Oran Berry",
+  "item.cobblemon.oran_berry.tooltip": "Restores 10 HP when at 1/2 max HP or less",
+  "item.cobblemon.pamtre_berry": "Pamtre Berry",
+  "item.cobblemon.pamtre_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.passho_berry": "Passho Berry",
+  "item.cobblemon.passho_berry.tooltip": "Halves damage taken from a supereffective Water-type attack",
+  "item.cobblemon.payapa_berry": "Payapa Berry",
+  "item.cobblemon.payapa_berry.tooltip": "Halves damage taken from a supereffective Psychic-type attack",
+  "item.cobblemon.pecha_berry": "Pecha Berry",
+  "item.cobblemon.pecha_berry.tooltip": "Holder is cured if it is poisoned",
+  "item.cobblemon.persim_berry": "Persim Berry",
+  "item.cobblemon.persim_berry.tooltip": "Holder is cured if it is confused",
+  "item.cobblemon.petaya_berry": "Petaya Berry",
+  "item.cobblemon.petaya_berry.tooltip": "Raises holder's Sp. Atk by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.pinap_berry": "Pinap Berry",
+  "item.cobblemon.pinap_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.pomeg_berry": "Pomeg Berry",
+  "item.cobblemon.pomeg_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.qualot_berry": "Qualot Berry",
+  "item.cobblemon.qualot_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.rabuta_berry": "Rabuta Berry",
+  "item.cobblemon.rabuta_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.rawst_berry": "Rawst Berry",
+  "item.cobblemon.rawst_berry.tooltip": "Holder is cured if it is burned",
+  "item.cobblemon.razz_berry": "Razz Berry",
+  "item.cobblemon.razz_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.rindo_berry": "Rindo Berry",
+  "item.cobblemon.rindo_berry.tooltip": "Halves damage taken from a supereffective Grass-type attack",
+  "item.cobblemon.roseli_berry": "Roseli Berry",
+  "item.cobblemon.roseli_berry.tooltip": "Halves damage taken from a supereffective Fairy-type attack",
+  "item.cobblemon.rowap_berry": "Rowap Berry",
+  "item.cobblemon.rowap_berry.tooltip": "If holder is hit by a special move, attacker loses 1/8 of its max HP",
+  "item.cobblemon.salac_berry": "Salac Berry",
+  "item.cobblemon.salac_berry.tooltip": "Raises holder's Speed by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.shuca_berry": "Shuca Berry",
+  "item.cobblemon.shuca_berry.tooltip": "Halves damage taken from a supereffective Ground-type attack",
+  "item.cobblemon.sitrus_berry": "Sitrus Berry",
+  "item.cobblemon.sitrus_berry.tooltip": "Restores 1/4 max HP when at 1/2 max HP or less",
+  "item.cobblemon.spelon_berry": "Spelon Berry",
+  "item.cobblemon.spelon_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.starf_berry": "Starf Berry",
+  "item.cobblemon.starf_berry.tooltip": "Raises a random stat by 2 when at 1/4 max HP or less",
+  "item.cobblemon.tamato_berry": "Tamato Berry",
+  "item.cobblemon.tamato_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.tanga_berry": "Tanga Berry",
+  "item.cobblemon.tanga_berry.tooltip": "Halves damage taken from a supereffective Bug-type attack",
+  "item.cobblemon.wacan_berry": "Wacan Berry",
+  "item.cobblemon.wacan_berry.tooltip": "Halves damage taken from a supereffective Electric-type attack",
+  "item.cobblemon.watmel_berry": "Watmel Berry",
+  "item.cobblemon.watmel_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.wepear_berry": "Wepear Berry",
+  "item.cobblemon.wepear_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.wiki_berry": "Wiki Berry",
+  "item.cobblemon.wiki_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -SpA Nature",
+  "item.cobblemon.yache_berry": "Yache Berry",
+  "item.cobblemon.yache_berry.tooltip": "Halves damage taken from a supereffective Ice-type attack",
  "cobblemon.command.general.invalid-party-slot": "¡No hay Pokémon en la ranura %1$s!",
  "cobblemon.command.givepokemon.give": "Se entregó %1$s a %2$s.",
  "cobblemon.command.pokemonedit": "Se editó el %1$s de %2$s.",
@@ -305,10 +572,19 @@
  "cobblemon.command.spawnpokemon.nospecies": "Error: Debes incluir un nombre de Pokémon o \"aleatorio\"",
  "cobblemon.command.held_item": "El %2$s de %1$s fue equipado con %3$s.",
  "cobblemon.command.pokeheal.in_battle": "¡No puedes curar a tu equipo mientras estás en un combate!",
+  "cobblemon.command.spawnpokemonfrompool": "Un %1$s ha aparecido en la zona.",
+  "cobblemon.command.spawnpokemonfrompool.unable_to_spawn": "No es posible generar un Pokémon.",
+  "cobblemon.command.pokebox.box_does_not_exist": "Ese jugador no tiene una caja %1$s.",
+  "cobblemon.command.pokebox.box_is_full": "La caja %1$s de ese jugador está llena.",
+  "cobblemon.command.pokebox.storage_is_full": "El almacenamiento de ese jugador está lleno.",
+  "cobblemon.command.pokebox.last_pokemon": "No se ha enviado el último Pokémon de ese jugador al PC.",
+  "cobblemon.command.pokemonrestart": "Se han limpiado el equipo y el PC de %1$s.",
  "advancements.cobblemon.root": "¡El mundo de Cobblemon!",
+  "advancements.cobblemon.root.description": "Elige un Pokémon inicial y embárcate en una nueva aventura",
  "advancements.cobblemon.obtain_leftovers": "Reduce, Reutiliza, ¡Recicla!",
  "advancements.cobblemon.obtain_leftovers.description": "Mantén los restos después de comer una manzana.",
-  "advancements.cobblemon.root.description": "Elige un Pokémon inicial y embárcate en una nueva aventura",
+  "advancements.cobblemon.any_plant": "Mother Nature's Bounty",
+  "advancements.cobblemon.any_plant.description": "Hope you've got a green thumb!",
  "advancements.cobblemon.harvest_apricorn": "¿Es una fruta o es una nuez?",
  "advancements.cobblemon.harvest_apricorn.description": "Interactúa con un Bonguri que ya ha crecido para cosecharlo",
  "advancements.cobblemon.harvest_apricorn_seed": "Poniendo de mi parte",
@@ -328,7 +604,7 @@
  "advancements.cobblemon.first_catch": "¡Un Nuevo Amigo!",
  "advancements.cobblemon.first_catch.description": "Usa una Poké Ball y captura tu primer Pokémon",
  "advancements.cobblemon.full_party": "Casa Llena",
-  "advancements.cobblemon.full_party.description": "Captura 5 Pokémon más para formar un equipo completo",
+  "advancements.cobblemon.full_party.description": "Catch more Pokémon and make a full party of 6",
  "advancements.cobblemon.first_evolution": "Trabajo Duro y Dedicación",
  "advancements.cobblemon.first_evolution.description": "Completa los requisitos de evolución de un Pokémon y evoluciónalos desde el menú del equipo",
  "advancements.cobblemon.first_battle_victory": "¿Y la Música de Victoria?",
@@ -337,6 +613,55 @@
  "advancements.cobblemon.first_shiny_catch.description": "Captura tu primer Pokémon Shiny",
  "advancements.cobblemon.healing_machine": "Poder Curativo",
  "advancements.cobblemon.healing_machine.description": "Espera suficiente tiempo para que una Máquina de Curación se cargue, y luego cura a tu equipo",
+  "advancements.cobblemon.obtain_leek": "There's a Leek in the Boat!",
+  "advancements.cobblemon.obtain_leek.description": "Obtain a Medicinal Leek, a wild crop that grows in freshwater",
+  "advancements.cobblemon.medicinal_brew": "Local Apothecary",
+  "advancements.cobblemon.medicinal_brew.description": "Brew a Medicinal Leek to create the basis for your healing needs",
+  "advancements.cobblemon.brew_potion": "You cannot handle my Potions",
+  "advancements.cobblemon.brew_potion.description": "Brew an Oran Berry into Medicinal Brew to create a Potion",
+  "advancements.cobblemon.brew_full_restore": "Champion's Choice",
+  "advancements.cobblemon.brew_full_restore.description": "Follow the brewing tree and create a Full Restore with a Lum Berry and Max Potion",
+  "advancements.cobblemon.brew_all": "Double Double Toil & Trouble",
+  "advancements.cobblemon.brew_all.description": "Brew every possible item using Medicinal Brew",
+  "advancements.cobblemon.obtain_mint": "Minty Fresh",
+  "advancements.cobblemon.obtain_mint.description": "Obtain a Nature Mint, a wild crop that grows high in the mountains",
+  "advancements.cobblemon.obtain_all_mints": "A Big Commit-mint",
+  "advancements.cobblemon.obtain_all_mints.description": "Obtain all 6 colors of Nature Mint and gain access to a full array of natures",
+  "advancements.cobblemon.obtain_revival_herb": "Herb your Enthusiasm",
+  "advancements.cobblemon.obtain_revival_herb.description": "Obtain a Revival Herb, a wild crop that grows in lush caves",
+  "advancements.cobblemon.use_revive": "Live to fight another day!",
+  "advancements.cobblemon.use_revive.description": "Use a Revive, Max Revive, or Revival Herb to revive a fainted Pokémon",
+  "advancements.cobblemon.obtain_big_root": "The Root of Basic Healing",
+  "advancements.cobblemon.obtain_big_root.description": "Obtain a Big Root, a wild crop that grows in dirt caves close to the surface",
+  "advancements.cobblemon.craft_remedy": "Basic Healing",
+  "advancements.cobblemon.craft_remedy.description": "Craft a Remedy, an early-game healing item that can be crafted into stronger forms",
+  "advancements.cobblemon.obtain_vivichoke": "Oki-Doki Vivichokey",
+  "advancements.cobblemon.obtain_vivichoke.description": "Obtain a Vivichoke, grown from strangely scarce Vivichoke Seeds",
+  "advancements.cobblemon.obtain_berry": "Very Berry",
+  "advancements.cobblemon.obtain_berry.description": "Obtain any Berry, wild crops that grow on the surface and have many uses",
+  "advancements.cobblemon.obtain_mutated_berry": "An Unexpected Result",
+  "advancements.cobblemon.obtain_mutated_berry.description": "Plant Berry Trees of different types next to each other and witness Mutation in action",
+  "advancements.cobblemon.obtain_all_berries": "Oops, all Berries!",
+  "advancements.cobblemon.obtain_all_berries.description": "Obtain one of every Berry in Cobblemon",
+  "advancements.cobblemon.use_pasture": "Free Roam: Enabled",
+  "advancements.cobblemon.use_pasture.description": "Craft a Pasture Block and allow your friends to wander",
+  "advancements.cobblemon.catch_all_vivillon": "Patterned Wings",
+  "advancements.cobblemon.catch_all_vivillon.description": "Obtain all patterns of Vivillon",
+  "advancements.cobblemon.evolve_veevees": "Valued Veevees",
+  "advancements.cobblemon.evolve_veevees.description": "Evolve Eevee into 8 different forms",
+  "advancements.cobblemon.evolve_shedinja": "Ghost in the Shell",
+  "advancements.cobblemon.evolve_shedinja.description": "Have an extra Poké Ball in your inventory and obtain a Shedinja",
+  "advancements.cobblemon.trade_pokemon": "Take Good Care!",
+  "advancements.cobblemon.trade_pokemon.description": "Trade a Pokémon with another Trainer",
+  "advancements.cobblemon.trade_shelmet_karrablast": "I'd like to report a theft!",
+  "advancements.cobblemon.trade_shelmet_karrablast.description": "Trade a Shelmet and Karrablast",
+  "advancements.cobblemon.max_level_baby": "Darwin? Who's That?",
+  "advancements.cobblemon.max_level_baby.description": "Take a first-stage Pokémon capable of evolution up to level 100",
+  "advancements.cobblemon.use_candy": "Sweet Tooth",
+  "advancements.cobblemon.use_candy.description": "Use any XP Candy on a Pokémon",
+  "advancements.cobblemon.own_zangoose_seviper": "Begrudging Partners",
+  "advancements.cobblemon.own_zangoose_seviper.description": "Have a Zangoose and Seviper in your party at the same time",
+  "cobblemon.battle.crash": "Se ha producido un error en la batalla. Si juegas en Un Jugador, reporte esto al equipo del mod. Si no, repórtelo a los administradores del servidor.",
  "cobblemon.battle.damage_dealt": "¡%1$s ha recibido %2$s puntos de daño!",
  "cobblemon.battle.used_move": "¡%1$s ha usado %2$s!",
  "cobblemon.battle.used_move_on": "¡%1$s ha usado %2$s en %3$s!",
@@ -356,14 +681,19 @@
  "cobblemon.battle.crit": "¡Un golpe crítico!",
  "cobblemon.battle.nothing": "Pero nada sucedió.",
  "cobblemon.battle.clearallboost": "¡Se han anulado todos los cambios en las características!",
+  "cobblemon.battle.clearallnegativeboost": "%1$s's negative stat changes were removed!",
+  "cobblemon.battle.clearallnegativeboost.zeffect": "%1$s's returned its decreased stats to normal using its Z-Power!",
  "cobblemon.battle.unboost.slight": "¡%2$s de %1$s ha bajado!",
  "cobblemon.battle.unboost.sharp": "El %2$s de %1$s ha bajado mucho.",
  "cobblemon.battle.unboost.severe": "El %1$s de %2$s ha bajado muchísimo.",
  "cobblemon.battle.unboost.cap.single": "%2$s de %1$s no bajará más.",
  "cobblemon.battle.unboost.cap.multiple": "Las características de %1$s no bajarán más.",
  "cobblemon.battle.boost.slight": "¡%2$s de %1$s ha aumentado!",
+  "cobblemon.battle.boost.slight.zeffect": "%1$s boosted its %2$s using its Z-Power!",
  "cobblemon.battle.boost.sharp": "¡%2$s de %1$s ha aumentado mucho!",
+  "cobblemon.battle.boost.sharp.zeffect": "%1$s boosted its %2$s sharply using its Z-Power!",
  "cobblemon.battle.boost.severe": "¡%2$s de %1$s ha aumentado muchísimo!",
+  "cobblemon.battle.boost.severe.zeffect": "%1$s boosted its %2$s drastically using its Z-Power!",
  "cobblemon.battle.boost.cap.single": "%2$s de %1$s no subirá más.",
  "cobblemon.battle.boost.cap.multiple": "Las características de %1$s no subirán más.",
  "cobblemon.battle.setboost.bellydrum": "¡%1$s disminuyó sus PS y maximizo su Ataque!",
@@ -381,162 +711,247 @@
  "cobblemon.capture.not_single": "Sólo puedes capturar Pokémon salvajes en una batalla 1v1.",
  "cobblemon.you_in_battle": "¡No puedes hacer eso mientras estás en una batalla!",
  "cobblemon.battle.turn": "Turno: %1$s",
-  "cobblemon.battle.rain_dance": "¡Empezó a llover!",
-  "cobblemon.battle.rain_dance_upkeep": "La lluvia continúa cayendo.",
-  "cobblemon.battle.sandstorm": "¡Se ha desatado una tormenta de arena!",
-  "cobblemon.battle.sandstorm_buffeted": "¡La tormenta de arena zarandea a %1$s!",
-  "cobblemon.battle.sandstorm_upkeep": "La tormenta de arena arrecia...",
-  "cobblemon.battle.sunny_day": "¡El sol pega fuerte!",
-  "cobblemon.battle.sunny_day_upkeep": "La luz del sol es fuerte.",
-  "cobblemon.battle.hail": "¡Ha empezado a granizar!",
-  "cobblemon.battle.hail_upkeep": "¡El granizo cae con violencia!",
-  "cobblemon.battle.hail_buffeted": "¡El granizo golpea a %1$s!",
-  "cobblemon.battle.no_weather": "El clima se despeja.",
-  "cobblemon.battle.confusion_start": "¡%1$s está confuso!",
-  "cobblemon.battle.confusion_activate": "¡Está tan confuso que se hiere a sí mismo!",
-  "cobblemon.battle.confusion_snapped": "¡%1$s salió de su confusión!",
-  "cobblemon.battle.protect_start": "¡%1$s se protege a sí mismo!",
-  "cobblemon.battle.protect_activate": "¡%1$s se protegió a sí mismo!",
-  "cobblemon.battle.magnitude_level": "¡Magnitud %1$s!",
-  "cobblemon.battle.bide_start": "¡%1$s empieza a acumular energía!",
-  "cobblemon.battle.bide_activate": "¡%1$s está acumulando energía!",
-  "cobblemon.battle.bide_end": "¡%1$s desató su energía!",
-  "cobblemon.battle.field_start.electric_terrain": "¡Una corriente eléctrica recorre el campo de batalla!",
-  "cobblemon.battle.field_start.grassy_terrain": "¡La hierba creció para cubrir el campo de batalla!",
-  "cobblemon.battle.field_start.gravity": "¡La gravedad se ha incrementado!",
-  "cobblemon.battle.field_start.magic_room": "¡Un área extraña donde los objetos equipables pierden sus efectos ha sido creada!",
-  "cobblemon.battle.field_start.misty_terrain": "¡La niebla se arremolina por del campo de batalla!",
-  "cobblemon.battle.field_start.mud_sport": "¡El poder de la electricidad se debilitó!",
-  "cobblemon.battle.field_start.psychic_terrain": "¡El campo de batalla se volvió raro!",
-  "cobblemon.battle.field_start.trick_room": "¡%1$s ha alterado las dimensiones!",
-  "cobblemon.battle.field_start.water_sport": "¡El poder del fuego se debilitó!",
-  "cobblemon.battle.field_start.wonder_room": "¡Se creó un área extraña donde se intercambian las estadísticas de Defensa y Defensa Esp.!",
-  "cobblemon.battle.field_end.electric_terrain": "La electricidad desapareció del campo de batalla.",
-  "cobblemon.battle.field_end.grassy_terrain": "El césped desapareció del campo de batalla.",
-  "cobblemon.battle.field_end.gravity": "¡La gravedad volvió a la normalidad!",
-  "cobblemon.battle.field_end.magic_room": "¡La Zona Mágica desapareció y los efectos de los objetos equipables regresaron a la normalidad!",
-  "cobblemon.battle.field_end.misty_terrain": "La niebla desapareció del campo de batalla.",
-  "cobblemon.battle.field_end.mud_sport": "Los efectos de Chapoteo Lodo se han disipado.",
-  "cobblemon.battle.field_end.psychic_terrain": "¡El campo de batalla ha dejado de ser extraño!",
-  "cobblemon.battle.field_end.trick_room": "¡Se han restaurado las dimensiones alternadas!",
-  "cobblemon.battle.field_end.water_sport": "Los efectos de Hidrochorro se han disipado.",
-  "cobblemon.battle.field_end.wonder_room": "¡La Zona Extraña desapareció y los efectos de Defensa y Defensa Esp. volvieron a la normalidad!",
-  "cobblemon.battle.cant.generic_block": "¡%1$s no puede utilizar %2$s!",
+  "cobblemon.battle.side_subject.ally": "tu",
+  "cobblemon.battle.side_subject.opponent": "el oponente",
+  "cobblemon.battle.weather.raindance.start": "¡Ha empezado a llover!",
+  "cobblemon.battle.weather.raindance.upkeep": "La lluvia continúa cayendo.",
+  "cobblemon.battle.weather.raindance.end": "Ha dejado de llover.",
+  "cobblemon.battle.weather.sandstorm.start": "¡Se ha desatado una tormenta de arena!",
+  "cobblemon.battle.weather.sandstorm.upkeep": "La tormenta de arena arrecia.",
+  "cobblemon.battle.weather.sandstorm.end": "La tormenta de arena cesó.",
+  "cobblemon.battle.weather.sunnyday.start": "¡El sol pega fuerte!",
+  "cobblemon.battle.weather.sunnyday.upkeep": "El sol brilla con fuerza.",
+  "cobblemon.battle.weather.sunnyday.end": "La luz del sol volvió a la normalidad.",
+  "cobblemon.battle.weather.hail.start": "¡Ha empezado a granizar!",
+  "cobblemon.battle.weather.hail.upkeep": "El granizo cae con violencia.",
+  "cobblemon.battle.weather.hail.end": "Ha dejado de granizar.",
+  "cobblemon.battle.start.bide": "¡%1$s empieza a acumular energía!",
+  "cobblemon.battle.start.yawn": "¡%1$s se adormeció!",
+  "cobblemon.battle.start.perish": "El Canto Mortal de %1$s bajó a %2$s.",
+  "cobblemon.battle.start.leechseed": "¡%1$s ha sido infectado con semillas!",
+  "cobblemon.battle.start.aquaring": "¡%1$s se cubrió con un manto de agua!",
+  "cobblemon.battle.start.charge": "¡%1$s ha empezado a cargar poder!",
+  "cobblemon.battle.start.taunt": "¡%1$s cayó en la provocación!",
+  "cobblemon.battle.start.autotomize": "¡%1$s se ha vuelto más ligero!",
+  "cobblemon.battle.start.attract": "¡%1$s se enamoró!",
+  "cobblemon.battle.start.focusenergy": "¡%1$s se preparó para pelear!",
+  "cobblemon.battle.start.uproar": "¡%1$s causó un alboroto!",
+  "cobblemon.battle.start.curse": "¡%1$s reduce sus PS para maldecir a %2$s!",
+  "cobblemon.battle.start.miracleeye": "¡%1$s fué identificado!",
+  "cobblemon.battle.start.dynamax": "%1$s Dynamaxed!",
+  "cobblemon.battle.start.gmax": "%1$s Gigantamaxed!",
+  "cobblemon.battle.fieldstart.electricterrain": "¡Una corriente eléctrica recorre el campo de batalla!",
+  "cobblemon.battle.fieldstart.grassyterrain": "¡Ha crecido hierba por todo el campo de batalla!",
+  "cobblemon.battle.fieldstart.gravity": "¡La gravedad ha aumentado!",
+  "cobblemon.battle.fieldstart.magicroom": "¡Se ha creado una Zona Mágica en la que los objetos equipados pierden sus efectos!",
+  "cobblemon.battle.fieldstart.mistyterrain": "¡La niebla ha envuelto el campo de batalla!",
+  "cobblemon.battle.fieldstart.mudsport": "¡El poder de los ataques eléctricos ha disminuido!",
+  "cobblemon.battle.fieldstart.psychicterrain": "¡Un aura psíquica envuelve el campo de batalla!",
+  "cobblemon.battle.fieldstart.trickroom": "¡%1$s ha alterado las dimensiones!",
+  "cobblemon.battle.fieldstart.watersport": "¡El poder de los ataques de fuego ha disminuido!",
+  "cobblemon.battle.fieldstart.wonderroom": "¡Se ha creado una Zona Extraña donde la Defensa y Defensa Especial se intercambiaron!",
+  "cobblemon.battle.fieldend.electricterrain": "La electricidad del campo de batalla se ha disipado.",
+  "cobblemon.battle.fieldend.grassyterrain": "La hierba del campo de batalla desapareció.",
+  "cobblemon.battle.fieldend.gravity": "¡La gravedad regresó a la normalidad!",
+  "cobblemon.battle.fieldend.magicroom": "¡La Zona Mágica desapareció y los efectos de los objetos equipados volvieron a la normalidad!",
+  "cobblemon.battle.fieldend.mistyterrain": "La niebla desapareció del campo de batalla.",
+  "cobblemon.battle.fieldend.mudsport": "Los efectos de Chapoteo Lodo se han disipado.",
+  "cobblemon.battle.fieldend.psychicterrain": "¡El campo de batalla ha dejado de ser extraño!",
+  "cobblemon.battle.fieldend.trickroom": "¡Las dimensiones alteradas han vuelto a la normalidad!",
+  "cobblemon.battle.fieldend.watersport": "Los efectos de Hidrochorro se han disipado.",
+  "cobblemon.battle.fieldend.wonderroom": "¡La Zona Extraña desapareció y los efectos de Defensa y Defensa Esp. volvieron a la normalidad!",
+  "cobblemon.battle.fieldactivate.perishsong": "¡Todos los Pokémon que escucharon en canto se debilitarán en 3 turnos!",
+  "cobblemon.battle.sidestart.stealthrock": "¡Piedras flotan alrededor del equipo de %1$s!",
+  "cobblemon.battle.sidestart.spikes": "¡Se esparcieron púas alrededor del equipo de %1$s!",
+  "cobblemon.battle.sidestart.toxicspikes": "¡Se esparcieron púas tóxicas alrededor del equipo de %1$s!",
+  "cobblemon.battle.sidestart.stickyweb": "¡Una red pegajosa se esparció alrededor del equipo de %1$s!",
+  "cobblemon.battle.sidestart.reflect": "¡Reflejo hace resistente al equipo de %1$s ante ataques físicos!",
+  "cobblemon.battle.sidestart.lightscreen": "¡Pantalla Luz hace resistente al equipo de %1$s ante ataques especiales!",
+  "cobblemon.battle.sidestart.auroraveil": "¡Velo Aurora hace resistente al equipo de %1$s ante ataques físicos y especiales!",
+  "cobblemon.battle.sidestart.tailwind": "¡El Viento Afín sopla a favor del equipo de %1$s!",
+  "cobblemon.battle.sidestart.safeguard": "¡El equipo de %1$s se cubrió con un velo místico!",
+  "cobblemon.battle.sideend.stealthrock": "¡Las piedras filosas desaparecen de alrededor del equipo de %1$s!",
+  "cobblemon.battle.sideend.spikes": "¡Las púas desaparecieron de alrededor del equipo de %1$s!",
+  "cobblemon.battle.sideend.toxicspikes": "¡Las púas venenosas desaparecieron alrededor del equipo de %1$s!",
+  "cobblemon.battle.sideend.stickyweb": "La red pegajosa desapareció de alrededor del equipo de %1$s",
+  "cobblemon.battle.sideend.reflect": "¡El Reflejo del equipo de %1$s se ha desvanecido!",
+  "cobblemon.battle.sideend.lightscreen": "¡La Pantalla de Luz del equipo de %1$s se ha desvanecido!",
+  "cobblemon.battle.sideend.auroraveil": "¡El Velo Aurora del equipo de %1$s se ha desvanecido!",
+  "cobblemon.battle.sideend.tailwind": "¡El Viento Afín del equipo de %1$s deja de soplar!",
+  "cobblemon.battle.sideend.safeguard": "¡El equipo de %1$s ya no está protegido por Velo Sagrado!",
+  "cobblemon.battle.cant.generic": "¡%1$s no puede usar %2$s!",
  "cobblemon.battle.cant.truant": "¡%1$s está holgazaneando!",
-  "cobblemon.battle.cant.flinched": "¡%1$s ha retrocedido y no pudo moverse!",
+  "cobblemon.battle.cant.flinch": "¡%1$s ha retrocedido y no pudo atacar!",
  "cobblemon.battle.cant.recharge": "¡%1$s debe recargarse!",
  "cobblemon.battle.cant.attract": "¡%1$s está inmovilizado por el amor!",
  "cobblemon.battle.cant.disable": "¡El movimiento %2$s de %1$s está desactivado!",
-  "cobblemon.battle.cant.focus_punch": "¡%1$s perdió la concentración y no se pudo mover!",
-  "cobblemon.battle.cant.heal_block": "¡%1$s no puede usar %2$s por Anticura!",
+  "cobblemon.battle.cant.focuspunch": "¡%1$s perdió la concentración y no pudo atacar!",
+  "cobblemon.battle.cant.healblock": "¡%1$s no puede usar %2$s por Anticura!",
  "cobblemon.battle.cant.imprison": "¡%1$s no puede usar su movimiento %2$s sellado!",
  "cobblemon.battle.cant.gravity": "¡%1$s no puede usar %2$s debido a la gravedad!",
-  "cobblemon.battle.cant.shell_trap": "¡La coraza trampa de %1$s no funcionó!",
+  "cobblemon.battle.cant.shelltrap": "¡La Coraza trampa de %1$s no funcionó!",
  "cobblemon.battle.cant.taunt": "¡%1$s no puede usar %2$s después de la mofa!",
-  "cobblemon.battle.cant.throat_chop": "¡Los efectos de Golpe Mordaza impiden que %1$s use ciertos movimientos!",
-  "cobblemon.battle.cant.no_pp": "¡%1$s intentó usar %2$s, pero no le quedaban PP!",
+  "cobblemon.battle.cant.throatchop": "¡El efecto de Golpe Mordaza impide que %1$s use algunos movimientos!",
+  "cobblemon.battle.activate.confusion": "¡%1$s está confundido!",
  "cobblemon.battle.activate.gravity": "¡%1$s no pudo permanecer en el aire debido a la gravedad!",
-  "cobblemon.battle.activate.misty_terrain": "¡%1$s se rodea de una neblina protectora!",
-  "cobblemon.battle.activate.psychic_terrain": "¡%1$s se rodea de terreno psíquico!",
-  "cobblemon.battle.activate.heal_bell": "¡Sonó una campana!",
+  "cobblemon.battle.activate.mistyterrain": "¡%1$s se rodea de una neblina protectora!",
+  "cobblemon.battle.activate.psychicterrain": "¡%1$s se rodea con un terreno psíquico!",
+  "cobblemon.battle.activate.healbell": "¡Sonó una campana!",
  "cobblemon.battle.activate.aromatherapy": "¡Un aroma relajante impregnó la zona!",
  "cobblemon.battle.activate.trapped": "¡%1$s ya no puede escapar!",
  "cobblemon.battle.activate.bind": "¡%1$s fue oprimido por %2$s!",
-  "cobblemon.battle.activate.court_change": "¡%1$s ha intercambiado los efectos del terreno de combate!",
-  "cobblemon.battle.activate.guard_split": "¡%1$s ha compartido su defensa con el objetivo!",
+  "cobblemon.battle.activate.wrap": "¡%1$s fue atrapado por %2$s!",
+  "cobblemon.battle.activate.struggle": "¡%1$s no puede usar más movimientos!",
+  "cobblemon.battle.activate.courtchange": "¡%1$s intercambió los efectos de batalla afectando a ambos lados del campo!",
+  "cobblemon.battle.activate.guardsplit": "¡%1$s ha compartido su defensa con el objetivo!",
  "cobblemon.battle.activate.spite": "¡Ha reducido los PP del movimiento %2$s de %1$s en %3$s!",
+  "cobblemon.battle.activate.lockon": "¡%1$s apunta a %2$s!",
+  "cobblemon.battle.activate.protosynthesis": "¡La fuerte luz del sol activó Paleosíntesis de %1$s!",
+  "cobblemon.battle.activate.bide": "¡%1$s está acumulando energía!",
+  "cobblemon.battle.activate.protect": "¡%1$s se está protegiendo!",
+  "cobblemon.battle.activate.magnitude": "¡Magnitud %1$s!",
+  "cobblemon.battle.activate.destinybond": "¡%1$s se lleva a su oponente con él!",
+  "cobblemon.battle.activate.synchronize": "[Sincronía de %1$s]",
+  "cobblemon.battle.activate.endure": "¡%1$s resistió el golpe!",
+  "cobblemon.battle.activate.attract": "¡%1$s está enamorado de %2$s!",
+  "cobblemon.battle.activate.firespin": "¡%1$s quedó atrapado en un vórtice de llamas!",
+  "cobblemon.battle.activate.trick": "¡%1$s ha cambiado objetos con su objetivo!",
+  "cobblemon.battle.activate.quickclaw": "¡%1$s puede actuar más rápido de lo normal gracias a su Garra Rápida!",
+  "cobblemon.battle.activate.focusband": "¡%1$s resistió gracias a su %2$s!",
+  "cobblemon.battle.activate.forewarn": "¡El %2$s de %1$s fue revelado!",
+  "cobblemon.battle.activate.disguise": "¡Su disfraz ha servido como señuelo!",
+  "cobblemon.battle.activate.liquidooze": "¡%1$s ha absorbido el lodo líquido!",
+  "cobblemon.battle.activate.whirlpool": "¡%1$s quedó atrapado en un vórtice!",
+  "cobblemon.battle.activate.clamp": "¡%2$s atenazó a %1$s!",
  "cobblemon.battle.prepare.bounce": "¡%1$s ha saltado muy alto!",
  "cobblemon.battle.prepare.dig": "¡%1$s se ocultó bajo el suelo!",
  "cobblemon.battle.prepare.dive": "¡%1$s se ocultó bajo el agua!",
  "cobblemon.battle.prepare.fly": "¡%1$s voló muy alto!",
-  "cobblemon.battle.prepare.freeze_shock": "¡Una luz fría envuelve a %1$s!",
+  "cobblemon.battle.prepare.freezeshock": "¡Una luz fría envuelve a %1$s!",
  "cobblemon.battle.prepare.geomancy": "¡%1$s está acumulando energía!",
-  "cobblemon.battle.prepare.ice_burn": "¡Una ráfaga gélida envuelve a %1$s!",
-  "cobblemon.battle.prepare.meteor_beam": "¡%1$s rebosa energía cósmica!",
-  "cobblemon.battle.prepare.phantom_force": "¡%1$s ha desaparecido instantáneamente!",
-  "cobblemon.battle.prepare.razor_wind": "¡%1$s ha provocado un remolino!",
-  "cobblemon.battle.prepare.skull_bash": "¡%1$s agachó la cabeza!",
-  "cobblemon.battle.prepare.sky_attack": "¡%1$s está rodeado de una luz brillante!",
-  "cobblemon.battle.prepare.sky_drop": "¡%1$s se llevó a su objetivo por los aires!",
-  "cobblemon.battle.prepare.solar_beam": "¡%1$s absorbió luz solar!",
+  "cobblemon.battle.prepare.iceburn": "¡Un viento gélido envuelve a %1$s!",
+  "cobblemon.battle.prepare.meteorbeam": "¡%1$s rebosa energía cósmica!",
+  "cobblemon.battle.prepare.phantomforce": "¡%1$s se desvaneció al instante!",
+  "cobblemon.battle.prepare.razorwind": "¡%1$s ha provocado un remolino!",
+  "cobblemon.battle.prepare.skullbash": "¡%1$s baja su cabeza!",
+  "cobblemon.battle.prepare.skyattack": "¡%1$s está rodeado por una luz brillante!",
+  "cobblemon.battle.prepare.skydrop": "¡%1$s se llevó a su objetivo a los cielos!",
+  "cobblemon.battle.prepare.solarbeam": "¡%1$s absorbió luz solar!",
  "cobblemon.battle.swapboost.generic": "¡%1$s intercambió las mejoras de sus estadísticas con %2$s!",
  "cobblemon.battle.singleturn.protect": "¡%1$s se está protegiendo!",
  "cobblemon.battle.singleturn.endure": "¡%1$s se ha fortalecido!",
-  "cobblemon.battle.singleturn.crafty_shield": "¡Truco Defensa protege al equipo de %1$s!",
+  "cobblemon.battle.singleturn.craftyshield": "¡Truco Defensa protegió al equipo de %1$s!",
  "cobblemon.battle.singleturn.powder": "¡%1$s está cubierto de polvo explosivo!",
-  "cobblemon.battle.singleturn.follow_me": "¡%1$s se convirtió en el centro de atención!",
+  "cobblemon.battle.singleturn.followme": "¡%1$s se convirtió en el centro de atención!",
  "cobblemon.battle.singleturn.snatch": "¡%1$s espera que su rival haga un movimiento!",
-  "cobblemon.battle.singleturn.quick_guard": "¡Anticipo protege al equipo de %1$s!",
-  "cobblemon.battle.singleturn.wide_guard": "¡Vastaguardia protege al equipo de %1$s!",
+  "cobblemon.battle.singleturn.quickguard": "¡Anticipo protegió al equipo de %1$s!",
+  "cobblemon.battle.singleturn.wideguard": "¡Vastaguardia protegió al equipo de %1$s!",
  "cobblemon.battle.singleturn.roost": "(%1$s pierde el tipo Volador este turno.)",
-  "cobblemon.battle.singleturn.mat_block": "¡%1$s intenta levantar un tatami y bloquear los ataques!",
-  "cobblemon.battle.singleturn.max_guard": "¡%1$s se está protegiendo!",
+  "cobblemon.battle.singleturn.matblock": "¡%1$s intenta levantar un tatami y bloquear los ataques!",
+  "cobblemon.battle.singleturn.maxguard": "¡%1$s se está protegiendo!",
  "cobblemon.battle.singleturn.instruct": "¡%1$s sigue el mandato de %2$s!",
-  "cobblemon.battle.singleturn.focus_punch": "¡%1$s está reforzando su concentración!",
+  "cobblemon.battle.singleturn.focuspunch": "¡%1$s está reforzando su concentración!",
  "cobblemon.battle.singleturn.electrify": "¡Los movimientos de %1$s han sido electrificados!",
-  "cobblemon.battle.singleturn.beak_blast": "¡%1$s empieza a elevar la temperatura de su pico!",
-  "cobblemon.battle.singleturn.helping_hand": "¡%2$s está listo para ayudar a %1$s!",
-  "cobblemon.battle.singleturn.magic_coat": "¡%1$s se cubrió con Capa Mágica!",
-  "cobblemon.battle.singleturn.rage_powder": "¡%1$s se convirtió en el centro de atención!",
-  "cobblemon.battle.singleturn.shell_trap": "¡%1$s ha activado la Coraza Trampa!",
+  "cobblemon.battle.singleturn.beakblast": "¡%1$s empieza a elevar la temperatura de su pico!",
+  "cobblemon.battle.singleturn.helpinghand": "¡%2$s está listo para ayudar a %1$s!",
+  "cobblemon.battle.singleturn.magiccoat": "¡%1$s se cubrió con Capa Mágica!",
+  "cobblemon.battle.singleturn.ragepowder": "¡%1$s se convirtió en el centro de atención!",
+  "cobblemon.battle.singleturn.shelltrap": "¡%1$s ha activado la Coraza Trampa!",
  "cobblemon.battle.singleturn.spotlight": "¡%1$s se convirtió en el centro de atención!",
-  "cobblemon.battle.singlemove.destiny_bond": "¡%1$s intenta llevarse a su rival!",
-  "cobblemon.battle.singlemove.glaive_rush": "%1$s throws itself into a reckless charge!",
+  "cobblemon.battle.singlemove.destinybond": "¡%1$s intenta llevarse a su rival con él!",
+  "cobblemon.battle.singlemove.glaiverush": "¡%1$s se lanza en un ataque temerario!",
  "cobblemon.battle.singlemove.grudge": "¡%1$s quiere provocar Rabia a su rival!",
  "cobblemon.battle.singlemove.rage": "¡%1$s está furioso!",
+  "cobblemon.battle.damage.wrap": "¡%1$s fue herido por Constricción!",
+  "cobblemon.battle.damage.confusion": "¡%1$s se hiere a sí mismo por la confusión!",
+  "cobblemon.battle.damage.leechseed": "¡La salud de %1$s ha sido drenada por Drenadoras!",
+  "cobblemon.battle.damage.sandstorm": "La tormenta de arena zarandea a %1$s.",
+  "cobblemon.battle.damage.hail": "El granizo golpea a %1$s.",
+  "cobblemon.battle.damage.stealthrock": "¡Piedras punteadas se clavan en %1$s!",
+  "cobblemon.battle.damage.spikes": "¡%1$s ha sido dañado por las púas!",
+  "cobblemon.battle.damage.recoil": "¡%1$s fue dañado por el retroceso!",
+  "cobblemon.battle.damage.item": "¡%1$s ha sido dañado por su %2$s!",
+  "cobblemon.battle.damage.lifeorb": "¡%1$s perdió parte de sus PS!",
+  "cobblemon.battle.damage.rockyhelmet": "¡%1$s ha sido dañado por el Casco Dentado de %2$s!",
+  "cobblemon.battle.damage.generic": "¡%1$s sufrió daño!",
+  "cobblemon.battle.damage.pokemonmimikyubusted": "¡El disfraz de %1$s se ha roto!",
+  "cobblemon.battle.damage.whirlpool": "¡%1$s fue dañado por Torbellino!",
+  "cobblemon.battle.damage.clamp": "¡%1$s fue herido por la Tenaza!",
+  "cobblemon.battle.damage.curse": "¡%1$s fue afectado por la maldición!",
  "cobblemon.battle.end.bind": "¡%1$s ya no está siendo oprimido!",
-  "cobblemon.battle.set_hp.pain_split": "¡Los combatientes comparten el daño sufrido!",
+  "cobblemon.battle.end.wrap": "¡%1$s fue liberado de Constricción!",
+  "cobblemon.battle.end.disable": "¡El movimiento de %1$s ya no está anulado!",
+  "cobblemon.battle.end.protosynthesis": "¡Los efectos de Paleosíntesis de %1$s se disiparon!",
+  "cobblemon.battle.end.taunt": "¡%1$s se libró de la mofa!",
+  "cobblemon.battle.end.firespin": "¡%1$s se liberó de Giro Fuego!",
+  "cobblemon.battle.end.bide": "¡%1$s ha liberado su energía!",
+  "cobblemon.battle.end.confusion": "¡%1$s se ha liberado de su confusión!",
+  "cobblemon.battle.end.whirlpool": "¡%1$s se liberó del vórtice!",
+  "cobblemon.battle.end.clamp": "¡%1$s fue liberado de la Tenaza!",
+  "cobblemon.battle.end.dynamax": "%1$s returned to normal!",
+  "cobblemon.battle.sethp.painsplit": "¡Los combatientes comparten su dolor!",
  "cobblemon.battle.ability.sturdy": "¡%1$s resitió el ataque!",
-  "cobblemon.battle.ability.speed_boost": "¡Impulso de %1$s activado!",
-  "cobblemon.battle.ability.intimidate": "¡Intimidación de %1$s activado!",
  "cobblemon.battle.ability.unnerve": "¡%1$s puso nervioso al oponente y no puede usar Bayas!",
  "cobblemon.battle.ability.anticipation": "¡%1$s se estremeció en anticipación!",
-  "cobblemon.battle.ability.air_lock": "Los efectos del clima desaparecieron.",
+  "cobblemon.battle.ability.airlock": "Los efectos del clima desaparecieron.",
  "cobblemon.battle.ability.generic": "¡%2$s de %1$s activado!",
+  "cobblemon.battle.ability.magicbounce": "¡%1$s ha rebotado la %2$s!",
  "cobblemon.battle.errors.busy": "¡%1$s está ocupado!",
  "cobblemon.battle.error.in_battle": "%1$s ya está en combate.",
  "cobblemon.battle.error.in_battle.personal": "¡Ya estás en combate!",
  "cobblemon.battle.error.no_pokemon": "¡No tienes Pokémon para usar en el combate!",
+  "cobblemon.battle.error.no_pokemon_opponent": "Your opponent doesn't have any usable Pokémon!",
  "cobblemon.battle.error.insufficient_pokemon": "%1$s tiene %2 Pokémon, pero se requieren %3.",
  "cobblemon.battle.error.insufficient_pokemon.personal": "Tienes %1 Pokémon utilizable, pero necesitas %2.",
+  "cobblemon.battle.error.pokemon_is_trapped": "[Opción no disponible] No se puede cambiar: El Pokémon activo está atrapado",
  "cobblemon.battle.immune": "¡Pero %1$s es inmune!",
  "cobblemon.battle.missed": "Pero falló.",
  "cobblemon.battle.hit_count": "¡Atacó %1$s veces!",
  "cobblemon.battle.hit_count_singular": "¡Atacó una vez!",
-  "cobblemon.battle.item.air_balloon.start": "¡%1$s está flotando en el aire con Globo Helio!",
-  "cobblemon.battle.item.recycle_or_pickup.start": "¡%1$s ha encontrado %2$s!",
-  "cobblemon.battle.item.frisk.start": "¡%1$s ha cacheado a %2$s y ha hallado su %3$s!",
-  "cobblemon.battle.item.take_item.start": "¡%1$s robó %3$s a %2$s!",
-  "cobblemon.battle.item.harvest.start": "¡%1$s ha recolectado %2$s!",
-  "cobblemon.battle.item.bestow.start": "¡%1$s ha recibido %2$s de %3$s!",
-  "cobblemon.battle.item.tricked.start": "¡%1$s provocó un cambio de objeto!",
-  "cobblemon.battle.item.eat.end": "¡%1$s se comió su %2$s!",
-  "cobblemon.battle.item.fling.end": "¡%1$s tiró su %2$s!",
-  "cobblemon.battle.item.knock_off.end": "¡%1$s echó abajo %3$s de %2$s!",
-  "cobblemon.battle.item.gem.end": "¡La gema de %1$s aumentó la potencia de %2$s!",
-  "cobblemon.battle.item.incinerate.end": "¡%2$s de %1$s se desintegró!",
-  "cobblemon.battle.item.air_balloon.end": "¡El Globo Helio de %1$s estalló!",
-  "cobblemon.battle.item.hung_on.end": "¡%1$s resistió gracias a su %2$s!",
-  "cobblemon.battle.item.red_card.end": "¡%1$s levantó su Tarjeta Roja contra %2$s!",
-  "cobblemon.battle.item.steal_eat.end": "¡%1$s robó y se comió la %3$s de %2$s!",
-  "cobblemon.battle.item.berry_juice.end": "¡Zumo de Baya de %1$s activado!",
-  "cobblemon.battle.item.used_its.end": "¡%1$s ha utilizado su %2$s!",
-  "cobblemon.battle.item.mental_herb.end": "¡%1$s se libró de los efectos mentales gracias a su Hierba Mental!",
-  "cobblemon.battle.item.power_herb.end": "¡%1$s está completamente cargado gracias a su Hierba Única!",
-  "cobblemon.battle.item.mirror_herb.end": "¡%1$s copió los cambios de estadísticas gracias a su Hierba Copia!",
-  "cobblemon.battle.item.white_herb.end": "¡%1$s volvió a su estado normal gracias a su Hierba Blanca!",
-  "cobblemon.battle.item.quick_claw.end": "¡%1$s puede actuar más rápido de lo normal gracias a su Garra Rápida!",
-  "cobblemon.battle.heal.z_effect": "¡Los PS de %1$s fueron restaurados gracias al Poder Z!",
+  "cobblemon.battle.item.airballoon": "¡%1$s flota en el aire con su %2$s!",
+  "cobblemon.battle.item.recycle": "¡%1$s ha encontrado %2$s!",
+  "cobblemon.battle.item.frisk": "¡%3$s ha cacheado a %1$s y ha hallado su %2$s!",
+  "cobblemon.battle.item.thief": "¡%1$s robó %3$s de %2$s!",
+  "cobblemon.battle.item.harvest": "¡%1$s ha recolectado %2$s!",
+  "cobblemon.battle.item.bestow": "¡%1$s ha recibido %2$s de %3$s!",
+  "cobblemon.battle.item.trick": "%1$s obtuvo una %2$s.",
+  "cobblemon.battle.item.eat": "%1$s ate its %2$s.",
+  "cobblemon.battle.enditem.eat": "¡%1$s se comió su %2$s!",
+  "cobblemon.battle.enditem.fling": "¡%1$s lanzó su %2$s!",
+  "cobblemon.battle.enditem.knockoff": "¡%3$s derribo %2$s de %1$s!",
+  "cobblemon.battle.enditem.gem": "¡La %2$s aumentó el poder de %1$s!",
+  "cobblemon.battle.enditem.incinerate": "¡El %1$s de %2$s ha sido quemada!",
+  "cobblemon.battle.enditem.airballoon": "¡El Globo Helio de %1$s estalló!",
+  "cobblemon.battle.enditem.redcard": "¡%1$s levantó su Tarjeta Roja contra %3$s!",
+  "cobblemon.battle.enditem.pluck": "¡%3$s robó y se comió la %2$s de %1$s!",
+  "cobblemon.battle.enditem.berryjuice": "¡El Zumo de Baya de %1$s se ha activado!",
+  "cobblemon.battle.enditem.generic": "¡%1$s ha utilizado su %2$s!",
+  "cobblemon.battle.enditem.mentalherb": "¡%1$s se libró de los efectos mentales gracias a su Hierba Mental!",
+  "cobblemon.battle.enditem.powerherb": "¡%1$s está completamente cargado gracias a su Hierba Única!",
+  "cobblemon.battle.enditem.mirrorherb": "¡%1$s ha copiado cambios de estadísticas con su Hierba Copia!",
+  "cobblemon.battle.enditem.whiteherb": "¡%1$s devolvió su estado a la normalidad usando su Hierba Blanca!",
+  "cobblemon.battle.heal.zeffect": "¡Los PS de %1$s fueron restaurados gracias al Poder Z!",
  "cobblemon.battle.heal.wish": "¡El deseo de %1$s se hizo realidad!",
  "cobblemon.battle.heal.drain": "¡Los PS de %1$s fueron absorbidos!",
-  "cobblemon.battle.heal.healing_wish": "¡El deseo de cura se ha hecho realidad para %1$s!",
-  "cobblemon.battle.heal.revival_blessing": "¡%1$s ha sido revivido y está listo para luchar de nuevo!",
-  "cobblemon.battle.heal.aqua_ring": "¡Un velo de agua restauró los PS de %1$s!",
+  "cobblemon.battle.heal.healingwish": "¡El deseo de curación de %1$s se ha hecho realidad!",
+  "cobblemon.battle.heal.revivalblessing": "¡%1$s ha sido revivido y está listo para luchar de nuevo!",
+  "cobblemon.battle.heal.aquaring": "¡Un velo de agua restauró los PS de %1$s!",
  "cobblemon.battle.heal.ingrain": "¡%1$s absorbió nutrientes con sus raíces!",
-  "cobblemon.battle.heal.grassy_terrain": "Los PS de %1$s se han restaurado.",
-  "cobblemon.battle.heal.leftovers": "¡%1$s restauró un poco de sus PS usando sus Restos!",
-  "cobblemon.battle.heal.rain_dish": "¡%1$s restauró PS gracias a Cura Lluvia!",
+  "cobblemon.battle.heal.grassyterrain": "Los PS de %1$s se han restaurado.",
+  "cobblemon.battle.heal.leftovers": "¡%1$s restauró un poco de sus PS usando Restos!",
+  "cobblemon.battle.heal.item": "¡%1$s restauró un poco de sus PS usando su %2$s!",
+  "cobblemon.battle.heal.raindish": "¡%1$s restauró PS gracias a Cura Lluvia!",
  "cobblemon.battle.heal.generic": "%1$s restauró sus PS.",
+  "cobblemon.battle.heal.bagitempotion": "It restored %1$s's HP",
+  "cobblemon.battle.curestatus.naturalcure": "¡%1$s ha sido curado por su Cura natural!",
+  "cobblemon.battle.bagitem.use": "%1$s used a %2$s on %3$s!",
+  "cobblemon.battle.bagitem.cannot": "You cannot use items right now.",
+  "cobblemon.battle.bagitem.invalid": "This item would not work.",
+  "cobblemon.battle.zpower": "%1$s surrounded itself with its Z-Power!",
+  "cobblemon.battle.zbroken": "%1$s couldn't fully protect itself and got hurt!",
+  "cobblemon.battle.terastallize": "%1$s has Terastallized into the %2$s-type!",
+  "cobblemon.battle.detailschange.mega": "%1$s is reacting to the Key Stone!",
+  "cobblemon.battle.mega": "%1$s has Mega Evolved!",
  "cobblemon.experience.gained": "%1$s recibió %2$s de experiencia.",
  "cobblemon.experience.level_up": "¡%1$s ahora es nivel %2$s!",
  "cobblemon.experience.learned_move": "%1$s aprendió %2$s.",
@@ -609,16 +1024,19 @@
  "cobblemon.move.category.status": "Estado",
  "cobblemon.status.sleep.apply": "¡%1$s se ha dormido!",
  "cobblemon.status.sleep.is": "%1$s está profundamente dormido.",
-  "cobblemon.status.sleep.woke": "¡%1$s se despertó!",
+  "cobblemon.status.sleep.cure": "¡%1$s se despertó!",
  "cobblemon.status.paralysis.apply": "¡%1$s ha sido paralizado!",
  "cobblemon.status.paralysis.is": "%1$s está paralizado y no puede moverse",
+  "cobblemon.status.paralysis.cure": "¡%1$s se curó de la parálisis!",
  "cobblemon.status.poison.apply": "¡%1$s ha sido envenenado!",
+  "cobblemon.status.poison.cure": "¡%1$s se curó del veneno!",
  "cobblemon.status.poisonbadly.apply": "¡%1$s ha sido gravemente envenenado!",
-  "cobblemon.status.poison.hurt": "%1$s fue herido por el veneno",
+  "cobblemon.status.poison.hurt": "%1$s fue herido por el veneno!",
  "cobblemon.status.burn.apply": "¡%1$s fue quemado!",
  "cobblemon.status.burn.hurt": "¡%1$s sufrió daño por sus quemaduras!",
+  "cobblemon.status.burn.cure": "¡%1$s se curó de la quemadura!",
  "cobblemon.status.frozen.apply": "¡%1$s ha sido congelado!",
-  "cobblemon.status.frozen.thawed": "¡%1$s se ha descongelado!",
+  "cobblemon.status.frozen.cure": "¡%1$s se ha descongelado!",
  "cobblemon.status.frozen.is": "¡%1$s está congelado!",
  "block.cobblemon.dawn_stone_ore": "Mena de Piedra Alba",
  "block.cobblemon.dusk_stone_ore": "Mena de Piedra Noche",
@@ -641,10 +1059,47 @@
  "block.cobblemon.deepslate_thunder_stone_ore": "Mena de Piedra Trueno de pizarra profunda",
  "block.cobblemon.deepslate_water_stone_ore": "Mena de Piedra Agua de pizarra profunda",
  "block.cobblemon.dripstone_moon_stone_ore": "Mena de Piedra Lunar de espeleotema",
+  "block.cobblemon.pasture": "Bloque de Pastura",
  "gamerule.doPokemonSpawning": "Generar Pokémon",
+  "gamerule.doShinyStarters": "Starters will be shiny",
  "cobblemon.command.checkspawns.invalid-bucket": "\"Bucket\" de Generación Inválido",
  "cobblemon.command.checkspawns.spawns": "Spawns",
  "cobblemon.command.checkspawns.nothing": "Nada puede aparecer aquí en este momento.",
+  "cobblemon.interaction.ev.add": "%1$s' %2$s EVs increased by %3$s!",
+  "cobblemon.interaction.ev.deduct": "%1$s' %2$s EVs decreased by %3$s!",
+  "cobblemon.interaction.pp.restore": "You restore the PP of %1$s.",
+  "cobblemon.interaction.friendsip.add": "%1$s grows closer to you!",
+  "cobblemon.interaction.status.cure": "%1$s is cured of its status condition!",
+  "cobblemon.interaction.hp.heal": "%1$s restored its HP a bit!",
+  "tag.item.cobblemon.apricorn_logs": "Apricorn Logs",
+  "tag.item.cobblemon.apricorn_sprouts": "Apricorn Sprouts",
+  "tag.item.cobblemon.apricorns": "Apricorns",
+  "tag.item.cobblemon.azalea_tree": "Azalea Trees",
+  "tag.item.cobblemon.berries": "Berries",
+  "tag.item.cobblemon.cobblemon_seeds": "Seeds",
+  "tag.item.cobblemon.evolution_items": "Evolution Items",
+  "tag.item.cobblemon.evolution_stones": "Evolution Stones",
+  "tag.item.cobblemon.experience_candies": "Experience Candies",
+  "tag.item.cobblemon.held.destiny_knot": "Destiny Knots",
+  "tag.item.cobblemon.held.everstone": "Everstones",
+  "tag.item.cobblemon.held.experience_share": "Experience Shares",
+  "tag.item.cobblemon.held.is_held_item": "Held Items",
+  "tag.item.cobblemon.held.lucky_egg": "Lucky Eggs",
+  "tag.item.cobblemon.held.power_anklet": "Power Anklets",
+  "tag.item.cobblemon.held.power_band": "Power Bands",
+  "tag.item.cobblemon.held.power_belt": "Power Belts",
+  "tag.item.cobblemon.held.power_bracer": "Power Bracers",
+  "tag.item.cobblemon.held.power_lens": "Power Lenses",
+  "tag.item.cobblemon.held.power_weight": "Power Weights",
+  "tag.item.cobblemon.herbs": "Herbs",
+  "tag.item.cobblemon.mint_leaf": "Mint Leaves",
+  "tag.item.cobblemon.mints": "Mints",
+  "tag.item.cobblemon.mutated_berries": "Mutation Berries",
+  "tag.item.cobblemon.plants": "Plants",
+  "tag.item.cobblemon.poke_balls": "Poké Balls",
+  "tag.item.cobblemon.protein_ingredients": "Protein Ingredients",
+  "tag.item.cobblemon.zinc_ingredients": "Zinc Ingredients",
+  "tag.item.cobblemon.seeds": "Seeds",

  "cobblemon.ability.adaptability": "Adaptable",
  "cobblemon.ability.adaptability.desc": "Potencia aún más los movimientos cuyo tipo coincida con el suyo.",
@@ -1,5 +1,4 @@
 {
-  "itemGroup.cobblemon.pokeball": "Poké Balls",
  "item.cobblemon.poke_ball": "Poké Ball",
  "item.cobblemon.slate_ball": "Pizarra Ball",
  "item.cobblemon.azure_ball": "Azur Ball",
@@ -32,13 +31,13 @@
  "item.cobblemon.park_ball": "Parque Ball",
  "item.cobblemon.dream_ball": "Ensueño Ball",
  "item.cobblemon.beast_ball": "Ente Ball",
-  "item.cobblemon.black_apricorn_seed": "Semilla de Bonguri Negro",
-  "item.cobblemon.blue_apricorn_seed": "Semilla de Bonguri Azul",
-  "item.cobblemon.green_apricorn_seed": "Semilla de Bonguri Verde",
-  "item.cobblemon.pink_apricorn_seed": "Semilla de Bonguri Rosa",
-  "item.cobblemon.red_apricorn_seed": "Semilla de Bonguri Rojo",
-  "item.cobblemon.white_apricorn_seed": "Semilla de Bonguri Blanco",
-  "item.cobblemon.yellow_apricorn_seed": "Semilla de Bonguri Amarillo",
+  "item.cobblemon.black_apricorn_seed": "Brote de Bonguri Negro",
+  "item.cobblemon.blue_apricorn_seed": "Brote de Bonguri Azul",
+  "item.cobblemon.green_apricorn_seed": "Brote de Bonguri Verde",
+  "item.cobblemon.pink_apricorn_seed": "Brote de Bonguri Rosa",
+  "item.cobblemon.red_apricorn_seed": "Brote de Bonguri Rojo",
+  "item.cobblemon.white_apricorn_seed": "Brote de Bonguri Blanco",
+  "item.cobblemon.yellow_apricorn_seed": "Brote de Bonguri Amarillo",
  "item.cobblemon.black_apricorn": "Bonguri Negro",
  "item.cobblemon.blue_apricorn": "Bonguri Azul",
  "item.cobblemon.green_apricorn": "Bonguri Verde",
@@ -46,7 +45,8 @@
  "item.cobblemon.red_apricorn": "Bonguri Rojo",
  "item.cobblemon.white_apricorn": "Bonguri Blanco",
  "item.cobblemon.yellow_apricorn": "Bonguri Amarillo",
-  "itemGroup.cobblemon.evolution_item": "Objetos Evolutivos",
+  "item.cobblemon.vivichoke_seeds": "Semillas de Revibrote",
+  "item.cobblemon.vivichoke": "Revibrote",
  "item.cobblemon.link_cable": "Cordón Unión",
  "item.cobblemon.dragon_scale": "Escama Dragón",
  "item.cobblemon.kings_rock": "Roca del Rey",
@@ -88,7 +88,6 @@
  "item.cobblemon.sun_stone": "Piedra Solar",
  "item.cobblemon.thunder_stone": "Piedra Trueno",
  "item.cobblemon.water_stone": "Piedra Agua",
-  "itemGroup.cobblemon.medicine": "Botiquín",
  "item.cobblemon.rare_candy": "Caramelo Raro",
  "item.cobblemon.exp_candy_xs": "Caramelo Experiencia XS",
  "item.cobblemon.exp_candy_s": "Caramelo Experiencia S",
@@ -101,10 +100,47 @@
  "item.cobblemon.iron": "Hierro",
  "item.cobblemon.protein": "Proteína",
  "item.cobblemon.zinc": "Zinc",
-  "itemGroup.cobblemon.held_item": "Objetos Equipables",
+  "item.cobblemon.potion": "Poción",
+  "item.cobblemon.super_potion": "Super Poción",
+  "item.cobblemon.hyper_potion": "Hiper Poción",
+  "item.cobblemon.max_potion": "Poción Máxima",
+  "item.cobblemon.full_restore": "Restaurar Todo",
+  "item.cobblemon.red_mint_leaf": "Hoja de Menta Roja",
+  "item.cobblemon.red_mint_leaf.tooltip": "Es capaz de influir en el Ataque del Pokémon",
+  "item.cobblemon.blue_mint_leaf": "Hoja de Menta Azul",
+  "item.cobblemon.blue_mint_leaf.tooltip": "Es capaz de influir en la Defensa del Pokémon",
+  "item.cobblemon.cyan_mint_leaf": "Hoja de Menta Cian",
+  "item.cobblemon.cyan_mint_leaf.tooltip": "Es capaz de influir en el Ataque Especial del Pokémon",
+  "item.cobblemon.pink_mint_leaf": "Hoja de Menta Rosa",
+  "item.cobblemon.pink_mint_leaf.tooltip": "Es capaz de influir en la Defensa Especial del Pokémon",
+  "item.cobblemon.green_mint_leaf": "Hoja de Menta Verde",
+  "item.cobblemon.green_mint_leaf.tooltip": "Es capaz de influir en la Velocidad del Pokémon",
+  "item.cobblemon.white_mint_leaf": "Hoja de Menta Blanca",
+  "item.cobblemon.white_mint_leaf.tooltip": "Es capaz de neutralizar la naturaleza del Pokémon",
+  "item.cobblemon.lonely_mint": "Menta Huraña",
+  "item.cobblemon.adamant_mint": "Menta Firme",
+  "item.cobblemon.naughty_mint": "Menta Pícara",
+  "item.cobblemon.brave_mint": "Menta Audaz",
+  "item.cobblemon.bold_mint": "Menta Osada",
+  "item.cobblemon.impish_mint": "Menta Agitada",
+  "item.cobblemon.lax_mint": "Menta Floja",
+  "item.cobblemon.relaxed_mint": "Menta Plácida",
+  "item.cobblemon.modest_mint": "Menta Modesta",
+  "item.cobblemon.mild_mint": "Menta Afable",
+  "item.cobblemon.rash_mint": "Menta Alocada",
+  "item.cobblemon.quiet_mint": "Menta Mansa",
+  "item.cobblemon.calm_mint": "Menta Serena",
+  "item.cobblemon.gentle_mint": "Menta Amable",
+  "item.cobblemon.careful_mint": "Menta Cauta",
+  "item.cobblemon.sassy_mint": "Menta Grosera",
+  "item.cobblemon.timid_mint": "Menta Miedosa",
+  "item.cobblemon.hasty_mint": "Menta Activa",
+  "item.cobblemon.jolly_mint": "Menta Alegre",
+  "item.cobblemon.naive_mint": "Menta Ingenua",
+  "item.cobblemon.serious_mint": "Menta Seria",
  "item.cobblemon.assault_vest": "Chaleco Asalto",
  "item.cobblemon.auspicious_armor": "Armadura Auspiciosa",
-  "item.cobblemon.big_root": "Raíz Grande",
+  "item.cobblemon.malicious_armor": "Armadura Maldita",
  "item.cobblemon.black_belt": "Cinturón Negro",
  "item.cobblemon.black_glasses": "Gafas de Sol",
  "item.cobblemon.black_sludge": "Lodo Negro",
@@ -138,6 +174,21 @@
  "item.cobblemon.spell_tag": "Hechizo",
  "item.cobblemon.twisted_spoon": "Cuchara Torcida",
  "item.cobblemon.wise_glasses": "Gafas Especiales",
+  "item.cobblemon.mental_herb": "Hierba Mental",
+  "item.cobblemon.mirror_herb": "Hierba Copia",
+  "item.cobblemon.power_herb": "Hierba Única",
+  "item.cobblemon.white_herb": "Hierba Blanca",
+  "item.cobblemon.bright_powder": "Polvo Brillo",
+  "item.cobblemon.metal_powder": "Polvo Metálico",
+  "item.cobblemon.quick_powder": "Polvo Rápido",
+  "item.cobblemon.destiny_knot": "Lazo Destino",
+  "item.cobblemon.everstone": "Piedra Eterna",
+  "item.cobblemon.power_anklet": "Franja Recia",
+  "item.cobblemon.power_band": "Banda Recia",
+  "item.cobblemon.power_belt": "Cinta Recia",
+  "item.cobblemon.power_bracer": "Brazal Recio",
+  "item.cobblemon.power_lens": "Lente Recio",
+  "item.cobblemon.power_weight": "Pesa Recia",
  "item.cobblemon.poke_ball.tooltip": "Ratio de captura ×1",
  "item.cobblemon.slate_ball.tooltip": "Ratio de captura ×1",
  "item.cobblemon.azure_ball.tooltip": "Ratio de captura ×1",
@@ -170,6 +221,56 @@
  "item.cobblemon.park_ball.tooltip": "Ratio de captura ×2,5 en todos los biomas de Bosque o Llanuras",
  "item.cobblemon.dream_ball.tooltip": "Ratio de captura ×4 en Pokémon dormidos",
  "item.cobblemon.beast_ball.tooltip": "Ratio de captura ×5 en Ultraentes, ×0,1 en los demás casos",
+  "item.cobblemon.mulch_base": "Fertilizante",
+  "item.cobblemon.coarse_mulch": "Fertilizante Grueso",
+  "item.cobblemon.growth_mulch": "Fertilizante Rápido",
+  "item.cobblemon.humid_mulch": "Fertilizante Húmedo",
+  "item.cobblemon.loamy_mulch": "Fertilizante Arcilloso",
+  "item.cobblemon.peat_mulch": "Fertilizante Turboso",
+  "item.cobblemon.rich_mulch": "Fertilizante Cargado",
+  "item.cobblemon.sandy_mulch": "Fertilizante Arenoso",
+  "item.cobblemon.surprise_mulch": "Ferilizante Sorpresa",
+  "item.cobblemon.medicinal_leek": "Puerro Medicinal",
+  "item.cobblemon.energy_root": "Raíz Energía",
+  "item.cobblemon.revival_herb": "Hierba Revivir",
+  "item.cobblemon.roasted_leek": "Puerro Cocido",
+  "item.cobblemon.leek_and_potato_stew": "Sopa de Puerro y Papa",
+  "item.cobblemon.braised_vivichoke": "Revibrote Hervido",
+  "item.cobblemon.vivichoke_dip": "Salsa de Revibrote",
+  "item.cobblemon.berry_juice": "Jugo de Bayas",
+  "item.cobblemon.remedy": "Remedio",
+  "item.cobblemon.fine_remedy": "Super Remedio",
+  "item.cobblemon.superb_remedy": "Hiper Remedio",
+  "item.cobblemon.heal_powder": "Polvo Curación",
+  "item.cobblemon.medicinal_brew": "Bebida medicinal",
+  "item.cobblemon.revive": "Revivir",
+  "item.cobblemon.max_revive": "Revivir Máximo",
+  "item.cobblemon.pp_up": "Más PP",
+  "item.cobblemon.pp_max": "PP Máximo",
+  "item.cobblemon.x_attack": "Ataque X",
+  "item.cobblemon.x_defence": "Defensa X",
+  "item.cobblemon.x_accuracy": "Presición X",
+  "item.cobblemon.x_speed": "Velocidad X",
+  "item.cobblemon.x_special_defence": "Defensa Especial X",
+  "item.cobblemon.x_special_attack": "Ataque Especial X",
+  "item.cobblemon.dire_hit": "Directo",
+  "item.cobblemon.guard_spec": "Protección X",
+  "item.cobblemon.full_heal": "Cura Total",
+  "item.cobblemon.antidote": "Antídoto",
+  "item.cobblemon.awakening": "Despertador",
+  "item.cobblemon.burn_heal": "Anti Quemadura",
+  "item.cobblemon.ice_heal": "Descongelante",
+  "item.cobblemon.paralyze_heal": "Anti Paralizis",
+  "item.cobblemon.ether": "Eter",
+  "item.cobblemon.max_ether": "Eter Máximo",
+  "item.cobblemon.elixir": "Elixir",
+  "item.cobblemon.max_elixir": "Elixir Máximo",
+  "itemGroup.cobblemon.blocks": "Bloques",
+  "itemGroup.cobblemon.pokeball": "Poké Balls",
+  "itemGroup.cobblemon.agriculture": "Agricultura",
+  "itemGroup.cobblemon.consumables": "Consumibles",
+  "itemGroup.cobblemon.held_item": "Objetos Equipables",
+  "itemGroup.cobblemon.evolution_item": "Objetos Evolutivos",
  "block.cobblemon.apricorn_log": "Tronco de Bonguri",
  "block.cobblemon.stripped_apricorn_log": "Tronco de Bonguri sin corteza",
  "block.cobblemon.apricorn_wood": "Leño de Bonguri",
@@ -183,6 +284,7 @@
  "block.cobblemon.apricorn_button": "Botón de Bonguri",
  "block.cobblemon.apricorn_slab": "Losa de Bonguri",
  "block.cobblemon.apricorn_fence_gate": "Puerta de valla de Bonguri",
+  "block.cobblemon.big_root": "Raíz Grande",
  "block.cobblemon.black_apricorn_sapling": "Brote de Bonguri Negro",
  "block.cobblemon.blue_apricorn_sapling": "Brote de Bonguri Azul",
  "block.cobblemon.green_apricorn_sapling": "Brote de Bonguri Verde",
@@ -196,12 +298,24 @@
  "block.cobblemon.healing_machine.tooltip1": "Debe cargarse después de ser colocada.",
  "block.cobblemon.healing_machine.tooltip2": "Se carga a lo largo del tiempo.",
  "block.cobblemon.pc": "PC",
+  "block.cobblemon.red_mint": "Semilla de Menta Roja",
+  "block.cobblemon.blue_mint": "Semilla de Menta Azul",
+  "block.cobblemon.cyan_mint": "Semilla de Menta Cian",
+  "block.cobblemon.pink_mint": "Semilla de Menta Rosa",
+  "block.cobblemon.green_mint": "Semilla de Menta Verde",
+  "block.cobblemon.white_mint": "Semilla de Menta Blanca",
+  "block.cobblemon.vivichoke_seeds": "Semilla de Revibrote",
+  "block.cobblemon.pep_up_flower": "Flor Éter",
+  "block.cobblemon.potted_pep_up_flower": "Flor Éter en Maceta",
  "cobblemon.overflow_no_pc": "¡Tu equipo estaba lleno y no tienes un PC!",
  "cobblemon.overflow_no_space": "¡Tu equipo estaba lleno y también lo estaba %1$s!",
  "cobblemon.overflow_to_pc": "¡Tu equipo estaba lleno! %1$s ha sido añadido a %2$s.",
  "cobblemon.your_pc": "tu PC",
-  "cobblemon.command.pokespawn.invalid-pokemon": "Nombre de Pokémon inválido",
+  "cobblemon.command.pokespawn.invalid-pokemon": "Nombre de Pokémon no válido",
  "cobblemon.command.pokespawn.invalid-move": "Nombre de Movimiento inválido",
+  "cobblemon.command.clearparty.nonethere": "No hay pokémon en el quipo de %1$s.",
+  "cobblemon.command.clearparty.cleared": "El equipo de %1$s fué despejado.",
+  "cobblemon.command.clearpc.cleared": "Se despejó el PC de %1$s.",
  "cobblemon.ui.generic.yes": "Sí",
  "cobblemon.ui.generic.no": "No",
  "cobblemon.ui.pokenav.title": "PokéNav",
@@ -211,6 +325,8 @@
  "cobblemon.ui.starter.alreadyselected": "¡Ya has elegido un inicial!",
  "cobblemon.ui.starter.cannotchoose": "No puedes elegir un inicial ahora mismo.",
  "cobblemon.ui.starter.hasalreadychosen": "%1$s ya ha elegido un inicial.",
+  "cobblemon.ui.starter.choose_starter_title": "¡Elije tu inicial!",
+  "cobblemon.ui.starter.choose_starter_description": "Presiona la tecla %1$s",
  "cobblemon.ui.starter.chooseyourstarter": "¡Pulsa %1$s para elegir tu Pokémon y comenzar tu viaje!",
  "cobblemon.ui.moves": "Movimientos",
  "cobblemon.ui.moves.switch": "Cambiar Movimiento",
@@ -237,6 +353,12 @@
  "cobblemon.ui.info.ability": "Habilidad",
  "cobblemon.ui.info.experience_points": "Puntos de Exp.",
  "cobblemon.ui.info.to_next_level": "Para subir de nivel.",
+  "cobblemon.ui.trade": "Intercambio",
+  "cobblemon.trade.occupied": "%1$s está ocupado.",
+  "cobblemon.trade.request_expired": "La solicitud de intercambio con %1$s expiró.",
+  "cobblemon.trade.request_already_expired": "Su solicitud de intercambio ya ha expirado.",
+  "cobblemon.trade.request_sent": "Se ha ofrecido intercambiar con %1$s",
+  "cobblemon.trade.offer": "%1$s se ofrece a intercambiar Pokémon contigo.",
  "cobblemon.ui.party": "Equipo",
  "cobblemon.ui.power": "Potencia",
  "cobblemon.ui.accuracy": "Precisión",
@@ -245,6 +367,10 @@
  "cobblemon.ui.exit": "Salir",
  "cobblemon.ui.pc.box.title": "Caja %1$s",
  "cobblemon.ui.pc.release": "Liberar",
+  "cobblemon.ui.pasture": "Pastura",
+  "cobblemon.ui.pasture.recall_all": "Retirar Todo",
+  "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)",
+  "cobblemon.pasture.too_many_nearby": "Hay demasiados Pokémon cerca.",
  "key.cobblemon.upshiftparty": "Anterior Pokémon del Grupo",
  "key.cobblemon.downshiftparty": "Siguiente Pókemon del Grupo",
  "key.cobblemon.hideparty": "Esconder Equipo",
@@ -291,9 +417,150 @@
  "cobblemon.label.lv": "Nv. %1$s",
  "cobblemon.challenge_label": "Pulsa %1$s para luchar.",
  "cobblemon.challenge.sender": "¡Has desafiado a %1$s a un combate!",
-  "cobblemon.challenge.receiver": "¡%1$s te ha desafiado a un combate! Pulsa %2$s mientras le miras para combatir.",
+  "cobblemon.challenge.receiver": "¡%1$s te desafía a una batalla!",
  "cobblemon.drop.item.inventory": "Has recibido %2$s (%1$sx).",
  "cobblemon.drop.item.full": "Tu inventario estaba lleno, así que %1$s cayó al suelo.",
+  "cobblemon.mint.interact": "¡Las estadísticas de %1$s cambiaron!",
+  "cobblemon.mint.same_nature": "Las estadísticas de %1$s no parecen afectadas por la %2$s.",
+  "itemGroup.cobblemon.plants": "Plantas",
+  "item.cobblemon.aguav_berry": "Baya Guaya",
+  "item.cobblemon.aguav_berry.tooltip": "Cura 1/3 de los PS si se tiene 1/4 de PS o menos. Confunde si se tiene una naturaleza desfavorable en Defensa Especial",
+  "item.cobblemon.apicot_berry": "Baya Aricoc",
+  "item.cobblemon.apicot_berry.tooltip": "Aumenta la Defensa Especial del portador en 1 nivel cuando tiene 1/4 de sus PS o menos",
+  "item.cobblemon.aspear_berry": "Baya Perasi",
+  "item.cobblemon.aspear_berry.tooltip": "Descongela al portador",
+  "item.cobblemon.babiri_berry": "Baya Baribá",
+  "item.cobblemon.babiri_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Acero",
+  "item.cobblemon.belue_berry": "Baya Andano",
+  "item.cobblemon.belue_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.bluk_berry": "Baya Oram",
+  "item.cobblemon.bluk_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.charti_berry": "Baya Alcho",
+  "item.cobblemon.charti_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Roca",
+  "item.cobblemon.cheri_berry": "Baya Zreza",
+  "item.cobblemon.cheri_berry.tooltip": "Cura la parálisis",
+  "item.cobblemon.chesto_berry": "Baya Atania",
+  "item.cobblemon.chesto_berry.tooltip": "Despierta del sueño",
+  "item.cobblemon.chilan_berry": "Baya Chilan",
+  "item.cobblemon.chilan_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque tipo Normal",
+  "item.cobblemon.chople_berry": "Baya Pomaro",
+  "item.cobblemon.chople_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Lucha",
+  "item.cobblemon.coba_berry": "Baya Kouba",
+  "item.cobblemon.coba_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Volador",
+  "item.cobblemon.colbur_berry": "Baya Dillo",
+  "item.cobblemon.colbur_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Siniestro",
+  "item.cobblemon.cornn_berry": "Baya Mais",
+  "item.cobblemon.cornn_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.custap_berry": "Baya Chiri",
+  "item.cobblemon.custap_berry.tooltip": "El portador se mueve primero por prioridad cuando tiene 1/4 de sus PS máximos o menos",
+  "item.cobblemon.durin_berry": "Baya Rudion",
+  "item.cobblemon.durin_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.enigma_berry": "Baya Enigma",
+  "item.cobblemon.enigma_berry.tooltip": "Cura 1/4 de los PS máximos si se es golpeado por un movimiento superefectivo",
+  "item.cobblemon.figy_berry": "Baya Higog",
+  "item.cobblemon.figy_berry.tooltip": "Cura 1/3 de los PS si se tiene 1/4 de PS o menos. Confunde si se tiene una naturaleza desfavorable en Ataque",
+  "item.cobblemon.ganlon_berry": "Baya Gonlan",
+  "item.cobblemon.ganlon_berry.tooltip": "Aumenta la Defensa del portador en 1 nivel cuando tiene 1/4 de sus PS o menos",
+  "item.cobblemon.grepa_berry": "Baya Uvav",
+  "item.cobblemon.grepa_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.haban_berry": "Baya Anjiro",
+  "item.cobblemon.haban_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Dragón",
+  "item.cobblemon.hondew_berry": "Baya Meluce",
+  "item.cobblemon.hondew_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.hopo_berry": "Baya Lupu",
+  "item.cobblemon.hopo_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.iapapa_berry": "Baya Pabaya",
+  "item.cobblemon.iapapa_berry.tooltip": "Cura 1/3 de los PS si se tiene 1/4 de PS o menos. Confunde si se tiene una naturaleza desfavorable en Defensa",
+  "item.cobblemon.jaboca_berry": "Baya Jaboca",
+  "item.cobblemon.jaboca_berry.tooltip": "Si el portador es golpeado por un ataque físico, el atacante pierde 1/8 de sus PS máximos",
+  "item.cobblemon.kasib_berry": "Baya Drasi",
+  "item.cobblemon.kasib_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Fantasma",
+  "item.cobblemon.kebia_berry": "Baya Keiba",
+  "item.cobblemon.kebia_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Veneno",
+  "item.cobblemon.kee_berry": "Baya Biglia",
+  "item.cobblemon.kee_berry.tooltip": "Aumenta la Defensa del portador en 1 nivel tras recibir un ataque físico",
+  "item.cobblemon.kelpsy_berry": "Baya Algama",
+  "item.cobblemon.kelpsy_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.lansat_berry": "Baya Zonlan",
+  "item.cobblemon.lansat_berry.tooltip": "El portador obtiene el efecto de Foco Energía si tiene 1/4 de sus PS máximos o menos",
+  "item.cobblemon.leppa_berry": "Baya Zanama",
+  "item.cobblemon.leppa_berry.tooltip": "Restaura 10 PP al primer movimiento del portador que se quede sin PP",
+  "item.cobblemon.liechi_berry": "Baya Lichi",
+  "item.cobblemon.liechi_berry.tooltip": "Aumenta el Ataque del portador en 1 nivel cuando tiene 1/4 de sus PS o menos",
+  "item.cobblemon.lum_berry": "Baya Ziuela",
+  "item.cobblemon.lum_berry.tooltip": "El portador se cura de todos los estados alterados y la confusión",
+  "item.cobblemon.mago_berry": "Baya Ango",
+  "item.cobblemon.mago_berry.tooltip": "Cura 1/3 de los PS si se tiene 1/4 de PS o menos. Confunde si se tiene una naturaleza desfavorable en Velocidad",
+  "item.cobblemon.magost_berry": "Baya Aostan",
+  "item.cobblemon.magost_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.maranga_berry": "Baya Maranga",
+  "item.cobblemon.maranga_berry.tooltip": "Aumenta la Defensa Especial del portador en 1 nivel tras recibir un ataque especial",
+  "item.cobblemon.micle_berry": "Baya Largo",
+  "item.cobblemon.micle_berry.tooltip": "El siguiente movimiento del portador aumenta su precisión x1.2 cuanto tiene 1/4 de sus PS o menos",
+  "item.cobblemon.nanab_berry": "Baya Látano",
+  "item.cobblemon.nanab_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.touga_berry": "Baya Touga",
+  "item.cobblemon.touga_berry.tooltip": "Cura la confusión",
+  "item.cobblemon.nomel_berry": "Baya Monli",
+  "item.cobblemon.nomel_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.occa_berry": "Baya Caoca",
+  "item.cobblemon.occa_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Fuego",
+  "item.cobblemon.oran_berry": "Baya Aranja",
+  "item.cobblemon.oran_berry.tooltip": "Cura 10 PS cuando tiene la mitad de sus PS o menos",
+  "item.cobblemon.pamtre_berry": "Baya Plama",
+  "item.cobblemon.pamtre_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.passho_berry": "Baya Pasio",
+  "item.cobblemon.passho_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Agua",
+  "item.cobblemon.payapa_berry": "Baya Payapa",
+  "item.cobblemon.payapa_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Psíquico",
+  "item.cobblemon.pecha_berry": "Baya Meloc",
+  "item.cobblemon.pecha_berry.tooltip": "Cura el envenenamiento",
+  "item.cobblemon.persim_berry": "Baya Caquic",
+  "item.cobblemon.persim_berry.tooltip": "Cura la confusión",
+  "item.cobblemon.petaya_berry": "Baya Yapati",
+  "item.cobblemon.petaya_berry.tooltip": "Aumenta el Ataque Especial del portador en 1 nivel cuando tiene 1/4 de sus PS o menos",
+  "item.cobblemon.pinap_berry": "Baya Pinia",
+  "item.cobblemon.pinap_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.pomeg_berry": "Baya Grana",
+  "item.cobblemon.pomeg_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.qualot_berry": "Baya Ispero",
+  "item.cobblemon.qualot_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.rabuta_berry": "Baya Rautan",
+  "item.cobblemon.rabuta_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.rawst_berry": "Baya Safre",
+  "item.cobblemon.rawst_berry.tooltip": "Cura las quemaduras",
+  "item.cobblemon.razz_berry": "Baya Frambu",
+  "item.cobblemon.razz_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.rindo_berry": "Baya Tamar",
+  "item.cobblemon.rindo_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Planta",
+  "item.cobblemon.roseli_berry": "Baya Hibis",
+  "item.cobblemon.roseli_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Hada",
+  "item.cobblemon.rowap_berry": "Baya Magua",
+  "item.cobblemon.rowap_berry.tooltip": "Si el portador es golpeado por un ataque especial, el atacante pierde 1/8 de sus PS máximos",
+  "item.cobblemon.salac_berry": "Baya Aslac",
+  "item.cobblemon.salac_berry.tooltip": "Aumenta la Velocidad del portador en 1 nivel cuando tiene 1/4 de sus PS o menos",
+  "item.cobblemon.shuca_berry": "Baya Acardo",
+  "item.cobblemon.shuca_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Tierra",
+  "item.cobblemon.sitrus_berry": "Baya Zidra",
+  "item.cobblemon.sitrus_berry.tooltip": "Cura 1/4 de los PS máximos si se tiene la mitad de PS o menos",
+  "item.cobblemon.spelon_berry": "Baya Wikano",
+  "item.cobblemon.spelon_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.starf_berry": "Baya Arabol",
+  "item.cobblemon.starf_berry.tooltip": "Aumenta una estadística al azar en 2 niveles cuando se tiene 1/4 de los PS o menos",
+  "item.cobblemon.tamato_berry": "Baya Tamate",
+  "item.cobblemon.tamato_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.tanga_berry": "Baya Yecana",
+  "item.cobblemon.tanga_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Bicho",
+  "item.cobblemon.wacan_berry": "Baya Gualot",
+  "item.cobblemon.wacan_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Eléctrico",
+  "item.cobblemon.watmel_berry": "Baya Sambia",
+  "item.cobblemon.watmel_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.wepear_berry": "Baya Peragu",
+  "item.cobblemon.wepear_berry.tooltip": "Sin efecto. No puede ser consumida por el portador",
+  "item.cobblemon.wiki_berry": "Baya Wiki",
+  "item.cobblemon.wiki_berry.tooltip": "Cura 1/3 de los PS si se tiene 1/4 de PS o menos. Confunde si se tiene una naturaleza desfavorable en Ataque Especial",
+  "item.cobblemon.yache_berry": "Baya Rimoya",
+  "item.cobblemon.yache_berry.tooltip": "Reduce a la mitad el daño recibido de un ataque superefectivo de tipo Hielo",
  "cobblemon.command.general.invalid-party-slot": "¡No hay Pokémon en la ranura %1$s!",
  "cobblemon.command.givepokemon.give": "Se entregó %1$s a %2$s.",
  "cobblemon.command.pokemonedit": "Se editó el %1$s de %2$s.",
@@ -305,10 +572,19 @@
  "cobblemon.command.spawnpokemon.nospecies": "Error: Debes incluir un nombre de Pokémon o \"aleatorio\"",
  "cobblemon.command.held_item": "El %2$s de %1$s fue equipado con %3$s.",
  "cobblemon.command.pokeheal.in_battle": "¡No puedes curar a tu equipo mientras estás en un combate!",
+  "cobblemon.command.spawnpokemonfrompool": "Un %1$s ha aparecido en la zona.",
+  "cobblemon.command.spawnpokemonfrompool.unable_to_spawn": "No es posible generar un Pokémon.",
+  "cobblemon.command.pokebox.box_does_not_exist": "Este jugador no tiene una caja %1$s.",
+  "cobblemon.command.pokebox.box_is_full": "La caja %1$s de este jugador está llena.",
+  "cobblemon.command.pokebox.storage_is_full": "La caja de este jugador está llena.",
+  "cobblemon.command.pokebox.last_pokemon": "No se ha enviado el último Pokémon de ese jugador al PC.",
+  "cobblemon.command.pokemonrestart": "Se ha despejado el equipo y PC de %1$s.",
  "advancements.cobblemon.root": "¡El mundo de Cobblemon!",
+  "advancements.cobblemon.root.description": "Elige un Pokémon inicial y embárcate en una nueva aventura",
  "advancements.cobblemon.obtain_leftovers": "¡Reduce, Reutiliza y Recicla!",
  "advancements.cobblemon.obtain_leftovers.description": "Después de comer una manzana, guarda los restos.",
-  "advancements.cobblemon.root.description": "Elige un Pokémon inicial y embárcate en una nueva aventura",
+  "advancements.cobblemon.any_plant": "Un regalo de la madre naturaleza",
+  "advancements.cobblemon.any_plant.description": "¡Espero que tengas un pulgar verde!",
  "advancements.cobblemon.harvest_apricorn": "¿Es una fruta o es una nuez?",
  "advancements.cobblemon.harvest_apricorn.description": "Haz clic con el botón derecho del ratón para cosechar un Bonguri totalmente crecido",
  "advancements.cobblemon.harvest_apricorn_seed": "Poniendo de mi parte",
@@ -328,7 +604,7 @@
  "advancements.cobblemon.first_catch": "¡Un Nuevo Amigo!",
  "advancements.cobblemon.first_catch.description": "Usa una Poké Ball y captura tu primer Pokémon",
  "advancements.cobblemon.full_party": "Casa Llena",
-  "advancements.cobblemon.full_party.description": "Captura 5 Pokémon más para formar un equipo completo",
+  "advancements.cobblemon.full_party.description": "Capura suficientes Pokémon hasta tener un equipo completo de 6",
  "advancements.cobblemon.first_evolution": "Trabajo duro y dedicación",
  "advancements.cobblemon.first_evolution.description": "Cumple los requisitos de evolución de un Pokémon y hazlo evolucionar desde el menú del equipo",
  "advancements.cobblemon.first_battle_victory": "¿Dónde está mi Música de la Victoria?",
@@ -337,6 +613,55 @@
  "advancements.cobblemon.first_shiny_catch.description": "Captura tu primer Pokémon Shiny",
  "advancements.cobblemon.healing_machine": "Poder Curativo",
  "advancements.cobblemon.healing_machine.description": "Espera el tiempo suficiente para que una Máquina de Curación se cargue y luego cura a tu equipo",
+  "advancements.cobblemon.obtain_leek": "¡Hay un puerro en el velero!",
+  "advancements.cobblemon.obtain_leek.description": "Obtén un Puerro Medicinal, una planta silvestre que crece en agua fresca",
+  "advancements.cobblemon.medicinal_brew": "Farmacia Local",
+  "advancements.cobblemon.medicinal_brew.description": "Destila un Puerro Medicinal para asentar las bases de tus necesidades curativas",
+  "advancements.cobblemon.brew_potion": "No puedes poseer mis pociones",
+  "advancements.cobblemon.brew_potion.description": "Destila una Baya Aranja con la Bebida Medicinal para crear una Poción",
+  "advancements.cobblemon.brew_full_restore": "La elección de un Campeón",
+  "advancements.cobblemon.brew_full_restore.description": "Sigue la rama de la destilación y crea un Restaurar Todo con una Baya Ziuela y una Poción Máxima",
+  "advancements.cobblemon.brew_all": "Doble Doble Destila Doble",
+  "advancements.cobblemon.brew_all.description": "Destila todos los objetos posibles usando la Bebida Medicinal",
+  "advancements.cobblemon.obtain_mint": "Menta Fresca",
+  "advancements.cobblemon.obtain_mint.description": "Obtén una Menta Natural, una planta silvestre que crece en lo alto de las montañas",
+  "advancements.cobblemon.obtain_all_mints": "Algo para co-menta-r",
+  "advancements.cobblemon.obtain_all_mints.description": "Obtén todos los 6 colores de Mentas Naturales y ten acceso a todo un abanico de naturalezas",
+  "advancements.cobblemon.obtain_revival_herb": "Que hierba tu entusiasmo",
+  "advancements.cobblemon.obtain_revival_herb.description": "Obtén una Hierba Revivir, una planta silvestre que crece en las Cuevas Frondosas",
+  "advancements.cobblemon.use_revive": "¡Vive para luchar otro día!",
+  "advancements.cobblemon.use_revive.description": "Usa un Revivir, Revivir Máximo o Hierba Revivir para reanimar a un Pokémon desmayado",
+  "advancements.cobblemon.obtain_big_root": "Las raíces de la curación básica",
+  "advancements.cobblemon.obtain_big_root.description": "Obtén una Raíz Grande, una planta silvestre que crece en cuevas de tierra cerca de la superficie",
+  "advancements.cobblemon.craft_remedy": "Curación Básica",
+  "advancements.cobblemon.craft_remedy.description": "Crea un Remedio, un objeto curativo de juego temporano que puede ser usado para crear mejores versiones",
+  "advancements.cobblemon.obtain_vivichoke": "Dale Dale Revibrote",
+  "advancements.cobblemon.obtain_vivichoke.description": "Obtén un Revibrote, estas plantas crecen sembrando las muy raras semillas revibrote",
+  "advancements.cobblemon.obtain_berry": "Vaya Baya",
+  "advancements.cobblemon.obtain_berry.description": "Obtén una baya, plantas silvestres que crecen en la superficie y tiene muchisimos usos",
+  "advancements.cobblemon.obtain_mutated_berry": "Un resultado inesperado",
+  "advancements.cobblemon.obtain_mutated_berry.description": "Planta árboles de bayas de diferentes tipos uno al lado de otro y se testigo de la mutación en acción",
+  "advancements.cobblemon.obtain_all_berries": "¡Vaya, todas la Bayas!",
+  "advancements.cobblemon.obtain_all_berries.description": "Obtén una baya de cada tipo en Cobblemon",
+  "advancements.cobblemon.use_pasture": "Caminata Libre: Activada",
+  "advancements.cobblemon.use_pasture.description": "Crea un Bloque de Pastoreo y permite que tus amigos deambular por ahí",
+  "advancements.cobblemon.catch_all_vivillon": "Alas Diseñadas",
+  "advancements.cobblemon.catch_all_vivillon.description": "Obtén todos los patrones de Vivillon",
+  "advancements.cobblemon.evolve_veevees": "Eeveesto a todos",
+  "advancements.cobblemon.evolve_veevees.description": "Evoluciona a Eevee en 8 formas diferentes",
+  "advancements.cobblemon.evolve_shedinja": "El fantasma del cascarón",
+  "advancements.cobblemon.evolve_shedinja.description": "Ten una Poké Ball extra en tu inventario y obtén un Shedinja",
+  "advancements.cobblemon.trade_pokemon": "¡Cuídalo Bien!",
+  "advancements.cobblemon.trade_pokemon.description": "Intercambia un Pokémon con otro Entrenador",
+  "advancements.cobblemon.trade_shelmet_karrablast": "¡Quiero reportar un robo!",
+  "advancements.cobblemon.trade_shelmet_karrablast.description": "Intercambia un Shelmet y un Karrablast",
+  "advancements.cobblemon.max_level_baby": "¿Darwin? ¿Quién es ese?",
+  "advancements.cobblemon.max_level_baby.description": "Entrena a un Pokémon de primera fase capaz de evolucionar hasta alcanzar el nivel 100",
+  "advancements.cobblemon.use_candy": "Dulce Dulce",
+  "advancements.cobblemon.use_candy.description": "Usa cualquier Caramelo XP en un Pokémon",
+  "advancements.cobblemon.own_zangoose_seviper": "Compañeros a penas",
+  "advancements.cobblemon.own_zangoose_seviper.description": "Ten un Zangoose y un Seviper en tu equipo al mismo tiempo",
+  "cobblemon.battle.crash": "Se ha producido un error en la batalla. Si juegas en Un Jugador, reporte esto al equipo del mod. Sino, reportelo a los administradores del servidor.",
  "cobblemon.battle.damage_dealt": "¡%1$s ha recibido %2$s puntos de daño!",
  "cobblemon.battle.used_move": "¡%1$s ha usado %2$s!",
  "cobblemon.battle.used_move_on": "¡%1$s ha usado %2$s en %3$s!",
@@ -356,14 +681,19 @@
  "cobblemon.battle.crit": "¡Un golpe crítico!",
  "cobblemon.battle.nothing": "Pero no ocurrió nada.",
  "cobblemon.battle.clearallboost": "¡Todos los cambios de estado fueron eliminados!",
+  "cobblemon.battle.clearallnegativeboost": "¡Los cambion negativos de estadísticas de %1$s fueron eliminados!",
+  "cobblemon.battle.clearallnegativeboost.zeffect": "¡%1$s restauró sus estadísticas reducidas con su Poder-Z!",
  "cobblemon.battle.unboost.slight": "¡%2$s de %1$s ha disminuido!",
  "cobblemon.battle.unboost.sharp": "¡El %2$s de %1$s ha disminuido mucho!",
  "cobblemon.battle.unboost.severe": "¡El %2$s de %1$s ha disminuido muchísimo!",
  "cobblemon.battle.unboost.cap.single": "%2$s de %1$s no bajará más.",
  "cobblemon.battle.unboost.cap.multiple": "Las características de %1$s no bajarán más.",
  "cobblemon.battle.boost.slight": "¡%2$s de %1$s ha aumentado!",
+  "cobblemon.battle.boost.slight.zeffect": "¡%1$s aumentó su %2$s usando el Poder-Z!",
  "cobblemon.battle.boost.sharp": "¡%2$s de %1$s ha aumentado mucho!",
+  "cobblemon.battle.boost.sharp.zeffect": "¡%1$s aumentó mucho su %2$s usando el Poder-Z!",
  "cobblemon.battle.boost.severe": "¡%2$s de %1$s ha aumentado muchísimo!",
+  "cobblemon.battle.boost.severe.zeffect": "¡%1$s aumentó muchísimo su %2$s usando el Poder-Z!",
  "cobblemon.battle.boost.cap.single": "%2$s de %1$s no subirá más.",
  "cobblemon.battle.boost.cap.multiple": "Las características de %1$s no subirán más.",
  "cobblemon.battle.setboost.bellydrum": "¡%1$s disminuyó sus PS y maximizo su Ataque!",
@@ -381,162 +711,247 @@
  "cobblemon.capture.not_single": "Sólo puedes capturar Pokémon salvajes en una batalla 1v1.",
  "cobblemon.you_in_battle": "¡No puedes hacer eso mientras estás en una batalla!",
  "cobblemon.battle.turn": "Ahora es el turno %1$s",
-  "cobblemon.battle.rain_dance": "¡Ha comenzado a llover!",
-  "cobblemon.battle.rain_dance_upkeep": "La lluvia continúa cayendo.",
-  "cobblemon.battle.sandstorm": "¡Se acerca una tormenta de arena!",
-  "cobblemon.battle.sandstorm_buffeted": "¡%1$s fue zarandeado por la tormenta de arena!",
-  "cobblemon.battle.sandstorm_upkeep": "¡La tormenta de arena viene con fuerza!",
-  "cobblemon.battle.sunny_day": "¡El sol brilla intensamente!",
-  "cobblemon.battle.sunny_day_upkeep": "La luz del sol es intensa",
-  "cobblemon.battle.hail": "¡Ha comenzado a granizar!",
-  "cobblemon.battle.hail_upkeep": "¡El granizo cae con violencia!",
-  "cobblemon.battle.hail_buffeted": "¡%1$s fue golpeado por el granizo!",
-  "cobblemon.battle.no_weather": "El clima se ha despejado",
-  "cobblemon.battle.confusion_start": "¡%1$s está confundido!",
-  "cobblemon.battle.confusion_activate": "¡%1$s está tan confuso que se hiere a sí mismo!",
-  "cobblemon.battle.confusion_snapped": "¡%1$s ya no está confuso!",
-  "cobblemon.battle.protect_start": "¡%1$s ha empezado a protegerse!",
-  "cobblemon.battle.protect_activate": "¡%1$s se está protegiendo!",
-  "cobblemon.battle.magnitude_level": "¡Magnitud %1$s!",
-  "cobblemon.battle.bide_start": "¡%1$s comenzó a acumular energía!",
-  "cobblemon.battle.bide_activate": "¡%1$s está acumulando energía!",
-  "cobblemon.battle.bide_end": "¡%1$s ha liberado su energía!",
-  "cobblemon.battle.field_start.electric_terrain": "¡Una corriente eléctrica recorre el campo de batalla!",
-  "cobblemon.battle.field_start.grassy_terrain": "¡El campo de batalla se ha cubierto de hierba!",
-  "cobblemon.battle.field_start.gravity": "¡La gravedad se ha incrementado!",
-  "cobblemon.battle.field_start.magic_room": "¡Se ha creado una Zona Mágica en la que los objetos equipados pierden sus efectos!",
-  "cobblemon.battle.field_start.misty_terrain": "¡La niebla ha envuelto el campo de batalla!",
-  "cobblemon.battle.field_start.mud_sport": "¡El poder de la electricidad se ha debilitado!",
-  "cobblemon.battle.field_start.psychic_terrain": "¡Un aura psíquica envolvió el campo de batalla!",
-  "cobblemon.battle.field_start.trick_room": "¡%1$s ha alterado las dimensiones!",
-  "cobblemon.battle.field_start.water_sport": "¡El poder del fuego se ha debilitado!",
-  "cobblemon.battle.field_start.wonder_room": "¡Se ha creado una Zona Extraña en la que las estadísticas de Defensa y Defensa Especial se intercambian!",
-  "cobblemon.battle.field_end.electric_terrain": "La electricidad desapareció del campo de batalla.",
-  "cobblemon.battle.field_end.grassy_terrain": "La hierba desapareció del campo de batalla.",
-  "cobblemon.battle.field_end.gravity": "¡La gravedad volvió a la normalidad!",
-  "cobblemon.battle.field_end.magic_room": "¡La Zona Mágica desapareció y los efectos de los objetos equipados volvieron a la normalidad!",
-  "cobblemon.battle.field_end.misty_terrain": "La niebla desapareció del campo de batalla.",
-  "cobblemon.battle.field_end.mud_sport": "Los efectos de Chapoteo lodo se han desvanecido.",
-  "cobblemon.battle.field_end.psychic_terrain": "¡El aura psíquica se ha desvanecido del campo de batalla!",
-  "cobblemon.battle.field_end.trick_room": "¡Las dimensiones alteradas han vuelto a la normalidad!",
-  "cobblemon.battle.field_end.water_sport": "Los efectos de Hidrochorro se han desvanecido.",
-  "cobblemon.battle.field_end.wonder_room": "¡La Zona Extraña desapareció, las estadísticas de Defensa y Defensa Especial han vuelto a la normalidad!",
-  "cobblemon.battle.cant.generic_block": "¡%1$s no puede usar %2$s!",
+  "cobblemon.battle.side_subject.ally": "tu",
+  "cobblemon.battle.side_subject.opponent": "el oponente",
+  "cobblemon.battle.weather.raindance.start": "¡Ha comenzado a llover!",
+  "cobblemon.battle.weather.raindance.upkeep": "La lluvia continúa cayendo.",
+  "cobblemon.battle.weather.raindance.end": "Ha dejado de llover.",
+  "cobblemon.battle.weather.sandstorm.start": "¡Ha surgido una tormenta de arena!",
+  "cobblemon.battle.weather.sandstorm.upkeep": "La tormenta de arena arraza con fuerza.",
+  "cobblemon.battle.weather.sandstorm.end": "Se despejó la tormenta de arena.",
+  "cobblemon.battle.weather.sunnyday.start": "¡El sol brilla fuertemente!",
+  "cobblemon.battle.weather.sunnyday.upkeep": "El sol aún brilla fuerte.",
+  "cobblemon.battle.weather.sunnyday.end": "La luz del sol volvió a la normalidad.",
+  "cobblemon.battle.weather.hail.start": "¡Comenzó a granizar!",
+  "cobblemon.battle.weather.hail.upkeep": "El granizo cae con fuerza.",
+  "cobblemon.battle.weather.hail.end": "Ha dejado de granizar.",
+  "cobblemon.battle.start.bide": "¡%1$s comienza a almacenar energía!",
+  "cobblemon.battle.start.yawn": "¡%1$s se ha adormecido!",
+  "cobblemon.battle.start.perish": "La cuenta atrás de %1$s bajó a %2$s.",
+  "cobblemon.battle.start.leechseed": "¡%1$s ha sido infectado con las semillas!",
+  "cobblemon.battle.start.aquaring": "¡%1$s se cubrió con un manto de agua!",
+  "cobblemon.battle.start.charge": "¡%1$s está cargándose de energía!",
+  "cobblemon.battle.start.taunt": "¡%1$s se dejó provocar por Mofa!",
+  "cobblemon.battle.start.autotomize": "¡%1$s se volvió mas ligero!",
+  "cobblemon.battle.start.attract": "¡%1$s se enamoró!",
+  "cobblemon.battle.start.focusenergy": "¡%1$s se preparó para pelear!",
+  "cobblemon.battle.start.uproar": "¡%1$s hizo un alboroto!",
+  "cobblemon.battle.start.curse": "¡%1$s reduce sus PS para maldecir a %2$s!",
+  "cobblemon.battle.start.miracleeye": "¡%1$s fué identificado!",
+  "cobblemon.battle.start.dynamax": "¡%1$s fué Dinamaxizado!",
+  "cobblemon.battle.start.gmax": "¡%1$s fué Gigantamaxizado!",
+  "cobblemon.battle.fieldstart.electricterrain": "¡Una corriene eléctrica ha cubierto el campo de batalla!",
+  "cobblemon.battle.fieldstart.grassyterrain": "¡Ha crecido hierba por todo el campo de batalla!",
+  "cobblemon.battle.fieldstart.gravity": "¡La gravedad ha sido intensificada!",
+  "cobblemon.battle.fieldstart.magicroom": "¡Se ha creado una Zona Mágica en la que los objetos equipados pierden sus efectos!",
+  "cobblemon.battle.fieldstart.mistyterrain": "¡La niebla ha envuelto el campo de batalla!",
+  "cobblemon.battle.fieldstart.mudsport": "¡El poder de los ataques electricos ha disminuido!",
+  "cobblemon.battle.fieldstart.psychicterrain": "¡Un aura psíquica envolvió el campo de batalla!",
+  "cobblemon.battle.fieldstart.trickroom": "¡%1$s alteró las dimensiones!",
+  "cobblemon.battle.fieldstart.watersport": "¡El poder de los ataques de fuego ha disminuido!",
+  "cobblemon.battle.fieldstart.wonderroom": "¡Se ha creado una Zona Extraña donde la Defensa y Defensa Especial se intercambiaron!",
+  "cobblemon.battle.fieldend.electricterrain": "La electricidad del campo de batalla se ha disipado.",
+  "cobblemon.battle.fieldend.grassyterrain": "La hierba del campo de batalla desapareció.",
+  "cobblemon.battle.fieldend.gravity": "¡La gravedad volvió a la normalidad!",
+  "cobblemon.battle.fieldend.magicroom": "¡La Zona Mágica desapareció y los efectos de los objetos equipados volvieron a la normalidad!",
+  "cobblemon.battle.fieldend.mistyterrain": "La niebla desapareció del campo de batalla.",
+  "cobblemon.battle.fieldend.mudsport": "Los efectos de Chapoteo Lodo se han desvanecido.",
+  "cobblemon.battle.fieldend.psychicterrain": "¡El aura psíquica se ha desvanecido del campo de batalla!",
+  "cobblemon.battle.fieldend.trickroom": "¡Las dimensiones alteradas han vuelto a la normalidad!",
+  "cobblemon.battle.fieldend.watersport": "Los efectos de Hidrochorro se han desvanecido.",
+  "cobblemon.battle.fieldend.wonderroom": "¡La Zona Extraña desapareció, la Defensa y Defensa Especial ha vuelto a la normalidad!",
+  "cobblemon.battle.fieldactivate.perishsong": "¡Todos los Pokémon que escucharon en canto se debilitarán en 3 turnos!",
+  "cobblemon.battle.sidestart.stealthrock": "¡Piedras filosas flotan alrededor del equipo de %1$s!",
+  "cobblemon.battle.sidestart.spikes": "¡Se esparcieron púas alrededor del equipo de %1$s!",
+  "cobblemon.battle.sidestart.toxicspikes": "¡Se esparcieron púas venenosas alrededor del equipo de %1$s!",
+  "cobblemon.battle.sidestart.stickyweb": "¡Una red pegajosa se esparció alrededor del equipo de %1$s!",
+  "cobblemon.battle.sidestart.reflect": "¡Reflejo hace resistente al equipo de %1$s ante ataques físicos!",
+  "cobblemon.battle.sidestart.lightscreen": "¡Pantalla Luz hace resistente al equipo de %1$s ante ataques especiales!",
+  "cobblemon.battle.sidestart.auroraveil": "¡Velo Aurora hace resistente al equipo de %1$s ante ataques físicos y especiales!",
+  "cobblemon.battle.sidestart.tailwind": "¡El Viento Afín sopla a favor del equipo de %1$s!",
+  "cobblemon.battle.sidestart.safeguard": "¡El equipo de %1$s se cubrió con un velo místico!",
+  "cobblemon.battle.sideend.stealthrock": "¡Las piedras filosas desaparecieron de alrededor del equipo de %1$s!",
+  "cobblemon.battle.sideend.spikes": "¡Las púas desaparecieron de alrededor del equipo de %1$s!",
+  "cobblemon.battle.sideend.toxicspikes": "¡Las púas venenosas desaparecieron de alrededor del equipo de %1$s!",
+  "cobblemon.battle.sideend.stickyweb": "La red pegajosa despareció de alrededor del equipo de %1$s",
+  "cobblemon.battle.sideend.reflect": "¡El Reflejo del equipo de %1$s se ha desvanecido!",
+  "cobblemon.battle.sideend.lightscreen": "¡La Pantalla de Luz del equipo de %1$s se ha desvanecido!",
+  "cobblemon.battle.sideend.auroraveil": "¡El Velo Aurora del equipo de %1$s se ha desvanecido!",
+  "cobblemon.battle.sideend.tailwind": "¡El Viento Afín del equipo de %1$s deja de soplar!",
+  "cobblemon.battle.sideend.safeguard": "¡El equipo de %1$sya no está protegido por Velo Sagrado!",
+  "cobblemon.battle.cant.generic": "¡%1$s no puede usar %2$s!",
  "cobblemon.battle.cant.truant": "¡%1$s está holgazaneando!",
-  "cobblemon.battle.cant.flinched": "¡%1$s ha retrocedido!",
+  "cobblemon.battle.cant.flinch": "¡%1$s ha retrocedido y no puede atacar!",
  "cobblemon.battle.cant.recharge": "¡%1$s necesita recuperarse de su ataque!",
  "cobblemon.battle.cant.attract": "¡%1$s no puede moverse debido al amor!",
  "cobblemon.battle.cant.disable": "¡%1$s %2$s ha sido anulado!",
-  "cobblemon.battle.cant.focus_punch": "¡%1$s perdió su concentración y no pudo completar el movimiento!",
-  "cobblemon.battle.cant.heal_block": "¡%1$s no puede utilizar %2$s debido al movimiento Anticura!",
+  "cobblemon.battle.cant.focuspunch": "¡%1$s se desconcentró y no pudo atacar!",
+  "cobblemon.battle.cant.healblock": "¡%1$s no puede usar %2$s debido a Anticura!",
  "cobblemon.battle.cant.imprison": "¡%1$s no puede utilizar %2$s porque está sellado!",
  "cobblemon.battle.cant.gravity": "¡%1$s no puede utilizar %2$s debido al movimiento Gravedad!",
-  "cobblemon.battle.cant.shell_trap": "¡La Coraza trampa de %1$s no funcionó!",
+  "cobblemon.battle.cant.shelltrap": "¡La Coraza trampa de %1$s no funcionó!",
  "cobblemon.battle.cant.taunt": "¡%1$s no puede usar %2$s después de la Mofa!",
-  "cobblemon.battle.cant.throat_chop": "¡Los efectos de Golpe mordaza le impiden a %1$s usar ciertos movimientos!",
-  "cobblemon.battle.cant.no_pp": "¡%1$s trató de usar %2$s pero no le quedaban PP!",
+  "cobblemon.battle.cant.throatchop": "¡El efecto de Golpe mordaza impide usar algunos movimientos a %1$s!",
+  "cobblemon.battle.activate.confusion": "¡%1$s está confundido!",
  "cobblemon.battle.activate.gravity": "¡%1$s no pudo mantenerse en el aire debido a la gravedad!",
-  "cobblemon.battle.activate.misty_terrain": "¡%1$s se rodea de una niebla protectora!",
-  "cobblemon.battle.activate.psychic_terrain": "¡%1$s se rodea de un aura psíquica!",
-  "cobblemon.battle.activate.heal_bell": "¡Una campana ha sonado!",
+  "cobblemon.battle.activate.mistyterrain": "¡Una niebla protectora rodea a %1$s!",
+  "cobblemon.battle.activate.psychicterrain": "¡Un aura psíquica rodea a %1$s!",
+  "cobblemon.battle.activate.healbell": "¡Suena una campana!",
  "cobblemon.battle.activate.aromatherapy": "¡Un aroma relajante recorrió la zona!",
  "cobblemon.battle.activate.trapped": "¡%1$s ya no puede escapar!",
  "cobblemon.battle.activate.bind": "¡%1$s ha sido exprimido por %2$s!",
-  "cobblemon.battle.activate.court_change": "¡%1$s ha intercambiado los efectos del campo de batalla!",
-  "cobblemon.battle.activate.guard_split": "¡%1$s suma su capacidad defensiva con la del objetivo y la reparte equitativamente!",
+  "cobblemon.battle.activate.wrap": "¡%1$s ha sido atrapado por %2$s!",
+  "cobblemon.battle.activate.struggle": "¡%1$s no puede usar más movimientos!",
+  "cobblemon.battle.activate.courtchange": "¡%1$s intercambió los efectos del campo de batalla!",
+  "cobblemon.battle.activate.guardsplit": "¡%1$s y el objetivo comparten defensas!",
  "cobblemon.battle.activate.spite": "¡%3$s ha reducido los PP de %2$s de %1$s!",
+  "cobblemon.battle.activate.lockon": "¡%1$s apunta a %2$s!",
+  "cobblemon.battle.activate.protosynthesis": "¡La fuerte luz de sol activó Paleosíntesis de %1$s!",
+  "cobblemon.battle.activate.bide": "¡%1$s acumula energía!",
+  "cobblemon.battle.activate.protect": "¡%1$s se protege!",
+  "cobblemon.battle.activate.magnitude": "¡Magnitud de %1$s!",
+  "cobblemon.battle.activate.destinybond": "¡%1$s se lleva también a su oponente!",
+  "cobblemon.battle.activate.synchronize": "[Sincronía de %1$s]",
+  "cobblemon.battle.activate.endure": "¡%1$s aguantó el golpe!",
+  "cobblemon.battle.activate.attract": "¡%1$s está enamorado de %2$s!",
+  "cobblemon.battle.activate.firespin": "¡%1$s quedó atrapado en un remolino de fuego!",
+  "cobblemon.battle.activate.trick": "¡%1$s intercambió objetos con su objetivo!",
+  "cobblemon.battle.activate.quickclaw": "¡%1$s ataca primero por la Garra Rápida!",
+  "cobblemon.battle.activate.focusband": "¡%1$s aguantó usando su %2$s!",
+  "cobblemon.battle.activate.forewarn": "¡%2$s de %1$s fué revelado!",
+  "cobblemon.battle.activate.disguise": "¡Su disfraz sirvió como señuelo!",
+  "cobblemon.battle.activate.liquidooze": "¡%1$s ha absorbido la viscosecreción!",
+  "cobblemon.battle.activate.whirlpool": "¡%1$s quedó atrapado en un vórtice!",
+  "cobblemon.battle.activate.clamp": "¡%2$s atenazó a %1$s!",
  "cobblemon.battle.prepare.bounce": "¡%1$s ha saltado muy alto!",
  "cobblemon.battle.prepare.dig": "¡%1$s se ha ocultado bajo tierra!",
  "cobblemon.battle.prepare.dive": "¡%1$s se ha ocultado bajo el agua!",
  "cobblemon.battle.prepare.fly": "¡%1$s ha volado muy alto!",
-  "cobblemon.battle.prepare.freeze_shock": "¡Una luz fría envuelve a %1$s!",
+  "cobblemon.battle.prepare.freezeshock": "¡Una luz fría rodea a %1$s!",
  "cobblemon.battle.prepare.geomancy": "¡%1$s está absorbiendo energía!",
-  "cobblemon.battle.prepare.ice_burn": "¡Una ráfaga gélida envuelve a %1$s!",
-  "cobblemon.battle.prepare.meteor_beam": "¡%1$s rebosa energía cósmica!",
-  "cobblemon.battle.prepare.phantom_force": "¡%1$s desaparece en un abrir y cerrar de ojos!",
-  "cobblemon.battle.prepare.razor_wind": "¡%1$s ha provocado un remolino!",
-  "cobblemon.battle.prepare.skull_bash": "¡%1$s bajó su cabeza!",
-  "cobblemon.battle.prepare.sky_attack": "¡Un intenso halo rodea a %1$s!",
-  "cobblemon.battle.prepare.sky_drop": "¡%1$s se ha llevado a su objetivo por los aires!",
-  "cobblemon.battle.prepare.solar_beam": "¡%1$s absorbe la luz solar!",
+  "cobblemon.battle.prepare.iceburn": "¡%1$s se envuelve en un aire gélido!",
+  "cobblemon.battle.prepare.meteorbeam": "¡%1$s rebosa de energía cósmica!",
+  "cobblemon.battle.prepare.phantomforce": "¡%1$s desapareció!",
+  "cobblemon.battle.prepare.razorwind": "¡%1$s creó un remolino!",
+  "cobblemon.battle.prepare.skullbash": "¡%1$s baja su cabeza!",
+  "cobblemon.battle.prepare.skyattack": "¡%1$s se rodea de una luz brillante!",
+  "cobblemon.battle.prepare.skydrop": "¡%1$s llevo a su oponente al cielo!",
+  "cobblemon.battle.prepare.solarbeam": "¡%1$s absorbe la luz solar!",
  "cobblemon.battle.swapboost.generic": "¡%1$s ha intercambiado sus aumentos de estadísticas con %2$s!",
  "cobblemon.battle.singleturn.protect": "¡%1$s se ha protegido!",
  "cobblemon.battle.singleturn.endure": "¡%1$s se prepara para resistir los ataques!",
-  "cobblemon.battle.singleturn.crafty_shield": "¡Truco defensa ha protegido al equipo de %1$s!",
+  "cobblemon.battle.singleturn.craftyshield": "¡Truco Defensa protege al equipo de %1$s!",
  "cobblemon.battle.singleturn.powder": "¡%1$s está cubierto de polvo!",
-  "cobblemon.battle.singleturn.follow_me": "¡%1$s se ha convertido en el centro de atención!",
+  "cobblemon.battle.singleturn.followme": "¡%1$s se volvió el centro de atención!",
  "cobblemon.battle.singleturn.snatch": "¡%1$s espera a que su objetivo haga algún movimiento!",
-  "cobblemon.battle.singleturn.quick_guard": "¡Anticipo ha protegido al equipo de %1$s!",
-  "cobblemon.battle.singleturn.wide_guard": "¡Vasta guardia ha protegido al equipo de %1$s!",
+  "cobblemon.battle.singleturn.quickguard": "¡Anticipo protege al equipo de %1$s!",
+  "cobblemon.battle.singleturn.wideguard": "¡Vastaguardia protege al equipo de %1$s!",
  "cobblemon.battle.singleturn.roost": "(%1$s ha perdido el tipo Volador durante este turno.)",
-  "cobblemon.battle.singleturn.mat_block": "¡%1$s tiene la intención de levantar un Escudo tatami y bloquear los ataques entrantes!",
-  "cobblemon.battle.singleturn.max_guard": "¡%1$s se ha protegido!",
+  "cobblemon.battle.singleturn.matblock": "¡%1$s levanta un Escudo Tatami para bloquear ataques!",
+  "cobblemon.battle.singleturn.maxguard": "¡%1$s se protege!",
  "cobblemon.battle.singleturn.instruct": "¡%1$s sigue el Mandato de %2$s y repite su último movimiento!",
-  "cobblemon.battle.singleturn.focus_punch": "¡%1$s está reforzando su concentración!",
+  "cobblemon.battle.singleturn.focuspunch": "¡%1$s está reforzando su concentración!",
  "cobblemon.battle.singleturn.electrify": "¡Los movimientos de %1$s han sido electrificados!",
-  "cobblemon.battle.singleturn.beak_blast": "¡%1$s ha empezado a calentar su pico!",
-  "cobblemon.battle.singleturn.helping_hand": "¡%2$s está listo para ayudar a %1$s!",
-  "cobblemon.battle.singleturn.magic_coat": "¡%1$s se ha cubierto con Capa Mágica!",
-  "cobblemon.battle.singleturn.rage_powder": "¡%1$s se ha convertido en el centro de atención!",
-  "cobblemon.battle.singleturn.shell_trap": "¡%1$s ha colocado un Coraza trampa!",
+  "cobblemon.battle.singleturn.beakblast": "¡%1$s ha empezado a calentar su pico!",
+  "cobblemon.battle.singleturn.helpinghand": "¡%2$s está listo para ayudar a %1$s!",
+  "cobblemon.battle.singleturn.magiccoat": "¡%1$s se ha cubierto con Capa Mágica!",
+  "cobblemon.battle.singleturn.ragepowder": "¡%1$s se volvió el centro de atención!",
+  "cobblemon.battle.singleturn.shelltrap": "¡%1$s activó la Coraza Trampa!",
  "cobblemon.battle.singleturn.spotlight": "¡%1$s se ha convertido en el centro de atención!",
-  "cobblemon.battle.singlemove.destiny_bond": "¡%1$s intenta que el rival sufra su mismo destino!",
-  "cobblemon.battle.singlemove.glaive_rush": "¡%1$s se lanza en una carga imprudente!",
+  "cobblemon.battle.singlemove.destinybond": "¡%1$s se llevará a su rival con él!",
+  "cobblemon.battle.singlemove.glaiverush": "¡%1$s se lanzó en un ataque temerario!",
  "cobblemon.battle.singlemove.grudge": "¡%1$s pretende que su objetivo le tenga rabia!",
  "cobblemon.battle.singlemove.rage": "¡%1$s está furioso!",
+  "cobblemon.battle.damage.wrap": "¡%1$s ha sido herido por la constricción!",
+  "cobblemon.battle.damage.confusion": "¡En la confusión, %1$s se hirió a si mismo!",
+  "cobblemon.battle.damage.leechseed": "¡La salud de %1$s fué absorbida por las Drenadoras!",
+  "cobblemon.battle.damage.sandstorm": "¡%1$s fue zarandeado por la tormenta de arena!",
+  "cobblemon.battle.damage.hail": "¡%1$s fue golpeado por el granizo.",
+  "cobblemon.battle.damage.stealthrock": "¡Piedras filosas se clavaron en %1$s!",
+  "cobblemon.battle.damage.spikes": "¡%1$s ha sido dañado por las púas!",
+  "cobblemon.battle.damage.recoil": "¡%1$s fue dañado por el retroceso!",
+  "cobblemon.battle.damage.item": "¡%1$s fué herido por su %2$s!",
+  "cobblemon.battle.damage.lifeorb": "¡%1$s perdió parte de sus PS!",
+  "cobblemon.battle.damage.rockyhelmet": "¡%1$s fué herido por el Casco Dentado de %2$s!",
+  "cobblemon.battle.damage.generic": "¡%1$s fué herido!",
+  "cobblemon.battle.damage.pokemonmimikyubusted": "¡El disfraz de %1$s fué revelado!",
+  "cobblemon.battle.damage.whirlpool": "¡%1$s fue herido por Torbellino!",
+  "cobblemon.battle.damage.clamp": "¡%1$s fue herido por la Tenaza!",
+  "cobblemon.battle.damage.curse": "¡%1$s es afectado por la maldición!",
  "cobblemon.battle.end.bind": "¡%1$s ya no está siendo exprimido!",
-  "cobblemon.battle.set_hp.pain_split": "¡Los combatientes compartieron su dolor!",
+  "cobblemon.battle.end.wrap": "¡%1$s ha sido liberado de la constricción!",
+  "cobblemon.battle.end.disable": "¡El movimiento de %1$s ya no está anulado!",
+  "cobblemon.battle.end.protosynthesis": "¡Los efectos de Paleosíntesis de %1$s se disiparon!",
+  "cobblemon.battle.end.taunt": "¡%1$s se libró del efecto de Mofa!",
+  "cobblemon.battle.end.firespin": "¡%1$s se liberó de Giro Fuego!",
+  "cobblemon.battle.end.bide": "¡%1$s ha liberado su energía!",
+  "cobblemon.battle.end.confusion": "¡%1$s se ha librado de la confusión!",
+  "cobblemon.battle.end.whirlpool": "¡%1$s se liberó del vórtice!",
+  "cobblemon.battle.end.clamp": "¡%1$s se liberó de la Tenaza!",
+  "cobblemon.battle.end.dynamax": "¡%1$s volvió a la normalidad!",
+  "cobblemon.battle.sethp.painsplit": "¡Los combatientes compartieron su dolor!",
  "cobblemon.battle.ability.sturdy": "¡%1$s ha aguantado el golpe!",
-  "cobblemon.battle.ability.speed_boost": "¡Impulso de %1$s!",
-  "cobblemon.battle.ability.intimidate": "¡Intimidación de %1$s!",
  "cobblemon.battle.ability.unnerve": "¡%1$s puso al oponente demasiado nervioso para comer bayas!",
  "cobblemon.battle.ability.anticipation": "¡%1$s se ha estremecido por la anticipación!",
-  "cobblemon.battle.ability.air_lock": "Los efectos del clima han desaparecido.",
+  "cobblemon.battle.ability.airlock": "Los efectos del clima han desaparecido.",
  "cobblemon.battle.ability.generic": "¡%2$s de %1$s activado!",
+  "cobblemon.battle.ability.magicbounce": "¡%1$s rebotó la %2$s!",
  "cobblemon.battle.errors.busy": "¡%1$s está ocupado/a!",
  "cobblemon.battle.error.in_battle": "%1$s ya está en batalla.",
  "cobblemon.battle.error.in_battle.personal": "¡Ya estás en una batalla!",
  "cobblemon.battle.error.no_pokemon": "¡No tienes ningún Pokémon utilizable!",
+  "cobblemon.battle.error.no_pokemon_opponent": "¡A tu oponente no le quedan más Pokémon para pelear!",
  "cobblemon.battle.error.insufficient_pokemon": "%1$s tiene %2 Pokémon cuando %3 son requeridos.",
  "cobblemon.battle.error.insufficient_pokemon.personal": "Tienes %1 Pokémon utilizable pero necesitas %2.",
+  "cobblemon.battle.error.pokemon_is_trapped": "[Opción no disponible] No se puede cambiar: El Pokémon se encuentra atrapado",
  "cobblemon.battle.immune": "¡Pero %1$s es inmune!",
  "cobblemon.battle.missed": "Pero falló.",
  "cobblemon.battle.hit_count": "¡Golpea %1$s veces!",
  "cobblemon.battle.hit_count_singular": "¡Golpea 1 vez!",
-  "cobblemon.battle.item.air_balloon.start": "¡%1$s flota en el aire con su Globo Aéreo!",
-  "cobblemon.battle.item.recycle_or_pickup.start": "¡%1$s ha encontrado una %2$s!",
-  "cobblemon.battle.item.frisk.start": "¡%1$s cacheó a %2$s y le encontró su %3$s!",
-  "cobblemon.battle.item.take_item.start": "¡%1$s ha robado %2$s de %3$s!",
-  "cobblemon.battle.item.harvest.start": "¡%1$s cosechó una %2$s!",
-  "cobblemon.battle.item.bestow.start": "¡%1$s ha recibido %2$s de %3$s!",
-  "cobblemon.battle.item.tricked.start": "¡%1$s ha cambiado objetos con su objetivo!",
-  "cobblemon.battle.item.eat.end": "¡%1$s se comió su %2$s!",
-  "cobblemon.battle.item.fling.end": "¡%1$s lanzó su %2$s!",
-  "cobblemon.battle.item.knock_off.end": "¡%1$s se deshizo de la %3$s de %2$s!",
-  "cobblemon.battle.item.gem.end": "¡El %1$s ha fortalecido el poder de %2$s!",
-  "cobblemon.battle.item.incinerate.end": "¡El %1$s de %2$s se quemó!",
-  "cobblemon.battle.item.air_balloon.end": "¡El globo de %1$s explotó!",
-  "cobblemon.battle.item.hung_on.end": "¡%1$s se ha colgado usando su %2$s!",
-  "cobblemon.battle.item.red_card.end": "¡%1$s sacó su Tarjeta Roja contra %2$s!",
-  "cobblemon.battle.item.steal_eat.end": "¡%1$s robó y se comió la %3$s de %2$s!",
-  "cobblemon.battle.item.berry_juice.end": "¡Zumo de Bayas de %1$s activado!",
-  "cobblemon.battle.item.used_its.end": "¡%1$s ha utilizado su %2$s!",
-  "cobblemon.battle.item.mental_herb.end": "¡%1$s se libró de los efectos mentales gracias a su Hierba Mental!",
-  "cobblemon.battle.item.power_herb.end": "¡%1$s se ha cargado completamente debido a su Hierba de Poder!",
-  "cobblemon.battle.item.mirror_herb.end": "¡%1$s copió los cambios de estadísticas con su Hierba Espejo!",
-  "cobblemon.battle.item.white_herb.end": "¡%1$s volvió a su estado normal usando su Hierba Blanca!",
-  "cobblemon.battle.item.quick_claw.end": "¡%1$s puede actuar más rápido de lo normal gracias a su Garra Rápida!",
-  "cobblemon.battle.heal.z_effect": "¡El HP de %1$s fue restaurado por el Poder-Z!",
+  "cobblemon.battle.item.airballoon": "¡%1$s flota en el aire con el %2$s!",
+  "cobblemon.battle.item.recycle": "¡%1$s encontró %2$s!",
+  "cobblemon.battle.item.frisk": "¡%3$s cacheó a %1$s y le encontró su %2$s!",
+  "cobblemon.battle.item.thief": "¡%1$s ha robado %3$s de %2$s!",
+  "cobblemon.battle.item.harvest": "¡%1$s cosechó una %2$s!",
+  "cobblemon.battle.item.bestow": "¡%1$s ha recibido %2$s de %3$s!",
+  "cobblemon.battle.item.trick": "%1$s obtuvo un %2$s.",
+  "cobblemon.battle.item.eat": "%1$s comió su %2$s.",
+  "cobblemon.battle.enditem.eat": "¡%1$s se comió su %2$s!",
+  "cobblemon.battle.enditem.fling": "¡%1$s lanzó su %2$s!",
+  "cobblemon.battle.enditem.knockoff": "¡%3$s se deshizo de %2$s de %1$s!",
+  "cobblemon.battle.enditem.gem": "¡El %2$s fortaleció el poder de %1$s!",
+  "cobblemon.battle.enditem.incinerate": "¡La %1$s de %2$s ha sido quemada!",
+  "cobblemon.battle.enditem.airballoon": "¡El globo de %1$s explotó!",
+  "cobblemon.battle.enditem.redcard": "¡%1$s sacó su Tarjeta Roja contra %3$s!",
+  "cobblemon.battle.enditem.pluck": "¡%3$s robó y se comió la %2$s de %1$s!",
+  "cobblemon.battle.enditem.berryjuice": "¡Zumo de Bayas de %1$s activado!",
+  "cobblemon.battle.enditem.generic": "¡%1$s usó su %2$s!",
+  "cobblemon.battle.enditem.mentalherb": "¡%1$s se libró de los efectos mentales gracias a su Hierba Mental!",
+  "cobblemon.battle.enditem.powerherb": "¡%1$s se ha cargado completamente debido a su Hierba de Poder!",
+  "cobblemon.battle.enditem.mirrorherb": "¡%1$s copió los cambios de estadísticas con su Hierba Espejo!",
+  "cobblemon.battle.enditem.whiteherb": "¡%1$s volvió a su estado normal usando su Hierba Blanca!",
+  "cobblemon.battle.heal.zeffect": "¡Los PS de %1$s fueron restaurados por el Poder-Z!",
  "cobblemon.battle.heal.wish": "¡El deseo de %1$s se hizo realidad!",
  "cobblemon.battle.heal.drain": "¡A %1$s se le ha drenado su PS!",
-  "cobblemon.battle.heal.healing_wish": "¡El deseo de curación se ha hecho realidad para %1$s!",
-  "cobblemon.battle.heal.revival_blessing": "¡%1$s fue revivido y está listo para luchar de nuevo!",
-  "cobblemon.battle.heal.aqua_ring": "¡Un velo de agua ha recuperado los PS de %1$s!",
+  "cobblemon.battle.heal.healingwish": "¡El deseo de curación de %1$s se ha hecho realidad!",
+  "cobblemon.battle.heal.revivalblessing": "¡%1$s fue revivido y está listo para luchar de nuevo!",
+  "cobblemon.battle.heal.aquaring": "¡Un velo de agua ha recuperado los PS de %1$s!",
  "cobblemon.battle.heal.ingrain": "¡%1$s absorbió nutrientes con sus raíces!",
-  "cobblemon.battle.heal.grassy_terrain": "Los PS de %1$s han sido restaurados",
-  "cobblemon.battle.heal.leftovers": "¡%1$s ha recuperado un poco de sus PS utilizando Restos!",
-  "cobblemon.battle.heal.rain_dish": "¡%1$s ha restaurado PS por Cura lluvia!",
+  "cobblemon.battle.heal.grassyterrain": "Los PS de %1$s han sido restaurados.",
+  "cobblemon.battle.heal.leftovers": "¡%1$s recuperó un poco de sus PS utilizando %2$s!",
+  "cobblemon.battle.heal.item": "¡%1$s recuperó PS utilizando %2$s!",
+  "cobblemon.battle.heal.raindish": "¡%1$s ha restaurado PS por Cura lluvia!",
  "cobblemon.battle.heal.generic": "%1$s recuperó sus PS.",
+  "cobblemon.battle.heal.bagitempotion": "Restauró los PS de %1$s",
+  "cobblemon.battle.curestatus.naturalcure": "¡%1$s fué curado por Cura Natural!",
+  "cobblemon.battle.bagitem.use": "¡%1$s usó un %2$s en %3$s!",
+  "cobblemon.battle.bagitem.cannot": "No puedes usar objetos ahora.",
+  "cobblemon.battle.bagitem.invalid": "El objeto no funcionará.",
+  "cobblemon.battle.zpower": "¡El Poder-Z rodea y cubre a %1$s!",
+  "cobblemon.battle.zbroken": "¡%1$s no pudo protegerse del todo y recibió daño igual!",
+  "cobblemon.battle.terastallize": "¡%1$s se Teracristalizó en el tipo %2$s!",
+  "cobblemon.battle.detailschange.mega": "¡%1$s reacciona a la Piedra Activadora!",
+  "cobblemon.battle.mega": "¡%1$s Megaevolucionó!",
  "cobblemon.experience.gained": "%1$s ha recibido %2$s de experiencia.",
  "cobblemon.experience.level_up": "¡%1$s ahora es nivel %2$s!",
  "cobblemon.experience.learned_move": "%1$s aprendió %2$s.",
@@ -609,16 +1024,19 @@
  "cobblemon.move.category.status": "Estado",
  "cobblemon.status.sleep.apply": "¡%1$s se ha dormido!",
  "cobblemon.status.sleep.is": "%1$s está profundamente dormido.",
-  "cobblemon.status.sleep.woke": "¡%1$s se ha despertado!",
+  "cobblemon.status.sleep.cure": "¡%1$s se ha despertado!",
  "cobblemon.status.paralysis.apply": "¡%1$s se ha paralizado!",
  "cobblemon.status.paralysis.is": "%1$s está paralizado y no puede moverse",
+  "cobblemon.status.paralysis.cure": "¡%1$s se curó de la parálisis!",
  "cobblemon.status.poison.apply": "¡%1$s fue envenenado!",
+  "cobblemon.status.poison.cure": "¡%1$s se curó del envenenamiento!",
  "cobblemon.status.poisonbadly.apply": "¡%1$s fue gravemente envenenado!",
-  "cobblemon.status.poison.hurt": "%1$s fue dañado por el veneno",
+  "cobblemon.status.poison.hurt": "%1$s fue dañado por el veneno!",
  "cobblemon.status.burn.apply": "¡%1$s ha sido quemado!",
  "cobblemon.status.burn.hurt": "¡%1$s ha sido dañado por sus quemaduras!",
+  "cobblemon.status.burn.cure": "¡%1$s se curó de la quemadura!",
  "cobblemon.status.frozen.apply": "¡%1$s se ha quedado congelado!",
-  "cobblemon.status.frozen.thawed": "¡%1$s se descongeló!",
+  "cobblemon.status.frozen.cure": "¡%1$s se descongeló!",
  "cobblemon.status.frozen.is": "¡%1$s está congelado!",
  "block.cobblemon.dawn_stone_ore": "Mena de Piedra Alba",
  "block.cobblemon.dusk_stone_ore": "Mena de Piedra Noche",
@@ -641,8 +1059,45 @@
  "block.cobblemon.deepslate_thunder_stone_ore": "Mena de Piedra Trueno de pizarra profunda",
  "block.cobblemon.deepslate_water_stone_ore": "Mena de Piedra Agua de pizarra profunda",
  "block.cobblemon.dripstone_moon_stone_ore": "Mena de Piedra Lunar de espeleotema",
+  "block.cobblemon.pasture": "Bloque de Pastoreo",
  "gamerule.doPokemonSpawning": "Generar Pokémon",
+  "gamerule.doShinyStarters": "Los iniciales serán shiny",
  "cobblemon.command.checkspawns.invalid-bucket": "Parámetro de Generación Inválido",
  "cobblemon.command.checkspawns.spawns": "Generaciones",
-  "cobblemon.command.checkspawns.nothing": "Nada puede aparecer aquí en este momento."
+  "cobblemon.command.checkspawns.nothing": "Nada puede aparecer aquí en este momento.",
+  "cobblemon.interaction.ev.add": "¡Los EVs de %2$s de %1$s aumentaron en %3$s!",
+  "cobblemon.interaction.ev.deduct": "¡Los EVs de %2$s de %1$s disminuyeron en %3$s!",
+  "cobblemon.interaction.pp.restore": "Restauras los PP de %1$s.",
+  "cobblemon.interaction.friendsip.add": "¡%1$s se vuelve más cercano contigo!",
+  "cobblemon.interaction.status.cure": "¡%1$s se curó de su problema de estado!",
+  "cobblemon.interaction.hp.heal": "¡%1$s restauró ago de sus PS!",
+  "tag.item.cobblemon.apricorn_logs": "Troncos de Bonguris",
+  "tag.item.cobblemon.apricorn_sprouts": "Brotes de Bonguris",
+  "tag.item.cobblemon.apricorns": "Bonguris",
+  "tag.item.cobblemon.azalea_tree": "Árboles de Azalea",
+  "tag.item.cobblemon.berries": "Bayas",
+  "tag.item.cobblemon.cobblemon_seeds": "Semillas",
+  "tag.item.cobblemon.evolution_items": "Objetos Evolutivos",
+  "tag.item.cobblemon.evolution_stones": "Piedras Evolutivas",
+  "tag.item.cobblemon.experience_candies": "Caramelos de Experiencia",
+  "tag.item.cobblemon.held.destiny_knot": "Lazos Destino",
+  "tag.item.cobblemon.held.everstone": "Piedras Eternas",
+  "tag.item.cobblemon.held.experience_share": "Repartir Experiencia",
+  "tag.item.cobblemon.held.is_held_item": "Objetos Equipables",
+  "tag.item.cobblemon.held.lucky_egg": "Huevos Suerte",
+  "tag.item.cobblemon.held.power_anklet": "Franjas Recias",
+  "tag.item.cobblemon.held.power_band": "Bandas Recias",
+  "tag.item.cobblemon.held.power_belt": "Cintas Recias",
+  "tag.item.cobblemon.held.power_bracer": "Brazales Recios",
+  "tag.item.cobblemon.held.power_lens": "Lentes Recios",
+  "tag.item.cobblemon.held.power_weight": "Pesas Recias",
+  "tag.item.cobblemon.herbs": "Hierbas",
+  "tag.item.cobblemon.mint_leaf": "Hojas de Menta",
+  "tag.item.cobblemon.mints": "Mentas",
+  "tag.item.cobblemon.mutated_berries": "Bayas Mutadas",
+  "tag.item.cobblemon.plants": "Plantas",
+  "tag.item.cobblemon.poke_balls": "Poké Balls",
+  "tag.item.cobblemon.protein_ingredients": "Ingredientes para Proteínas",
+  "tag.item.cobblemon.zinc_ingredients": "Ingredientes para Zinc",
+  "tag.item.cobblemon.seeds": "Semillas"
 }
@@ -1,5 +1,4 @@
 {
-  "itemGroup.cobblemon.pokeball": "Poké Balls",
  "item.cobblemon.poke_ball": "Poké Ball",
  "item.cobblemon.slate_ball": "Ardoise Ball",
  "item.cobblemon.azure_ball": "Azur Ball",
@@ -32,13 +31,13 @@
  "item.cobblemon.park_ball": "Parc Ball",
  "item.cobblemon.dream_ball": "Rêve Ball",
  "item.cobblemon.beast_ball": "Ultra Ball",
-  "item.cobblemon.black_apricorn_seed": "Graine de Noigrume Noir",
-  "item.cobblemon.blue_apricorn_seed": "Graine de Noigrume Bleu",
-  "item.cobblemon.green_apricorn_seed": "Graine de Noigrume Vert",
-  "item.cobblemon.pink_apricorn_seed": "Graine de Noigrume Rose",
-  "item.cobblemon.red_apricorn_seed": "Graine de Noigrume Rouge",
-  "item.cobblemon.white_apricorn_seed": "Graine de Noigrume Blanc",
-  "item.cobblemon.yellow_apricorn_seed": "Graine de Noigrume Jaune",
+  "item.cobblemon.black_apricorn_seed": "Germe de Noigrume Noir",
+  "item.cobblemon.blue_apricorn_seed": "Germe de Noigrume Bleu",
+  "item.cobblemon.green_apricorn_seed": "Germe de Noigrume Vert",
+  "item.cobblemon.pink_apricorn_seed": "Germe de Noigrume Rose",
+  "item.cobblemon.red_apricorn_seed": "Germe de Noigrume Rouge",
+  "item.cobblemon.white_apricorn_seed": "Germe de Noigrume Blanc",
+  "item.cobblemon.yellow_apricorn_seed": "Germe de Noigrume Jaune",
  "item.cobblemon.black_apricorn": "Noigrume Noir",
  "item.cobblemon.blue_apricorn": "Noigrume Bleu",
  "item.cobblemon.green_apricorn": "Noigrume Vert",
@@ -46,7 +45,8 @@
  "item.cobblemon.red_apricorn": "Noigrume Rouge",
  "item.cobblemon.white_apricorn": "Noigrume Blanc",
  "item.cobblemon.yellow_apricorn": "Noigrume Jaune",
-  "itemGroup.cobblemon.evolution_item": "Objets d'évolution",
+  "item.cobblemon.vivichoke_seeds": "Graines de Bourgeon Vivace",
+  "item.cobblemon.vivichoke": "Bourgeon Vivace",
  "item.cobblemon.link_cable": "Fil de Liaison",
  "item.cobblemon.dragon_scale": "Écaille Draco",
  "item.cobblemon.kings_rock": "Roche Royale",
@@ -88,7 +88,6 @@
  "item.cobblemon.sun_stone": "Pierre Soleil",
  "item.cobblemon.thunder_stone": "Pierre Foudre",
  "item.cobblemon.water_stone": "Pierre Eau",
-  "itemGroup.cobblemon.medicine": "Soins",
  "item.cobblemon.rare_candy": "Super Bonbon",
  "item.cobblemon.exp_candy_xs": "Bonbon Exp. XS",
  "item.cobblemon.exp_candy_s": "Bonbon Exp. S",
@@ -101,10 +100,47 @@
  "item.cobblemon.iron": "Fer",
  "item.cobblemon.protein": "Protéine",
  "item.cobblemon.zinc": "Zinc",
-  "itemGroup.cobblemon.held_item": "Objets tenus",
+  "item.cobblemon.potion": "Potion",
+  "item.cobblemon.super_potion": "Super Potion",
+  "item.cobblemon.hyper_potion": "Hyper Potion",
+  "item.cobblemon.max_potion": "Potion Max",
+  "item.cobblemon.full_restore": "Guérison",
+  "item.cobblemon.red_mint_leaf": "Feuille d'Aromate Rouge",
+  "item.cobblemon.red_mint_leaf.tooltip": "Capable d'influencer l'Attaque d'un Pokémon",
+  "item.cobblemon.blue_mint_leaf": "Feuille d'Aromate Bleu",
+  "item.cobblemon.blue_mint_leaf.tooltip": "Capable d'influencer la Défense d'un Pokémon",
+  "item.cobblemon.cyan_mint_leaf": "Feuille d'Aromate Cyan",
+  "item.cobblemon.cyan_mint_leaf.tooltip": "Capable d'influencer l'Attaque Spéciale d'un Pokémon",
+  "item.cobblemon.pink_mint_leaf": "Feuille d'Aromate Rose",
+  "item.cobblemon.pink_mint_leaf.tooltip": "Capable d'influencer la Défense Spéciale d'un Pokémon",
+  "item.cobblemon.green_mint_leaf": "Feuille d'Aromate Vert",
+  "item.cobblemon.green_mint_leaf.tooltip": "Capable d'influencer la Vitesse d'un Pokémon",
+  "item.cobblemon.white_mint_leaf": "Feuille d'Aromate Blanc",
+  "item.cobblemon.white_mint_leaf.tooltip": "Capable de neutraliser la nature d'un Pokémon",
+  "item.cobblemon.lonely_mint": "Aromate Solo",
+  "item.cobblemon.adamant_mint": "Aromate Rigide",
+  "item.cobblemon.naughty_mint": "Aromate Mauvais",
+  "item.cobblemon.brave_mint": "Aromate Brave",
+  "item.cobblemon.bold_mint": "Aromate Assuré",
+  "item.cobblemon.impish_mint": "Aromate Malin",
+  "item.cobblemon.lax_mint": "Aromate Lâche",
+  "item.cobblemon.relaxed_mint": "Aromate Relax",
+  "item.cobblemon.modest_mint": "Aromate Modeste",
+  "item.cobblemon.mild_mint": "Aromate Doux",
+  "item.cobblemon.rash_mint": "Aromate Foufou",
+  "item.cobblemon.quiet_mint": "Aromate Discret",
+  "item.cobblemon.calm_mint": "Aromate Calme",
+  "item.cobblemon.gentle_mint": "Aromate Gentil",
+  "item.cobblemon.careful_mint": "Aromate Prudent",
+  "item.cobblemon.sassy_mint": "Aromate Malpoli",
+  "item.cobblemon.timid_mint": "Aromate Timide",
+  "item.cobblemon.hasty_mint": "Aromate Pressé",
+  "item.cobblemon.jolly_mint": "Aromate Jovial",
+  "item.cobblemon.naive_mint": "Aromate Naïf",
+  "item.cobblemon.serious_mint": "Aromate Sérieux",
  "item.cobblemon.assault_vest": "Veste de Combat",
  "item.cobblemon.auspicious_armor": "Armure de la Fortune",
-  "item.cobblemon.big_root": "Grosse Racine",
+  "item.cobblemon.malicious_armor": "Armure de la Rancune",
  "item.cobblemon.black_belt": "Ceinture Noire",
  "item.cobblemon.black_glasses": "Lunettes Noires",
  "item.cobblemon.black_sludge": "Boue Noire",
@@ -138,6 +174,21 @@
  "item.cobblemon.spell_tag": "Rune Sort",
  "item.cobblemon.twisted_spoon": "Cuillère Tordue",
  "item.cobblemon.wise_glasses": "Lunettes Sages",
+  "item.cobblemon.mental_herb": "Herbe Mental",
+  "item.cobblemon.mirror_herb": "Feuille Copieuse",
+  "item.cobblemon.power_herb": "Herbe Pouvoir",
+  "item.cobblemon.white_herb": "Herbe Blanche",
+  "item.cobblemon.bright_powder": "Poudre Claire",
+  "item.cobblemon.metal_powder": "Poudre Métal",
+  "item.cobblemon.quick_powder": "Poudre Vite",
+  "item.cobblemon.destiny_knot": "Nœud Destin",
+  "item.cobblemon.everstone": "Pierre Stase",
+  "item.cobblemon.power_anklet": "Chaîne Pouvoir",
+  "item.cobblemon.power_band": "Bandeau Pouvoir",
+  "item.cobblemon.power_belt": "Ceinture Pouvoir",
+  "item.cobblemon.power_bracer": "Poignet Pouvoir",
+  "item.cobblemon.power_lens": "Lentille Pouvoir",
+  "item.cobblemon.power_weight": "Poids Pouvoir",
  "item.cobblemon.poke_ball.tooltip": "Taux de capture ×1",
  "item.cobblemon.slate_ball.tooltip": "Taux de capture ×1",
  "item.cobblemon.azure_ball.tooltip": "Taux de capture ×1",
@@ -170,6 +221,56 @@
  "item.cobblemon.park_ball.tooltip": "Taux de capture ×2,5 dans tous les biomes Forêt et Plaines",
  "item.cobblemon.dream_ball.tooltip": "Taux de capture ×4 sur un Pokémon endormi",
  "item.cobblemon.beast_ball.tooltip": "Taux de capture ×5 sur les Ultra-Chimères; ×0,1 dans le cas contraire",
+  "item.cobblemon.mulch_base": "Engrais",
+  "item.cobblemon.coarse_mulch": "Ferticanaille",
+  "item.cobblemon.growth_mulch": "Fertipousse",
+  "item.cobblemon.humid_mulch": "Fertihumide",
+  "item.cobblemon.loamy_mulch": "Fertiargile",
+  "item.cobblemon.peat_mulch": "Fertitourbe",
+  "item.cobblemon.rich_mulch": "Fertibondance",
+  "item.cobblemon.sandy_mulch": "Fertisablé",
+  "item.cobblemon.surprise_mulch": "Fertistantané",
+  "item.cobblemon.medicinal_leek": "Soignon",
+  "item.cobblemon.energy_root": "Racinénergie",
+  "item.cobblemon.revival_herb": "Herbe Rappel",
+  "item.cobblemon.roasted_leek": "Poireau Rôti",
+  "item.cobblemon.leek_and_potato_stew": "Ragoût de poireau et pomme de terre",
+  "item.cobblemon.braised_vivichoke": "Bourgeon Vivace Braisé",
+  "item.cobblemon.vivichoke_dip": "Trempette de Bourgeon Vivace",
+  "item.cobblemon.berry_juice": "Jus de Baie",
+  "item.cobblemon.remedy": "Remède",
+  "item.cobblemon.fine_remedy": "Super Remède",
+  "item.cobblemon.superb_remedy": "Hyper Remède",
+  "item.cobblemon.heal_powder": "Poudre Soin",
+  "item.cobblemon.medicinal_brew": "Infusion Médicinale",
+  "item.cobblemon.revive": "Rappel",
+  "item.cobblemon.max_revive": "Rappel Max",
+  "item.cobblemon.pp_up": "PP Plus",
+  "item.cobblemon.pp_max": "PP Max",
+  "item.cobblemon.x_attack": "Attaque +",
+  "item.cobblemon.x_defence": "Défense +",
+  "item.cobblemon.x_accuracy": "Précision +",
+  "item.cobblemon.x_speed": "Vitesse +",
+  "item.cobblemon.x_special_defence": "Déf. Spé. +",
+  "item.cobblemon.x_special_attack": "Atq. Spé. +",
+  "item.cobblemon.dire_hit": "Muscle +",
+  "item.cobblemon.guard_spec": "Garde-Stats",
+  "item.cobblemon.full_heal": "Total Soin",
+  "item.cobblemon.antidote": "Antidote",
+  "item.cobblemon.awakening": "Réveil",
+  "item.cobblemon.burn_heal": "Anti-Brûle",
+  "item.cobblemon.ice_heal": "Antigel",
+  "item.cobblemon.paralyze_heal": "Anti-Para",
+  "item.cobblemon.ether": "Huile",
+  "item.cobblemon.max_ether": "Huile Max",
+  "item.cobblemon.elixir": "Élixir",
+  "item.cobblemon.max_elixir": "Élixir Max",
+  "itemGroup.cobblemon.blocks": "Blocs",
+  "itemGroup.cobblemon.pokeball": "Poké Balls",
+  "itemGroup.cobblemon.agriculture": "Agriculture",
+  "itemGroup.cobblemon.consumables": "Consommables",
+  "itemGroup.cobblemon.held_item": "Objets tenus",
+  "itemGroup.cobblemon.evolution_item": "Objets d'évolution",
  "block.cobblemon.apricorn_log": "Bûche de Noigrume",
  "block.cobblemon.stripped_apricorn_log": "Bûche de Noigrume écorcée",
  "block.cobblemon.apricorn_wood": "Bois de Noigrume",
@@ -183,6 +284,7 @@
  "block.cobblemon.apricorn_button": "Bouton en Noigrume",
  "block.cobblemon.apricorn_slab": "Dalle en Noigrume",
  "block.cobblemon.apricorn_fence_gate": "Porte de clôture en Noigrume",
+  "block.cobblemon.big_root": "Grosse Racine",
  "block.cobblemon.black_apricorn_sapling": "Pousse de Noigrume Noir",
  "block.cobblemon.blue_apricorn_sapling": "Pousse de Noigrume Bleu",
  "block.cobblemon.green_apricorn_sapling": "Pousse de Noigrume Vert",
@@ -196,12 +298,24 @@
  "block.cobblemon.healing_machine.tooltip1": "Doit être chargée après avoir été posée.",
  "block.cobblemon.healing_machine.tooltip2": "Se charge avec le temps.",
  "block.cobblemon.pc": "PC",
+  "block.cobblemon.red_mint": "Graines d'Aromate Rouge",
+  "block.cobblemon.blue_mint": "Graines d'Aromate Bleu",
+  "block.cobblemon.cyan_mint": "Graines d'Aromate Cyan",
+  "block.cobblemon.pink_mint": "Graines d'Aromate Rose",
+  "block.cobblemon.green_mint": "Graines d'Aromate Vert",
+  "block.cobblemon.white_mint": "Graines d'Aromate Blanc",
+  "block.cobblemon.vivichoke_seeds": "Graines de Bourgeon Vivace",
+  "block.cobblemon.pep_up_flower": "Fleur PP",
+  "block.cobblemon.potted_pep_up_flower": "Pot de Fleur PP",
  "cobblemon.overflow_no_pc": "Votre équipe est pleine et vous n'avez pas de PC !",
  "cobblemon.overflow_no_space": "Votre équipe est pleine et %1$s aussi !",
-  "cobblemon.overflow_to_pc": "Votre équipe est pleine ! %1$s a été ajouté à %2$s.",
+  "cobblemon.overflow_to_pc": "Votre équipe est pleine ! %1$s a été ajouté à %2$s.",
  "cobblemon.your_pc": "votre PC",
-  "cobblemon.command.pokespawn.invalid-pokemon": "Nom du Pokémon invalide",
+  "cobblemon.command.pokespawn.invalid-pokemon": "Nom de Pokémon invalide",
  "cobblemon.command.pokespawn.invalid-move": "Nom de la capacité invalide",
+  "cobblemon.command.clearparty.nonethere": "Il n'y a pas de Pokémon dans l'équipe de %1$s.",
+  "cobblemon.command.clearparty.cleared": "L'équipe de %1$s a été effacée.",
+  "cobblemon.command.clearpc.cleared": "Le PC de %1$s a été effacé.",
  "cobblemon.ui.generic.yes": "Oui",
  "cobblemon.ui.generic.no": "Non",
  "cobblemon.ui.pokenav.title": "PokéNav",
@@ -211,6 +325,8 @@
  "cobblemon.ui.starter.alreadyselected": "Vous avez déjà sélectionné un Pokémon de départ !",
  "cobblemon.ui.starter.cannotchoose": "Vous ne pouvez pas choisir un Pokémon de départ tout de suite.",
  "cobblemon.ui.starter.hasalreadychosen": "%1$s a déjà choisi un Pokémon de départ.",
+  "cobblemon.ui.starter.choose_starter_title": "Choisissez votre Pokémon partenaire !",
+  "cobblemon.ui.starter.choose_starter_description": "Appuyez sur la touche « %1$s »",
  "cobblemon.ui.starter.chooseyourstarter": "Appuyez sur %1$s pour choisir votre Pokémon et commencer votre voyage !",
  "cobblemon.ui.moves": "Capacités",
  "cobblemon.ui.moves.switch": "Gestion des capacités",
@@ -237,6 +353,12 @@
  "cobblemon.ui.info.ability": "Talent",
  "cobblemon.ui.info.experience_points": "Points d'Exp.",
  "cobblemon.ui.info.to_next_level": "Niveau suivant",
+  "cobblemon.ui.trade": "Échanger",
+  "cobblemon.trade.occupied": "%1$s est occupé.",
+  "cobblemon.trade.request_expired": "La demande d'échange avec %1$s a expiré.",
+  "cobblemon.trade.request_already_expired": "Leur demande d'échange a déjà expiré.",
+  "cobblemon.trade.request_sent": "Vous avez proposé d'échanger avec %1$s",
+  "cobblemon.trade.offer": "%1$s a proposé d'échanger des Pokémon avec vous.",
  "cobblemon.ui.party": "Équipe",
  "cobblemon.ui.power": "Puissance",
  "cobblemon.ui.accuracy": "Précision",
@@ -245,6 +367,10 @@
  "cobblemon.ui.exit": "Quitter",
  "cobblemon.ui.pc.box.title": "Boîte %1$s",
  "cobblemon.ui.pc.release": "Relâcher",
+  "cobblemon.ui.pasture": "Pâturage",
+  "cobblemon.ui.pasture.recall_all": "Tout rappeler",
+  "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)",
+  "cobblemon.pasture.too_many_nearby": "Il y a trop de Pokémon à proximité.",
  "key.cobblemon.upshiftparty": "Changer le Pokémon sélectionné (haut)",
  "key.cobblemon.downshiftparty": "Changer le Pokémon sélectionné (bas)",
  "key.cobblemon.hideparty": "Cacher l'équipe",
@@ -255,17 +381,17 @@
  "cobblemon.subtitle.capture_succeeded": "Capture réussie !",
  "cobblemon.healingmachine.alreadyinuse": "Cette machine de soin est déjà utilisé !",
  "cobblemon.healingmachine.nopokemon": "Vous n'avez aucun Pokémon dans votre équipe à soigner !",
-  "cobblemon.healingmachine.alreadyhealed": "Votre équipe Pokémon est déjà complètement soigné !",
-  "cobblemon.healingmachine.healing": "Votre équipe Pokémon est en train d'être soigné !",
-  "cobblemon.healingmachine.healed": "Votre équipe Pokémon a été soigné !",
+  "cobblemon.healingmachine.alreadyhealed": "Votre équipe est déjà complètement soignée !",
+  "cobblemon.healingmachine.healing": "Votre équipe est en train d'être soignée...",
+  "cobblemon.healingmachine.healed": "Votre équipe est soignée !",
  "cobblemon.healingmachine.notenoughcharge": "Cette machine a besoin de %s de charge supplémentaire pour soigner votre équipe !",
  "cobblemon.healingmachine.inbattle": "Vous ne pouvez pas utiliser une machine de soin pendant un combat !",
-  "cobblemon.healingmachine.alreadyhealing": "Votre équipe Pokémon est déjà dans une différente machine de soin !",
+  "cobblemon.healingmachine.alreadyhealing": "Votre équipe est déjà dans une autre machine de soin !",
  "cobblemon.pc.inbattle": "Vous ne pouvez pas utiliser un PC pendant un combat !",
  "cobblemon.held_item": "Objet tenu",
-  "cobblemon.held_item.give": "L'objet %2$s a été donné à %1$s.",
-  "cobblemon.held_item.replace": "Vous avez récupéré l'objet %1$s de %2$s et lui avez donné l'objet %3$s.",
-  "cobblemon.held_item.take": "Vous avez récupéré l'objet %1$s de %2$s.",
+  "cobblemon.held_item.give": "%1$s reçoit l'objet %2$s.",
+  "cobblemon.held_item.replace": "%2$s reçoit l'objet %3$s et vous récupérez l'objet %1$s.",
+  "cobblemon.held_item.take": "Vous récupérez l'objet %1$s de %2$s.",
  "cobblemon.held_item.already_holding": "%1$s tient déjà l'objet %2$s !",
  "cobblemon.ui.pokemonteam": "Équipe Pokémon",
  "cobblemon.ui.lv": "N.",
@@ -291,24 +417,174 @@
  "cobblemon.label.lv": "N. %1$s",
  "cobblemon.challenge_label": "Appuyez sur %1$s pour lancer le combat.",
  "cobblemon.challenge.sender": "Vous avez défié %1$s à un combat !",
-  "cobblemon.challenge.receiver": "%1$s vous a défié au combat ! Appuyez sur %2$s tout en le regardant pour combattre.",
+  "cobblemon.challenge.receiver": "%1$s vous défie au combat !",
  "cobblemon.drop.item.inventory": "Vous avez reçu %2$s (%1$sx).",
  "cobblemon.drop.item.full": "Votre inventaire est plein, %1$s est tombé au sol.",
+  "cobblemon.mint.interact": "Les stats de %1$s ont changé !",
+  "cobblemon.mint.same_nature": "Les stats de %1$s ne semblent pas affectées par l'%2$s.",
+  "itemGroup.cobblemon.plants": "Plantes",
+  "item.cobblemon.aguav_berry": "Baie Gowav",
+  "item.cobblemon.aguav_berry.tooltip": "Restaure 1/3 des PV lorsque le porteur a moins d'1/4 de ses PV max ; rend confus si le Pokémon n'aime pas les Baies amères",
+  "item.cobblemon.apicot_berry": "Baie Abriko",
+  "item.cobblemon.apicot_berry.tooltip": "Augmente la Défense Spéciale de 1 niveau lorsque le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.aspear_berry": "Baie Willia",
+  "item.cobblemon.aspear_berry.tooltip": "Soigne le porteur du gel",
+  "item.cobblemon.babiri_berry": "Baie Babiri",
+  "item.cobblemon.babiri_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Acier",
+  "item.cobblemon.belue_berry": "Baie Myrte",
+  "item.cobblemon.belue_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.bluk_berry": "Baie Remu",
+  "item.cobblemon.bluk_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.charti_berry": "Baie Charti",
+  "item.cobblemon.charti_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Roche",
+  "item.cobblemon.cheri_berry": "Baie Ceriz",
+  "item.cobblemon.cheri_berry.tooltip": "Soigne le porteur de la paralysie",
+  "item.cobblemon.chesto_berry": "Baie Maron",
+  "item.cobblemon.chesto_berry.tooltip": "Soigne le porteur du sommeil",
+  "item.cobblemon.chilan_berry": "Baie Zalis",
+  "item.cobblemon.chilan_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité de type Normal",
+  "item.cobblemon.chople_berry": "Baie Pomroz",
+  "item.cobblemon.chople_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Combat",
+  "item.cobblemon.coba_berry": "Baie Cobaba",
+  "item.cobblemon.coba_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Vol",
+  "item.cobblemon.colbur_berry": "Baie Lampou",
+  "item.cobblemon.colbur_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Ténèbres",
+  "item.cobblemon.cornn_berry": "Baie Siam",
+  "item.cobblemon.cornn_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.custap_berry": "Baie Chérim",
+  "item.cobblemon.custap_berry.tooltip": "Attaque en premier si le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.durin_berry": "Baie Durin",
+  "item.cobblemon.durin_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.enigma_berry": "Baie Enigma",
+  "item.cobblemon.enigma_berry.tooltip": "Restaure 1/4 des PV lorsque le porteur subit une capacité super efficace",
+  "item.cobblemon.figy_berry": "Baie Figuy",
+  "item.cobblemon.figy_berry.tooltip": "Restaure 1/3 des PV lorsque le porteur a moins d'1/4 de ses PV max ; rend confus si le Pokémon n'aime pas les Baies épicées",
+  "item.cobblemon.ganlon_berry": "Baie Lingan",
+  "item.cobblemon.ganlon_berry.tooltip": "Augmente la Défense de 1 niveau lorsque le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.grepa_berry": "Baie Résin",
+  "item.cobblemon.grepa_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.haban_berry": "Baie Fraigo",
+  "item.cobblemon.haban_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Dragon",
+  "item.cobblemon.hondew_berry": "Baie Lonme",
+  "item.cobblemon.hondew_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.hopo_berry": "Baie Bouhlon",
+  "item.cobblemon.hopo_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.iapapa_berry": "Baie Papaya",
+  "item.cobblemon.iapapa_berry.tooltip": "Restaure 1/3 des PV lorsque le porteur a moins d'1/4 de ses PV max ; rend confus si le Pokémon n'aime pas les Baies acides",
+  "item.cobblemon.jaboca_berry": "Baie Jaboca",
+  "item.cobblemon.jaboca_berry.tooltip": "Si le porteur subit une capacité physique, l'adversaire subit un contrecoup d'1/8 de ses PV max",
+  "item.cobblemon.kasib_berry": "Baie Sédra",
+  "item.cobblemon.kasib_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Spectre",
+  "item.cobblemon.kebia_berry": "Baie Kébia",
+  "item.cobblemon.kebia_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Poison",
+  "item.cobblemon.kee_berry": "Baie Éka",
+  "item.cobblemon.kee_berry.tooltip": "Augmente la Défense de 1 niveau lorsque le porteur subit une capacité physique",
+  "item.cobblemon.kelpsy_berry": "Baie Alga",
+  "item.cobblemon.kelpsy_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.lansat_berry": "Baie Lansat",
+  "item.cobblemon.lansat_berry.tooltip": "Augmente le taux de coups critiques lorsque le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.leppa_berry": "Baie Mepo",
+  "item.cobblemon.leppa_berry.tooltip": "Restaure 10 PP de la première capacité qui atteint 0 PP",
+  "item.cobblemon.liechi_berry": "Baie Lichii",
+  "item.cobblemon.liechi_berry.tooltip": "Augmente l'Attaque de 1 niveau lorsque le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.lum_berry": "Baie Prine",
+  "item.cobblemon.lum_berry.tooltip": "Soigne tous les problèmes de statut du porteur",
+  "item.cobblemon.mago_berry": "Baie Mago",
+  "item.cobblemon.mago_berry.tooltip": "Restaure 1/3 des PV lorsque le porteur a moins d'1/4 de ses PV max ; rend confus si le Pokémon n'aime pas les Baies sucrées",
+  "item.cobblemon.magost_berry": "Baie Mangou",
+  "item.cobblemon.magost_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.maranga_berry": "Baie Rangma",
+  "item.cobblemon.maranga_berry.tooltip": "Augmente la Défense Spéciale de 1 niveau lorsque le porteur subit une capacité spéciale",
+  "item.cobblemon.micle_berry": "Baie Micle",
+  "item.cobblemon.micle_berry.tooltip": "Augmente la précision de la prochaine capacité de x1.2 lorsque le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.nanab_berry": "Baie Nanab",
+  "item.cobblemon.nanab_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.touga_berry": "Baie Touga",
+  "item.cobblemon.touga_berry.tooltip": "Soigne le porteur de la confusion",
+  "item.cobblemon.nomel_berry": "Baie Tronci",
+  "item.cobblemon.nomel_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.occa_berry": "Baie Chocco",
+  "item.cobblemon.occa_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Feu",
+  "item.cobblemon.oran_berry": "Baie Oran",
+  "item.cobblemon.oran_berry.tooltip": "Restaure 10 PV lorsque le porteur a moins d'1/2 de ses PV max",
+  "item.cobblemon.pamtre_berry": "Baie Palma",
+  "item.cobblemon.pamtre_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.passho_berry": "Baie Pocpoc",
+  "item.cobblemon.passho_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Eau",
+  "item.cobblemon.payapa_berry": "Baie Yapap",
+  "item.cobblemon.payapa_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Psy",
+  "item.cobblemon.pecha_berry": "Baie Pêcha",
+  "item.cobblemon.pecha_berry.tooltip": "Soigne le porteur de l'empoisonnement",
+  "item.cobblemon.persim_berry": "Baie Kika",
+  "item.cobblemon.persim_berry.tooltip": "Soigne le porteur de la confusion",
+  "item.cobblemon.petaya_berry": "Baie Pitaye",
+  "item.cobblemon.petaya_berry.tooltip": "Augmente l'Attaque Spéciale de 1 niveau lorsque le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.pinap_berry": "Baie Nanana",
+  "item.cobblemon.pinap_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.pomeg_berry": "Baie Grena",
+  "item.cobblemon.pomeg_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.qualot_berry": "Baie Qualot",
+  "item.cobblemon.qualot_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.rabuta_berry": "Baie Rabuta",
+  "item.cobblemon.rabuta_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.rawst_berry": "Baie Fraive",
+  "item.cobblemon.rawst_berry.tooltip": "Soigne le porteur de la brûlure",
+  "item.cobblemon.razz_berry": "Baie Framby",
+  "item.cobblemon.razz_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.rindo_berry": "Baie Ratam",
+  "item.cobblemon.rindo_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Plante",
+  "item.cobblemon.roseli_berry": "Baie Selro",
+  "item.cobblemon.roseli_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Fée",
+  "item.cobblemon.rowap_berry": "Baie Pommo",
+  "item.cobblemon.rowap_berry.tooltip": "Si le porteur subit une capacité spéciale, l'adversaire subit un contrecoup d'1/8 de ses PV max",
+  "item.cobblemon.salac_berry": "Baie Sailak",
+  "item.cobblemon.salac_berry.tooltip": "Augmente la Vitesse de 1 niveau lorsque le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.shuca_berry": "Baie Jouca",
+  "item.cobblemon.shuca_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Sol",
+  "item.cobblemon.sitrus_berry": "Baie Sitrus",
+  "item.cobblemon.sitrus_berry.tooltip": "Restaure 1/4 des PV lorsque le porteur a moins d'1/2 de ses PV max",
+  "item.cobblemon.spelon_berry": "Baie Kiwan",
+  "item.cobblemon.spelon_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.starf_berry": "Baie Frista",
+  "item.cobblemon.starf_berry.tooltip": "Augmente une statistique aléatoire de 2 lorsque le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.tamato_berry": "Baie Tamato",
+  "item.cobblemon.tamato_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.tanga_berry": "Baie Panga",
+  "item.cobblemon.tanga_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Insecte",
+  "item.cobblemon.wacan_berry": "Baie Parma",
+  "item.cobblemon.wacan_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Électrik",
+  "item.cobblemon.watmel_berry": "Baie Stekpa",
+  "item.cobblemon.watmel_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.wepear_berry": "Baie Repoi",
+  "item.cobblemon.wepear_berry.tooltip": "Ne peut être consommée par le porteur",
+  "item.cobblemon.wiki_berry": "Baie Wiki",
+  "item.cobblemon.wiki_berry.tooltip": "Restaure 1/3 des PV lorsque le porteur a moins d'1/4 de ses PV max ; rend confus si le Pokémon n'aime pas les Baies sèches",
+  "item.cobblemon.yache_berry": "Baie Nanone",
+  "item.cobblemon.yache_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Glace",
  "cobblemon.command.general.invalid-party-slot": "Il n'y a pas de Pokémon dans l'emplacement %1$s !",
  "cobblemon.command.givepokemon.give": "%2$s a reçu %1$s.",
  "cobblemon.command.pokemonedit": "%1$s de %2$s a été modifié.",
  "cobblemon.command.teach": "%1$s de %2$s a appris %3$s.",
  "cobblemon.command.teach.already_knows": "%1$s connait déjà %2$s !",
-  "cobblemon.command.healpokemon.heal": "L'équipe de %1$s est complètement soigné.",
+  "cobblemon.command.healpokemon.heal": "L'équipe de %1$s est complètement soignée.",
  "cobblemon.command.friendship": "%1$s a %2$s de bonheur.",
  "cobblemon.command.givepokemon.nospecies": "Erreur : Vous devez inclure le nom d'un Pokémon ou 'random'",
  "cobblemon.command.spawnpokemon.nospecies": "Erreur : Vous devez inclure le nom d'un Pokémon ou 'random'",
  "cobblemon.command.held_item": "%2$s de %1$s a récupéré l'objet %3$s.",
  "cobblemon.command.pokeheal.in_battle": "Vous ne pouvez pas soigner votre équipe pendant un combat !",
+  "cobblemon.command.spawnpokemonfrompool": "%1$s est apparu dans les environs.",
+  "cobblemon.command.spawnpokemonfrompool.unable_to_spawn": "Impossible de faire apparaître un Pokémon.",
+  "cobblemon.command.pokebox.box_does_not_exist": "Ce joueur n'a pas de boîte %1$s.",
+  "cobblemon.command.pokebox.box_is_full": "La boîte %1$s du joueur est pleine.",
+  "cobblemon.command.pokebox.storage_is_full": "Le stockage du joueur est plein.",
+  "cobblemon.command.pokebox.last_pokemon": "Le dernier Pokémon du joueur n'a pas été envoyé au PC.",
+  "cobblemon.command.pokemonrestart": "L'équipe et le PC de %1$s ont été effacés.",
  "advancements.cobblemon.root": "Le monde de Cobblemon !",
+  "advancements.cobblemon.root.description": "Choisissez un Pokémon de départ et partez pour une nouvelle aventure",
  "advancements.cobblemon.obtain_leftovers": "Récolter, réutiliser, recycler !",
  "advancements.cobblemon.obtain_leftovers.description": "Gardez les restes après avoir mangé une pomme.",
-  "advancements.cobblemon.root.description": "Choisissez un Pokémon de départ et partez pour une nouvelle aventure",
+  "advancements.cobblemon.any_plant": "La bonté de Mère Nature",
+  "advancements.cobblemon.any_plant.description": "J'espère que vous avez la main verte !",
  "advancements.cobblemon.harvest_apricorn": "Est-ce un fruit ou une noisette ?",
  "advancements.cobblemon.harvest_apricorn.description": "Faites un clic droit pour récolter un Noigrume adulte",
  "advancements.cobblemon.harvest_apricorn_seed": "Faire sa part du travail",
@@ -328,7 +604,7 @@
  "advancements.cobblemon.first_catch": "Un nouvel ami !",
  "advancements.cobblemon.first_catch.description": "Utilisez une Poké Ball et attrapez votre premier Pokémon",
  "advancements.cobblemon.full_party": "Main pleine",
-  "advancements.cobblemon.full_party.description": "Attrapez 5 Pokémon et complétez votre équipe",
+  "advancements.cobblemon.full_party.description": "Attrapez plus de Pokémon et faites une équipe de 6",
  "advancements.cobblemon.first_evolution": "Dévouement et travail acharné",
  "advancements.cobblemon.first_evolution.description": "Remplissez les conditions d'évolution d'un Pokémon et faites-le évoluer à partir du menu de votre équipe",
  "advancements.cobblemon.first_battle_victory": "Et la musique de victoire ?",
@@ -337,6 +613,55 @@
  "advancements.cobblemon.first_shiny_catch.description": "Attrapez votre premier Pokémon chromatique",
  "advancements.cobblemon.healing_machine": "Repos bien mérité",
  "advancements.cobblemon.healing_machine.description": "Attendez que la machine de soin soit chargée et soignez votre équipe",
+  "advancements.cobblemon.obtain_leek": "Que quelqu'un soigne le bateau !",
+  "advancements.cobblemon.obtain_leek.description": "Obtenez un Soignon, une plante sauvage qui pousse dans l'eau douce",
+  "advancements.cobblemon.medicinal_brew": "Apothicaire local",
+  "advancements.cobblemon.medicinal_brew.description": "Utilisez un Soignon pour confectionner la base de vos remèdes",
+  "advancements.cobblemon.brew_potion": "Vous ne pouvez pas manier mes potions",
+  "advancements.cobblemon.brew_potion.description": "Incorporez une Baie Oran dans l'Infusion Médicinale pour créer une Potion",
+  "advancements.cobblemon.brew_full_restore": "Le choix du champion",
+  "advancements.cobblemon.brew_full_restore.description": "Suivez l'arbre de brassage et confectionnez une Guérison avec une Baie Prine et une Potion Max",
+  "advancements.cobblemon.brew_all": "Doubles jumelles doubles problèmes",
+  "advancements.cobblemon.brew_all.description": "Confectionnez tous les objets possibles en utilisant l'Infusion Médicinale",
+  "advancements.cobblemon.obtain_mint": "Aromate fraîche",
+  "advancements.cobblemon.obtain_mint.description": "Obtenez une Aromate, une plante sauvage qui pousse en haut des montagnes",
+  "advancements.cobblemon.obtain_all_mints": "Un grand engage-menthe",
+  "advancements.cobblemon.obtain_all_mints.description": "Obtenez toutes les 6 couleurs d'Aromates et accédez à un éventail complet de natures",
+  "advancements.cobblemon.obtain_revival_herb": "Herbe ton enthousiasme",
+  "advancements.cobblemon.obtain_revival_herb.description": "Obtenez un Herbe Rappel, une plante sauvage qui pousse dans les cavernes luxuriantes",
+  "advancements.cobblemon.use_revive": "Vivre pour combattre un jour de plus !",
+  "advancements.cobblemon.use_revive.description": "Utilisez un Rappel, Rappel Max ou Herbe Rappel pour réanimer un Pokémon K.O.",
+  "advancements.cobblemon.obtain_big_root": "La Racine de la guérison de base",
+  "advancements.cobblemon.obtain_big_root.description": "Obtenez une Grosse Racine, une plante sauvage qui pousse dans les cavernes de terre près de la surface",
+  "advancements.cobblemon.craft_remedy": "Guérison de base",
+  "advancements.cobblemon.craft_remedy.description": "Fabriquez un Remède, un objet de guérison accessible en début de partie, qui peut être transformé en éléments plus puissants",
+  "advancements.cobblemon.obtain_vivichoke": "Une vivacité bourgeonnante",
+  "advancements.cobblemon.obtain_vivichoke.description": "Obtenez un Bourgeon Vivace, cultivé à partir de graines de Bourgeon Vivace étrangement rares",
+  "advancements.cobblemon.obtain_berry": "Très fruité",
+  "advancements.cobblemon.obtain_berry.description": "Obtenez une Baie, des fruits sauvages qui poussent à la surface et qui ont de nombreuses utilisations",
+  "advancements.cobblemon.obtain_mutated_berry": "Un résultat inattendu",
+  "advancements.cobblemon.obtain_mutated_berry.description": "Plantez des Baies de différents types les unes à côté des autres et observez la mutation en action",
+  "advancements.cobblemon.obtain_all_berries": "Oups, toutes les Baies !",
+  "advancements.cobblemon.obtain_all_berries.description": "Obtenez toutes les types de Baies dans Cobblemon",
+  "advancements.cobblemon.use_pasture": "Liberté : Activé",
+  "advancements.cobblemon.use_pasture.description": "Fabriquez un bloc de pâturage et laissez vos amis se balader",
+  "advancements.cobblemon.catch_all_vivillon": "Ailes à motifs",
+  "advancements.cobblemon.catch_all_vivillon.description": "Obtenez toutes les formes de Prismillon",
+  "advancements.cobblemon.evolve_veevees": "Précieuses évolutions",
+  "advancements.cobblemon.evolve_veevees.description": "Faites évoluer Évoli en 8 différentes évolutions",
+  "advancements.cobblemon.evolve_shedinja": "Un fantôme dans la carapace",
+  "advancements.cobblemon.evolve_shedinja.description": "Gardez une Poké Ball supplémentaire dans votre inventaire et obtenez un Munja",
+  "advancements.cobblemon.trade_pokemon": "Prends-en bien soin !",
+  "advancements.cobblemon.trade_pokemon.description": "Échangez un Pokémon avec un autre dresseur",
+  "advancements.cobblemon.trade_shelmet_karrablast": "J'aimerais déclarer un vol !",
+  "advancements.cobblemon.trade_shelmet_karrablast.description": "Échangez un Escargaume et un Carabing",
+  "advancements.cobblemon.max_level_baby": "Darwin ? Qui ça ?",
+  "advancements.cobblemon.max_level_baby.description": "Montez un Pokémon évolutif au stade initial jusqu'au niveau 100 sans l'évoluer",
+  "advancements.cobblemon.use_candy": "Dent sucrée",
+  "advancements.cobblemon.use_candy.description": "Utilisez n'importe quel Bonbon Exp. sur un Pokémon",
+  "advancements.cobblemon.own_zangoose_seviper": "Des partenaires réticents",
+  "advancements.cobblemon.own_zangoose_seviper.description": "Détenez un Mangriff et un Séviper dans votre équipe en même temps",
+  "cobblemon.battle.crash": "Une erreur lors du combat est survenue. Si vous jouez seul, signalez ceci à l'équipe de modération. Sinon, signalez à l'administrateur du serveur.",
  "cobblemon.battle.damage_dealt": "%1$s a subi %2$s dégâts !",
  "cobblemon.battle.used_move": "%1$s utilise %2$s !",
  "cobblemon.battle.used_move_on": "%1$s utilise %2$s sur %3$s !",
@@ -344,7 +669,7 @@
  "cobblemon.battle.owned_pokemon": "%2$s de %1$s",
  "cobblemon.battle.fainted": "%1$s est K.O. !",
  "cobblemon.battle.win": "%1$s a gagné !",
-  "cobblemon.battle.flee": "Le combat a pris fin.",
+  "cobblemon.battle.flee": "Vous prenez la fuite !",
  "cobblemon.battle.switch_option": "Changer de Pokémon : ",
  "cobblemon.battle.your_team": "Votre équipe :",
  "cobblemon.battle.must_switch": "Choisissez un Pokémon à remplacer",
@@ -356,14 +681,19 @@
  "cobblemon.battle.crit": "Coup critique !",
  "cobblemon.battle.nothing": "Mais rien ne se passe !",
  "cobblemon.battle.clearallboost": "Les changements de statistiques ont été annulés !",
+  "cobblemon.battle.clearallnegativeboost": "Les stats de %1$s sont revenues à la normale !",
+  "cobblemon.battle.clearallnegativeboost.zeffect": "%1$s utilise la Force Z pour annuler ses baisses de stats !",
  "cobblemon.battle.unboost.slight": "%2$s de %1$s baisse !",
  "cobblemon.battle.unboost.sharp": "%2$s de %1$s baisse beaucoup !",
  "cobblemon.battle.unboost.severe": "%2$s de %1$s baisse énormément !",
  "cobblemon.battle.unboost.cap.single": "%2$s de %1$s ne peut plus baisser !",
  "cobblemon.battle.unboost.cap.multiple": "Les statistiques de %1$s ne peuvent plus baisser !",
  "cobblemon.battle.boost.slight": "%2$s de %1$s augmente !",
+  "cobblemon.battle.boost.slight.zeffect": "%1$s utilise la Force Z pour augmenter sa statistique %2$s !",
  "cobblemon.battle.boost.sharp": "%2$s de %1$s augmente beaucoup !",
+  "cobblemon.battle.boost.sharp.zeffect": "%1$s utilise la Force Z pour beaucoup augmenter sa statistique %2$s !",
  "cobblemon.battle.boost.severe": "%2$s de %1$s augmente énormément !",
+  "cobblemon.battle.boost.severe.zeffect": "%1$s utilise la Force Z pour augmenter énormément sa statistique %2$s !",
  "cobblemon.battle.boost.cap.single": "%2$s de %1$s ne peut plus augmenter !",
  "cobblemon.battle.boost.cap.multiple": "Les statistiques de %1$s ne peuvent plus augmenter !",
  "cobblemon.battle.setboost.bellydrum": "%1$s sacrifie des PV et monte son Attaque au maximum !",
@@ -381,162 +711,247 @@
  "cobblemon.capture.not_single": "Vous pouvez capturer un Pokémon sauvage que dans un combat de 1vs1.",
  "cobblemon.you_in_battle": "Vous ne pouvez pas faire ça durant un combat !",
  "cobblemon.battle.turn": "C'est maintenant le tour %1$s",
-  "cobblemon.battle.rain_dance": "Il commence à pleuvoir !",
-  "cobblemon.battle.rain_dance_upkeep": "La pluie continue de tomber.",
-  "cobblemon.battle.sandstorm": "Une tempête de sable se prépare !",
-  "cobblemon.battle.sandstorm_buffeted": "La tempête de sable inflige des dégâts à %1$s !",
-  "cobblemon.battle.sandstorm_upkeep": "La tempête de sable fait rage.",
-  "cobblemon.battle.sunny_day": "Les rayons du soleil brillent !",
-  "cobblemon.battle.sunny_day_upkeep": "Les rayons du soleil continuent de briller.",
-  "cobblemon.battle.hail": "Il commence à grêler !",
-  "cobblemon.battle.hail_upkeep": "La grêle continue.",
-  "cobblemon.battle.hail_buffeted": "La tempête de grêle inflige des dégâts à %1$s !",
-  "cobblemon.battle.no_weather": "Les effets de la météo se dissipent.",
-  "cobblemon.battle.confusion_start": "%1$s est confus !",
-  "cobblemon.battle.confusion_activate": "Il se blesse dans sa confusion !",
-  "cobblemon.battle.confusion_snapped": "%1$s n'est plus confus !",
-  "cobblemon.battle.protect_start": "%1$s est prêt à se protéger !",
-  "cobblemon.battle.protect_activate": "%1$s s'est protégé !",
-  "cobblemon.battle.magnitude_level": "Ampleur %1$s !",
-  "cobblemon.battle.bide_start": "%1$s commence à se concentrer !",
-  "cobblemon.battle.bide_activate": "%1$s se concentre !",
-  "cobblemon.battle.bide_end": "%1$s envoie la sauce !",
-  "cobblemon.battle.field_start.electric_terrain": "De l'électricité parcourt le terrain !",
-  "cobblemon.battle.field_start.grassy_terrain": "Un beau gazon pousse sur le terrain !",
-  "cobblemon.battle.field_start.gravity": "La gravité est intensifiée !",
-  "cobblemon.battle.field_start.magic_room": "L'effet des objets tenus est neutralisé !",
-  "cobblemon.battle.field_start.misty_terrain": "La brume recouvre le terrain !",
-  "cobblemon.battle.field_start.mud_sport": "La puissance des capacités de type Électrik est diminuée !",
-  "cobblemon.battle.field_start.psychic_terrain": "Le sol se met à réagir de façon bizarre !",
-  "cobblemon.battle.field_start.trick_room": "%1$s fausse les dimensions !",
-  "cobblemon.battle.field_start.water_sport": "La puissance des capacités de type Feu est diminuée !",
-  "cobblemon.battle.field_start.wonder_room": "La Défense et la Défense Spéciale sont interverties !",
-  "cobblemon.battle.field_end.electric_terrain": "L'électricité se dissipe du terrain.",
-  "cobblemon.battle.field_end.grassy_terrain": "Le beau gazon se dissipe du terrain.",
-  "cobblemon.battle.field_end.gravity": "La gravité est revenue à la normale !",
-  "cobblemon.battle.field_end.magic_room": "L'effet des objets tenus est revenu !",
-  "cobblemon.battle.field_end.misty_terrain": "La brume qui recouvrait le terrain se dissipe.",
-  "cobblemon.battle.field_end.mud_sport": "Les effets de Lance-Boue se sont dissipés.",
-  "cobblemon.battle.field_end.psychic_terrain": "Le sol redevient normal !",
-  "cobblemon.battle.field_end.trick_room": "Les dimensions sont revenues à la normale !",
-  "cobblemon.battle.field_end.water_sport": "Les effets de Tourniquet se sont dissipés.",
-  "cobblemon.battle.field_end.wonder_room": "La Défense et la Défense Spéciale sont revenues à la normale !",
-  "cobblemon.battle.cant.generic_block": "%1$s ne peut pas utiliser %2$s !",
+  "cobblemon.battle.side_subject.ally": "votre",
+  "cobblemon.battle.side_subject.opponent": "l'adversaire",
+  "cobblemon.battle.weather.raindance.start": "Il commence à pleuvoir !",
+  "cobblemon.battle.weather.raindance.upkeep": "La pluie continue de tomber.",
+  "cobblemon.battle.weather.raindance.end": "La pluie s'est arrêtée !",
+  "cobblemon.battle.weather.sandstorm.start": "Une tempête de sable se prépare !",
+  "cobblemon.battle.weather.sandstorm.upkeep": "La tempête de sable fait rage.",
+  "cobblemon.battle.weather.sandstorm.end": "La tempête de sable se calme !",
+  "cobblemon.battle.weather.sunnyday.start": "Les rayons du soleil brillent !",
+  "cobblemon.battle.weather.sunnyday.upkeep": "Les rayons du soleil s’intensifient !",
+  "cobblemon.battle.weather.sunnyday.end": "Les rayons du soleil s’affaiblissent !",
+  "cobblemon.battle.weather.hail.start": "Il commence à grêler !",
+  "cobblemon.battle.weather.hail.upkeep": "Il y a un déluge de grêle.",
+  "cobblemon.battle.weather.hail.end": "La grêle s’est arrêtée !",
+  "cobblemon.battle.start.bide": "%1$s commence à se concentrer !",
+  "cobblemon.battle.start.yawn": "Ça rend %1$s somnolent !",
+  "cobblemon.battle.start.perish": "Le compte à rebours de Requiem de %1$s descend à %2$s !",
+  "cobblemon.battle.start.leechseed": "%1$s est infecté !",
+  "cobblemon.battle.start.aquaring": "%1$s s'entoure d'un voile d'eau !",
+  "cobblemon.battle.start.charge": "%1$s se met à charger son énergie !",
+  "cobblemon.battle.start.taunt": "%1$s répond à la Provoc !",
+  "cobblemon.battle.start.autotomize": "%1$s est devenu très vif !",
+  "cobblemon.battle.start.attract": "%1$s est amoureux !",
+  "cobblemon.battle.start.focusenergy": "%1$s est prêt à tout donner !",
+  "cobblemon.battle.start.uproar": "%1$s provoque du brouhaha !",
+  "cobblemon.battle.start.curse": "%1$s sacrifie des PV et lance une malédiction à %2$s !",
+  "cobblemon.battle.start.miracleeye": "%1$s est identifié !",
+  "cobblemon.battle.start.dynamax": "%1$s a Dynamax !",
+  "cobblemon.battle.start.gmax": "%1$s a Gigamax !",
+  "cobblemon.battle.fieldstart.electricterrain": "De l’électricité parcourt le terrain !",
+  "cobblemon.battle.fieldstart.grassyterrain": "Un beau gazon pousse sur le terrain !",
+  "cobblemon.battle.fieldstart.gravity": "La gravité est intensifiée !",
+  "cobblemon.battle.fieldstart.magicroom": "L’effet des objets tenus est neutralisé !",
+  "cobblemon.battle.fieldstart.mistyterrain": "La brume recouvre le terrain !",
+  "cobblemon.battle.fieldstart.mudsport": "La puissance des capacités de type Électrik est diminuée !",
+  "cobblemon.battle.fieldstart.psychicterrain": "Le sol se met à réagir de façon bizarre...",
+  "cobblemon.battle.fieldstart.trickroom": "%1$s fausse les dimensions !",
+  "cobblemon.battle.fieldstart.watersport": "La puissance des capacités de type Feu est diminuée !",
+  "cobblemon.battle.fieldstart.wonderroom": "La Défense et la Défense Spéciale sont interverties !",
+  "cobblemon.battle.fieldend.electricterrain": "L’électricité parcourant le terrain s’est dissipée...",
+  "cobblemon.battle.fieldend.grassyterrain": "Le gazon disparaît...",
+  "cobblemon.battle.fieldend.gravity": "La gravité est revenue à la normale !",
+  "cobblemon.battle.fieldend.magicroom": "L’effet des objets tenus est rétabli !",
+  "cobblemon.battle.fieldend.mistyterrain": "La brume qui recouvrait le terrain se dissipe.",
+  "cobblemon.battle.fieldend.mudsport": "L’effet de Lance-Boue se dissipe !",
+  "cobblemon.battle.fieldend.psychicterrain": "Le sol redevient normal !",
+  "cobblemon.battle.fieldend.trickroom": "Les dimensions faussées reviennent à la normale !",
+  "cobblemon.battle.fieldend.watersport": "L’effet de Tourniquet se dissipe !",
+  "cobblemon.battle.fieldend.wonderroom": "La Défense et la Défense Spéciale sont revenues à la normale !",
+  "cobblemon.battle.fieldactivate.perishsong": "Les Pokémon au combat seront K.O. dans trois tours !",
+  "cobblemon.battle.sidestart.stealthrock": "Des pierres pointues lévitent autour de l'équipe de %1$s !",
+  "cobblemon.battle.sidestart.spikes": "Des picots s'éparpillent autour de l'équipe de %1$s !",
+  "cobblemon.battle.sidestart.toxicspikes": "Des pics toxiques se répandent autour de l'équipe de %1$s !",
+  "cobblemon.battle.sidestart.stickyweb": "Le terrain est couvert d'une toile gluante du côté de l'équipe de %1$s !",
+  "cobblemon.battle.sidestart.reflect": "Protection augmente la résistance de l'équipe de %1$s aux capacités physiques !",
+  "cobblemon.battle.sidestart.lightscreen": "Mur Lumière augmente la résistance de l'équipe de %1$s aux capacités spéciales !",
+  "cobblemon.battle.sidestart.auroraveil": "Voile Aurore augmente la résistance de l'équipe de %1$s aux capacités physiques et spéciales !",
+  "cobblemon.battle.sidestart.tailwind": "Un vent arrière souffle sur l'équipe de %1$s !",
+  "cobblemon.battle.sidestart.safeguard": "Un voile mystérieux recouvre l'équipe de %1$s !",
+  "cobblemon.battle.sideend.stealthrock": "Les pierres pointues autour de l'équipe de %1$s ont disparu !",
+  "cobblemon.battle.sideend.spikes": "Il n'y a plus de picots autour de l'équipe de %1$s !",
+  "cobblemon.battle.sideend.toxicspikes": "Il n'y a plus de pics toxiques autour de l'équipe de %1$s !",
+  "cobblemon.battle.sideend.stickyweb": "La toile gluante du côté de l'équipe de %1$s a disparu !",
+  "cobblemon.battle.sideend.reflect": "Protection n'a plus d'effet sur l'équipe de %1$s !",
+  "cobblemon.battle.sideend.lightscreen": "Mur Lumière n'a plus d'effet sur l'équipe de %1$s !",
+  "cobblemon.battle.sideend.auroraveil": "Voile Aurore n'a plus d'effet sur l'équipe de %1$s !",
+  "cobblemon.battle.sideend.tailwind": "Le vent arrière soufflant sur l'équipe de %1$s s'arrête !",
+  "cobblemon.battle.sideend.safeguard": "L'équipe de %1$s n’est plus protégée par le voile mystérieux !",
+  "cobblemon.battle.cant.generic": "%1$s ne peut pas utiliser %2$s !",
  "cobblemon.battle.cant.truant": "%1$s n'obéit pas !",
-  "cobblemon.battle.cant.flinched": "%1$s a la trouille ! Il ne peut plus attaquer !",
+  "cobblemon.battle.cant.flinch": "%1$s a la trouille ! Il ne peut plus attaquer !",
  "cobblemon.battle.cant.recharge": "%1$s doit se reposer !",
  "cobblemon.battle.cant.attract": "L'amour empêche %1$s d'agir !",
  "cobblemon.battle.cant.disable": "%2$s de %1$s est mis sous entrave !",
-  "cobblemon.battle.cant.focus_punch": "%1$s a perdu sa concentration et ne peux pas attaquer !",
-  "cobblemon.battle.cant.heal_block": "%1$s ne peut pas utiliser %2$s à cause de la capacité Anti-Soin !",
+  "cobblemon.battle.cant.focuspunch": "%1$s n’est plus concentré. Il ne peut plus attaquer !",
+  "cobblemon.battle.cant.healblock": "%1$s ne peut pas utiliser la capacité %2$s à cause d’Anti-Soin !",
  "cobblemon.battle.cant.imprison": "%1$s ne peut pas utiliser la capacité %2$s, car elle est bloquée !",
  "cobblemon.battle.cant.gravity": "%1$s ne peut pas utiliser la capacité %2$s à cause de la gravité !",
-  "cobblemon.battle.cant.shell_trap": "La capacité Carapiège de %1$s n'a pas fonctionné !",
+  "cobblemon.battle.cant.shelltrap": "Le Carapiège de %1$s n'a pas explosé...",
  "cobblemon.battle.cant.taunt": "%1$s ne peut pas utiliser %2$s après la provocation !",
-  "cobblemon.battle.cant.throat_chop": "Les effets de Exécu-Son empêchent %1$s d'utiliser des capacités sonores !",
-  "cobblemon.battle.cant.no_pp": "%1$s a essayé d'utiliser %2$s, mais il ne reste plus de PP !",
+  "cobblemon.battle.cant.throatchop": "Exécu-Son empêche %1$s d'utiliser la capacité !",
+  "cobblemon.battle.activate.confusion": "%1$s est confus !",
  "cobblemon.battle.activate.gravity": "%1$s ne peut pas rester en l'air à cause de la gravité !",
-  "cobblemon.battle.activate.misty_terrain": "%1$s se couvre d'une brume protectrice !",
-  "cobblemon.battle.activate.psychic_terrain": "%1$s s'entoure d'un champ psychique !",
-  "cobblemon.battle.activate.heal_bell": "Un grelot sonne !",
+  "cobblemon.battle.activate.mistyterrain": "%1$s est protégé par un champ brumeux !",
+  "cobblemon.battle.activate.psychicterrain": "%1$s est protégé par un champ psychique !",
+  "cobblemon.battle.activate.healbell": "Un grelot sonne !",
  "cobblemon.battle.activate.aromatherapy": "Une odeur apaisante flotte dans l'air !",
  "cobblemon.battle.activate.trapped": "%1$s ne peut plus s'échapper !",
  "cobblemon.battle.activate.bind": "%1$s est pris dans l'étreinte de %2$s !",
-  "cobblemon.battle.activate.court_change": "Les effets affectant chaque côté du terrain ont été changés par %1$s !",
-  "cobblemon.battle.activate.guard_split": "%1$s partage sa garde avec sa cible !",
+  "cobblemon.battle.activate.wrap": "%1$s est ligoté par %2$s !",
+  "cobblemon.battle.activate.struggle": "%1$s n'a plus de capacités utilisables !",
+  "cobblemon.battle.activate.courtchange": "Les effets affectant chaque côté du terrain ont été changés par %1$s !",
+  "cobblemon.battle.activate.guardsplit": "%1$s partage sa garde avec sa cible !",
  "cobblemon.battle.activate.spite": "Les PP de la capacité %2$s de %1$s baissent de %3$s !",
+  "cobblemon.battle.activate.lockon": "%1$s vise %2$s !",
+  "cobblemon.battle.activate.protosynthesis": "Le soleil brille, ce qui a permis à %1$s d'activer Paléosynthèse !",
+  "cobblemon.battle.activate.bide": "%1$s se concentre !",
+  "cobblemon.battle.activate.protect": "%1$s s'est protégé !",
+  "cobblemon.battle.activate.magnitude": "Ampleur %1$s !",
+  "cobblemon.battle.activate.destinybond": "%1$s emmène son adversaire au tapis !",
+  "cobblemon.battle.activate.synchronize": "[Synchro de %1$s]",
+  "cobblemon.battle.activate.endure": "%1$s encaisse les coups !",
+  "cobblemon.battle.activate.attract": "%1$s est amoureux de %2$s !",
+  "cobblemon.battle.activate.firespin": "%1$s est piégé dans un tourbillon de feu !",
+  "cobblemon.battle.activate.trick": "%1$s échange son objet avec celui de sa cible !",
+  "cobblemon.battle.activate.quickclaw": "La Vive Griffe permet à %1$s d'agir en priorité !",
+  "cobblemon.battle.activate.focusband": "%1$s tient bon grâce à la %2$s !",
+  "cobblemon.battle.activate.forewarn": "La capacité %2$s de %1$s a été détectée !",
+  "cobblemon.battle.activate.disguise": "Le déguisement absorbe l’attaque !",
+  "cobblemon.battle.activate.liquidooze": "%1$s aspire le suintement !",
+  "cobblemon.battle.activate.whirlpool": "%1$s est piégé dans le tourbillon !",
+  "cobblemon.battle.activate.clamp": "%1$s est pris dans le Claquoir de %2$s !",
  "cobblemon.battle.prepare.bounce": "%1$s se propulse dans les airs !",
  "cobblemon.battle.prepare.dig": "%1$s se cache dans le sol !",
  "cobblemon.battle.prepare.dive": "%1$s se cache sous l'eau !",
  "cobblemon.battle.prepare.fly": "%1$s s'envole !",
-  "cobblemon.battle.prepare.freeze_shock": "%1$s est baigné d'une lumière blafarde !",
+  "cobblemon.battle.prepare.freezeshock": "%1$s est baigné d'une lumière blafarde !",
  "cobblemon.battle.prepare.geomancy": "%1$s concentre son énergie !",
-  "cobblemon.battle.prepare.ice_burn": "%1$s est entouré d'un air glacial !",
-  "cobblemon.battle.prepare.meteor_beam": "La puissance du cosmos afflue dans le corps de %1$s !",
-  "cobblemon.battle.prepare.phantom_force": "%1$s disparaît instantanément !",
-  "cobblemon.battle.prepare.razor_wind": "%1$s se prépare à lancer une bourrasque !",
-  "cobblemon.battle.prepare.skull_bash": "%1$s baisse la tête !",
-  "cobblemon.battle.prepare.sky_attack": "%1$s est entouré d'une lumière intense !",
-  "cobblemon.battle.prepare.sky_drop": "%1$s emporte sa cible haut dans le ciel !",
-  "cobblemon.battle.prepare.solar_beam": "%1$s absorbe la lumière !",
+  "cobblemon.battle.prepare.iceburn": "%1$s est entouré d'un air glacial !",
+  "cobblemon.battle.prepare.meteorbeam": "La puissance du cosmos afflue dans le corps de %1$s !",
+  "cobblemon.battle.prepare.phantomforce": "%1$s disparaît instantanément !",
+  "cobblemon.battle.prepare.razorwind": "%1$s se prépare à lancer une bourrasque !",
+  "cobblemon.battle.prepare.skullbash": "%1$s baisse la tête !",
+  "cobblemon.battle.prepare.skyattack": "%1$s est entouré d'une lumière intense !",
+  "cobblemon.battle.prepare.skydrop": "%1$s emporte sa cible haut dans le ciel !",
+  "cobblemon.battle.prepare.solarbeam": "%1$s absorbe la lumière !",
  "cobblemon.battle.swapboost.generic": "%1$s a changé les bonus de stats avec %2$s !",
  "cobblemon.battle.singleturn.protect": "%1$s s'est protégé !",
  "cobblemon.battle.singleturn.endure": "%1$s encaisse les coups !",
-  "cobblemon.battle.singleturn.crafty_shield": "L'équipe de %1$s est protégée par la capacité Vigilance !",
+  "cobblemon.battle.singleturn.craftyshield": "L'équipe de %1$s est protégée par la capacité Vigilance !",
  "cobblemon.battle.singleturn.powder": "%1$s est couvert de poudre !",
-  "cobblemon.battle.singleturn.follow_me": "%1$s devient le centre d'attention !",
+  "cobblemon.battle.singleturn.followme": "%1$s devient le centre d'attention !",
  "cobblemon.battle.singleturn.snatch": "%1$s attend qu'une cible agisse !",
-  "cobblemon.battle.singleturn.quick_guard": "Vigilance a protégé l'équipe de %1$s !",
-  "cobblemon.battle.singleturn.wide_guard": "Garde Large a protégé l'équipe de %1$s !",
+  "cobblemon.battle.singleturn.quickguard": "L'équipe de %1$s est protégée par la capacité Prévention !",
+  "cobblemon.battle.singleturn.wideguard": "L'équipe de %1$s est protégée par la capacité Garde Large !",
  "cobblemon.battle.singleturn.roost": "(%1$s perd son type Vol ce tour-ci.)",
-  "cobblemon.battle.singleturn.mat_block": "%1$s se prépare à utilliser un tatami pour bloquer les attaques !",
-  "cobblemon.battle.singleturn.max_guard": "%1$s s'est protégé !",
+  "cobblemon.battle.singleturn.matblock": "%1$s se prépare à utiliser un tatami pour bloquer les attaques !",
+  "cobblemon.battle.singleturn.maxguard": "%1$s se protège !",
  "cobblemon.battle.singleturn.instruct": "%1$s obéit à la Sommation de %2$s !",
-  "cobblemon.battle.singleturn.focus_punch": "%1$s se concentre au maximum !",
+  "cobblemon.battle.singleturn.focuspunch": "%1$s se concentre au maximum !",
  "cobblemon.battle.singleturn.electrify": "L'Électrisation donne le type Électrik à la prochaine capacité de %1$s !",
-  "cobblemon.battle.singleturn.beak_blast": "%1$s fait chauffer son bec !",
-  "cobblemon.battle.singleturn.helping_hand": "%2$s est prêt à aider %1$s !",
-  "cobblemon.battle.singleturn.magic_coat": "%1$s s'entoure du Reflet Magik !",
-  "cobblemon.battle.singleturn.rage_powder": "%1$s devient le centre d'attention !",
-  "cobblemon.battle.singleturn.shell_trap": "%1$s déclenche le Carapiège !",
+  "cobblemon.battle.singleturn.beakblast": "%1$s fait chauffer son bec !",
+  "cobblemon.battle.singleturn.helpinghand": "%2$s est prêt à aider %1$s !",
+  "cobblemon.battle.singleturn.magiccoat": "%1$s s'entoure du Reflet Magik !",
+  "cobblemon.battle.singleturn.ragepowder": "%1$s devient le centre d'attention !",
+  "cobblemon.battle.singleturn.shelltrap": "%1$s déclenche le Carapiège !",
  "cobblemon.battle.singleturn.spotlight": "%1$s devient le centre d'attention !",
-  "cobblemon.battle.singlemove.destiny_bond": "%1$s veut emmener son ennemi au tapis !",
-  "cobblemon.battle.singlemove.glaive_rush": "%1$s se lance dans une charge imprudente !",
+  "cobblemon.battle.singlemove.destinybond": "%1$s veut emmener son ennemi au tapis !",
+  "cobblemon.battle.singlemove.glaiverush": "%1$s se lance dans une charge imprudente !",
  "cobblemon.battle.singlemove.grudge": "%1$s veut que son adversaire subisse sa Rancune !",
  "cobblemon.battle.singlemove.rage": "La Frénésie de %1$s s'intensifie !",
+  "cobblemon.battle.damage.wrap": "%1$s est blessé par la capacité Ligotage !",
+  "cobblemon.battle.damage.confusion": "%1$s se blesse dans sa confusion !",
+  "cobblemon.battle.damage.leechseed": "Vampigraine draine l'énergie de %1$s !",
+  "cobblemon.battle.damage.sandstorm": "La tempête de sable inflige des dégâts à %1$s !",
+  "cobblemon.battle.damage.hail": "La tempête de grêle inflige des dégâts à %1$s !",
+  "cobblemon.battle.damage.stealthrock": "Des pierres pointues transpercent %1$s !",
+  "cobblemon.battle.damage.spikes": "%1$s est blessé par les picots !",
+  "cobblemon.battle.damage.recoil": "%1$s est blessé par le contrecoup !",
+  "cobblemon.battle.damage.item": "%1$s est blessé par le %2$s !",
+  "cobblemon.battle.damage.lifeorb": "%1$s perd quelques PV !",
+  "cobblemon.battle.damage.rockyhelmet": "%1$s est blessé par le Casque Brut de %2$s !",
+  "cobblemon.battle.damage.generic": "%1$s s’est blessé en attaquant !",
+  "cobblemon.battle.damage.pokemonmimikyubusted": "Le déguisement de %1$s tombe !",
+  "cobblemon.battle.damage.whirlpool": "%1$s est blessé par la capacité Siphon !",
+  "cobblemon.battle.damage.clamp": "%1$s est blessé par la capacité Claquoir !",
+  "cobblemon.battle.damage.curse": "%1$s est touché par la malédiction !",
  "cobblemon.battle.end.bind": "%1$s est libéré de la capacité Étreinte !",
-  "cobblemon.battle.set_hp.pain_split": "Les adversaires partagent leur PV !",
+  "cobblemon.battle.end.wrap": "%1$s est libéré de la capacité Ligotage !",
+  "cobblemon.battle.end.disable": "La capacité de %1$s n'est plus sous entrave !",
+  "cobblemon.battle.end.protosynthesis": "L'effet du talent Paléosynthèse de %1$s s'est dissipé !",
+  "cobblemon.battle.end.taunt": "%1$s s'est remis de la Provoc !",
+  "cobblemon.battle.end.firespin": "%1$s est libéré de la capacité Danse Flammes !",
+  "cobblemon.battle.end.bide": "%1$s envoie la sauce !",
+  "cobblemon.battle.end.confusion": "%1$s n'est plus confus !",
+  "cobblemon.battle.end.whirlpool": "%1$s est libéré de la capacité Siphon !",
+  "cobblemon.battle.end.clamp": "%1$s est libéré de la capacité Claquoir !",
+  "cobblemon.battle.end.dynamax": "%1$s revient à la normale !",
+  "cobblemon.battle.sethp.painsplit": "Les adversaires partagent leurs PV !",
  "cobblemon.battle.ability.sturdy": "%1$s encaisse les coups !",
-  "cobblemon.battle.ability.speed_boost": "Turbo de %1$s activé !",
-  "cobblemon.battle.ability.intimidate": "Intimidation de %1$s activé !",
  "cobblemon.battle.ability.unnerve": "%1$s rend l'adversaire tendu et ne peut plus manger de Baies !",
  "cobblemon.battle.ability.anticipation": "%1$s est tout tremblant !",
-  "cobblemon.battle.ability.air_lock": "Les effets de la météo ont disparu.",
+  "cobblemon.battle.ability.airlock": "Les effets de la météo se dissipent !",
  "cobblemon.battle.ability.generic": "%2$s de %1$s activé !",
+  "cobblemon.battle.ability.magicbounce": "%1$s repousse la capacité %2$s ! Retour à l'envoyeur !",
  "cobblemon.battle.errors.busy": "%1$s est occupé !",
  "cobblemon.battle.error.in_battle": "%1$s est déjà au combat.",
  "cobblemon.battle.error.in_battle.personal": "Vous êtes déjà dans un combat !",
  "cobblemon.battle.error.no_pokemon": "Vous n'avez plus de Pokémon en forme !",
+  "cobblemon.battle.error.no_pokemon_opponent": "Votre adversaire n'a plus de Pokémon utilisable !",
  "cobblemon.battle.error.insufficient_pokemon": "%1$s a %2 Pokémon alors que %3 sont nécessaires pour le combat.",
  "cobblemon.battle.error.insufficient_pokemon.personal": "Vous avez %1 Pokémon utilisable, mais vous avez besoin de %2 minimum.",
+  "cobblemon.battle.error.pokemon_is_trapped": "[Choix indisponible] Impossible de changer : Le Pokémon actif est piégé",
  "cobblemon.battle.immune": "Mais %1$s est immunisé !",
  "cobblemon.battle.missed": "Mais cela échoue !",
  "cobblemon.battle.hit_count": "Touché %1$s fois !",
  "cobblemon.battle.hit_count_singular": "Touché une fois !",
-  "cobblemon.battle.item.air_balloon.start": "%1$s flotte dans l'air grâce à son ballon !",
-  "cobblemon.battle.item.recycle_or_pickup.start": "%1$s trouve l'objet %2$s !",
-  "cobblemon.battle.item.frisk.start": "%1$s fouille %2$s et trouve l'objet %3$s !",
-  "cobblemon.battle.item.take_item.start": "%1$s a volé l'objet %3$s de %2$s !",
-  "cobblemon.battle.item.harvest.start": "%1$s a récolté l'objet %2$s !",
-  "cobblemon.battle.item.bestow.start": "%1$s obtient l'objet %2$s de %3$s !",
-  "cobblemon.battle.item.tricked.start": "%1$s échange son objet avec celui de sa cible !",
-  "cobblemon.battle.item.eat.end": "%1$s a mangé sa %2$s !",
-  "cobblemon.battle.item.fling.end": "%1$s lance l'objet %2$s !",
-  "cobblemon.battle.item.knock_off.end": "%1$s sabote l'objet %3$s de %2$s !",
-  "cobblemon.battle.item.gem.end": "L'objet %1$s a renforcé la puissance de %2$s !",
-  "cobblemon.battle.item.incinerate.end": "L'objet %2$s de %1$s a été brûlé !",
-  "cobblemon.battle.item.air_balloon.end": "Le ballon de %1$s a éclaté !",
-  "cobblemon.battle.item.hung_on.end": "%1$s tient bon grâce à l'objet %2$s !",
-  "cobblemon.battle.item.red_card.end": "%1$s tient un carton rouge contre %2$s !",
-  "cobblemon.battle.item.steal_eat.end": "%1$s vole et mange la %3$s de %2$s !",
-  "cobblemon.battle.item.berry_juice.end": "%1$s boit son jus de baie !",
-  "cobblemon.battle.item.used_its.end": "%1$s utilise l'objet %2$s !",
-  "cobblemon.battle.item.mental_herb.end": "%1$s annule les effets mentaux grâce à l'Herbe Mental !",
-  "cobblemon.battle.item.power_herb.end": "%1$s est complètement chargé grâce à l'Herbe Pouvoir !",
-  "cobblemon.battle.item.mirror_herb.end": "%1$s a copié les changements de statistiques grâce à sa Feuille Copieuse !",
-  "cobblemon.battle.item.white_herb.end": "%1$s annule les changements négatifs grâce à l'Herbe Blanche !",
-  "cobblemon.battle.item.quick_claw.end": "La Vive Griffe de %1$s lui permet d'agir plus vite que d'habitude !",
-  "cobblemon.battle.heal.z_effect": "Les PV de %1$s ont été restaurés grâce la capacité Z !",
+  "cobblemon.battle.item.airballoon": "%1$s flotte grâce à son %2$s !",
+  "cobblemon.battle.item.recycle": "%1$s trouve l'objet %2$s !",
+  "cobblemon.battle.item.frisk": "%3$s fouille %1$s et trouve l'objet %2$s !",
+  "cobblemon.battle.item.thief": "%1$s vole l'objet %2$s de %3$s !",
+  "cobblemon.battle.item.harvest": "%1$s a récolté une %2$s !",
+  "cobblemon.battle.item.bestow": "%1$s obtient l'objet %2$s de %3$s !",
+  "cobblemon.battle.item.trick": "%1$s obtient l'objet %2$s !",
+  "cobblemon.battle.item.eat": "%1$s mange une %2$s !",
+  "cobblemon.battle.enditem.eat": "%1$s mange une %2$s !",
+  "cobblemon.battle.enditem.fling": "%1$s lance l'objet %2$s !",
+  "cobblemon.battle.enditem.knockoff": "%3$s fait tomber l'objet %2$s de %1$s !",
+  "cobblemon.battle.enditem.gem": "Le %2$s renforce la capacité %1$s !",
+  "cobblemon.battle.enditem.incinerate": "L'objet %2$s de %1$s est détruit par le feu !",
+  "cobblemon.battle.enditem.airballoon": "Le Ballon de %1$s a éclaté !",
+  "cobblemon.battle.enditem.redcard": "%1$s a mis un Carton Rouge à %3$s !",
+  "cobblemon.battle.enditem.pluck": "%3$s vole et mange la %2$s de %1$s !",
+  "cobblemon.battle.enditem.berryjuice": "Le Jus de Baie de %1$s est activé !",
+  "cobblemon.battle.enditem.generic": "%1$s utilise l'objet %2$s !",
+  "cobblemon.battle.enditem.mentalherb": "%1$s annule les effets mentaux grâce à l'Herbe Mental !",
+  "cobblemon.battle.enditem.powerherb": "%1$s est déjà reposé grâce à l'Herbe Pouvoir !",
+  "cobblemon.battle.enditem.mirrorherb": "%1$s a copié les changements de stats grâce à sa Feuille Copieuse !",
+  "cobblemon.battle.enditem.whiteherb": "%1$s annule les changements négatifs grâce à l'Herbe Blanche !",
+  "cobblemon.battle.heal.zeffect": "%1$s utilise la Force Z pour se soigner !",
  "cobblemon.battle.heal.wish": "Le Vœu de %1$s se réalise !",
  "cobblemon.battle.heal.drain": "L'énergie de %1$s est drainée !",
-  "cobblemon.battle.heal.healing_wish": "Le vœu soin est devenu réalité pour %1$s !",
-  "cobblemon.battle.heal.revival_blessing": "%1$s a été réanimé et est prêt à se battre à nouveau !",
-  "cobblemon.battle.heal.aqua_ring": "Le voile d'eau restaure les PV de %1$s !",
+  "cobblemon.battle.heal.healingwish": "Le Vœu Soin est exaucé et profite à %1$s !",
+  "cobblemon.battle.heal.revivalblessing": "%1$s a repris connaissance et est prêt à se battre de nouveau !",
+  "cobblemon.battle.heal.aquaring": "Le voile d'eau restaure les PV de %1$s !",
  "cobblemon.battle.heal.ingrain": "%1$s absorbe des nutriments avec ses racines !",
-  "cobblemon.battle.heal.grassy_terrain": "%1$s récupère des PV !",
-  "cobblemon.battle.heal.leftovers": "Les Restes de %1$s restaurent un peu ses PV !",
-  "cobblemon.battle.heal.rain_dish": "Cuvette de %1$s restaure un peu ses PV !",
+  "cobblemon.battle.heal.grassyterrain": "%1$s récupère des PV !",
+  "cobblemon.battle.heal.leftovers": "Les %2$s de %1$s restaurent un peu ses PV !",
+  "cobblemon.battle.heal.item": "%1$s récupère des PV avec l'objet %2$s !",
+  "cobblemon.battle.heal.raindish": "%1$s récupère des PV grâce à Cuvette !",
  "cobblemon.battle.heal.generic": "%1$s a restauré ses PV.",
+  "cobblemon.battle.heal.bagitempotion": "%1$s récupère des PV !",
+  "cobblemon.battle.curestatus.naturalcure": "%1$s est guéri grâce à Médic Nature !",
+  "cobblemon.battle.bagitem.use": "%1$s utilise l'objet %2$s sur %3$s !",
+  "cobblemon.battle.bagitem.cannot": "Vous ne pouvez pas utiliser d'objets pour le moment.",
+  "cobblemon.battle.bagitem.invalid": "Cet objet ne fonctionnera pas.",
+  "cobblemon.battle.zpower": "%1$s déploie sa Force Z comme une aura !",
+  "cobblemon.battle.zbroken": "%1$s n’arrive pas à parer toute l’attaque et subit des dégâts !",
+  "cobblemon.battle.terastallize": "%1$s se téracristallise en type %2$s !",
+  "cobblemon.battle.detailschange.mega": "%1$s réagit à la Gemme Sésame !",
+  "cobblemon.battle.mega": "%1$s a méga-évolué !",
  "cobblemon.experience.gained": "%1$s a gagné %2$s points d'expérience !",
  "cobblemon.experience.level_up": "%1$s monte au niveau %2$s !",
  "cobblemon.experience.learned_move": "%1$s a appris %2$s !",
@@ -609,16 +1024,19 @@
  "cobblemon.move.category.status": "Statut",
  "cobblemon.status.sleep.apply": "%1$s s'est endormi !",
  "cobblemon.status.sleep.is": "%1$s est endormi.",
-  "cobblemon.status.sleep.woke": "%1$s s'est réveillé !",
+  "cobblemon.status.sleep.cure": "%1$s se réveille !",
  "cobblemon.status.paralysis.apply": "%1$s est paralysé !",
  "cobblemon.status.paralysis.is": "%1$s est paralysé ! Il aura du mal à attaquer !",
+  "cobblemon.status.paralysis.cure": "%1$s n'est plus paralysé !",
  "cobblemon.status.poison.apply": "%1$s est empoisonné !",
+  "cobblemon.status.poison.cure": "%1$s n'est plus empoisonné !",
  "cobblemon.status.poisonbadly.apply": "%1$s est gravement empoisonné !",
  "cobblemon.status.poison.hurt": "%1$s souffre du poison !",
  "cobblemon.status.burn.apply": "%1$s est brûlé !",
  "cobblemon.status.burn.hurt": "%1$s souffre de brûlure !",
+  "cobblemon.status.burn.cure": "%1$s n'est plus brûlé !",
  "cobblemon.status.frozen.apply": "%1$s est gelé !",
-  "cobblemon.status.frozen.thawed": "%1$s n'est plus gelé !",
+  "cobblemon.status.frozen.cure": "%1$s n’est plus gelé !",
  "cobblemon.status.frozen.is": "%1$s est toujours gelé !",
  "block.cobblemon.dawn_stone_ore": "Minerai de Pierre Aube",
  "block.cobblemon.dusk_stone_ore": "Minerai de Pierre Nuit",
@@ -641,10 +1059,47 @@
  "block.cobblemon.deepslate_thunder_stone_ore": "Minerai de Pierre Foudre de profondoise",
  "block.cobblemon.deepslate_water_stone_ore": "Minerai de Pierre Eau de profondoise",
  "block.cobblemon.dripstone_moon_stone_ore": "Minerai de Pierre Lune de spéléothème",
+  "block.cobblemon.pasture": "Bloc de pâturage",
  "gamerule.doPokemonSpawning": "Apparaître des Pokémon",
+  "gamerule.doShinyStarters": "Les Pokémon de départ seront chromatiques",
  "cobblemon.command.checkspawns.invalid-bucket": "Rareté d'apparition invalide",
  "cobblemon.command.checkspawns.spawns": "Spawns",
  "cobblemon.command.checkspawns.nothing": "Rien ne peut apparaître ici pour le moment.",
+  "cobblemon.interaction.ev.add": "Les EV %2$s de %1$s augmentent de %3$s !",
+  "cobblemon.interaction.ev.deduct": "Les EV %2$s de %1$s diminuent de %3$s !",
+  "cobblemon.interaction.pp.restore": "Les PP de %1$s ont été restaurés !",
+  "cobblemon.interaction.friendsip.add": "%1$s est devenu plus amical envers vous !",
+  "cobblemon.interaction.status.cure": "Les altérations de statut de %1$s ont été soignées !",
+  "cobblemon.interaction.hp.heal": "%1$s restaure un peu ses PV !",
+  "tag.item.cobblemon.apricorn_logs": "Bûches de Noigrume",
+  "tag.item.cobblemon.apricorn_sprouts": "Germes de Noigrume",
+  "tag.item.cobblemon.apricorns": "Noigrumes",
+  "tag.item.cobblemon.azalea_tree": "Arbres d'azalée",
+  "tag.item.cobblemon.berries": "Baies",
+  "tag.item.cobblemon.cobblemon_seeds": "Graines",
+  "tag.item.cobblemon.evolution_items": "Objets d'évolution",
+  "tag.item.cobblemon.evolution_stones": "Pierres d'évolution",
+  "tag.item.cobblemon.experience_candies": "Bonbons Exp.",
+  "tag.item.cobblemon.held.destiny_knot": "Nœuds Destin",
+  "tag.item.cobblemon.held.everstone": "Pierres Stase",
+  "tag.item.cobblemon.held.experience_share": "Multi Exp",
+  "tag.item.cobblemon.held.is_held_item": "Objets tenus",
+  "tag.item.cobblemon.held.lucky_egg": "Œufs Chance",
+  "tag.item.cobblemon.held.power_anklet": "Chaînes Pouvoir",
+  "tag.item.cobblemon.held.power_band": "Bandeaux Pouvoir",
+  "tag.item.cobblemon.held.power_belt": "Ceintures Pouvoir",
+  "tag.item.cobblemon.held.power_bracer": "Poignets Pouvoir",
+  "tag.item.cobblemon.held.power_lens": "Lentilles Pouvoir",
+  "tag.item.cobblemon.held.power_weight": "Poids Pouvoir",
+  "tag.item.cobblemon.herbs": "Herbes",
+  "tag.item.cobblemon.mint_leaf": "Feuilles d'Aromate",
+  "tag.item.cobblemon.mints": "Aromates",
+  "tag.item.cobblemon.mutated_berries": "Baies mutées",
+  "tag.item.cobblemon.plants": "Plantes",
+  "tag.item.cobblemon.poke_balls": "Poké Balls",
+  "tag.item.cobblemon.protein_ingredients": "Ingrédients de Protéine",
+  "tag.item.cobblemon.zinc_ingredients": "Ingrédients de Zinc",
+  "tag.item.cobblemon.seeds": "Graines",

  "cobblemon.ability.adaptability": "Adaptabilité",
  "cobblemon.ability.adaptability.desc": "Quand le Pokémon utilise une capacité du même type que lui, le bonus de puissance qu’elle reçoit est encore plus important que normalement.",
@@ -1,10 +1,9 @@
 {
-  "itemGroup.cobblemon.pokeball": "Poké Balls",
  "item.cobblemon.poke_ball": "Poké Ball",
  "item.cobblemon.slate_ball": "Ardoise Ball",
  "item.cobblemon.azure_ball": "Azur Ball",
  "item.cobblemon.verdant_ball": "Verdoyante Ball",
-  "item.cobblemon.roseate_ball": "Roseate Ball",
+  "item.cobblemon.roseate_ball": "Rose Ball",
  "item.cobblemon.citrine_ball": "Citrine Ball",
  "item.cobblemon.great_ball": "Super Ball",
  "item.cobblemon.ultra_ball": "Hyper Ball",
@@ -32,13 +31,13 @@
  "item.cobblemon.park_ball": "Parc Ball",
  "item.cobblemon.dream_ball": "Rêve Ball",
  "item.cobblemon.beast_ball": "Ultra Ball",
-  "item.cobblemon.black_apricorn_seed": "Graines de noigrume noir",
-  "item.cobblemon.blue_apricorn_seed": "Graines de noigrume bleu",
-  "item.cobblemon.green_apricorn_seed": "Graines de noigrume vert",
-  "item.cobblemon.pink_apricorn_seed": "Graines de noigrume rose",
-  "item.cobblemon.red_apricorn_seed": "Graines de noigrume rouge",
-  "item.cobblemon.white_apricorn_seed": "Graines de noigrume blanc",
-  "item.cobblemon.yellow_apricorn_seed": "Graines de noigrume jaune",
+  "item.cobblemon.black_apricorn_seed": "Germe de Noigrume Noir",
+  "item.cobblemon.blue_apricorn_seed": "Germe de Noigrume Bleu",
+  "item.cobblemon.green_apricorn_seed": "Germe de Noigrume Vert",
+  "item.cobblemon.pink_apricorn_seed": "Germe de Noigrume Rose",
+  "item.cobblemon.red_apricorn_seed": "Germe de Noigrume Rouge",
+  "item.cobblemon.white_apricorn_seed": "Germe de Noigrume Blanc",
+  "item.cobblemon.yellow_apricorn_seed": "Germe de Noigrume Jaune",
  "item.cobblemon.black_apricorn": "Noigrume noir",
  "item.cobblemon.blue_apricorn": "Noigrume bleu",
  "item.cobblemon.green_apricorn": "Noigrume vert",
@@ -46,8 +45,8 @@
  "item.cobblemon.red_apricorn": "Noigrume rouge",
  "item.cobblemon.white_apricorn": "Noigrume blanc",
  "item.cobblemon.yellow_apricorn": "Noigrume jaune",
-
-  "itemGroup.cobblemon.evolution_item": "Objets d'évolution",
+  "item.cobblemon.vivichoke_seeds": "Graines de Bourgeon Vivace",
+  "item.cobblemon.vivichoke": "Bourgeon Vivace",
  "item.cobblemon.link_cable": "Fil de Liaison",
  "item.cobblemon.dragon_scale": "Écaille Draco",
  "item.cobblemon.kings_rock": "Roche Royale",
@@ -89,8 +88,6 @@
  "item.cobblemon.sun_stone": "Pierre Soleil",
  "item.cobblemon.thunder_stone": "Pierre Foudre",
  "item.cobblemon.water_stone": "Pierre Eau",
-
-  "itemGroup.cobblemon.medicine": "Médicaments",
  "item.cobblemon.rare_candy": "Super Bonbon",
  "item.cobblemon.exp_candy_xs": "Bonbon Exp. XS",
  "item.cobblemon.exp_candy_s": "Bonbon Exp. S",
@@ -103,11 +100,47 @@
  "item.cobblemon.iron": "Fer",
  "item.cobblemon.protein": "Protéine",
  "item.cobblemon.zinc": "Zinc",
-
-  "itemGroup.cobblemon.held_item": "Objet tenu",
+  "item.cobblemon.potion": "Potion",
+  "item.cobblemon.super_potion": "Super Potion",
+  "item.cobblemon.hyper_potion": "Hyper Potion",
+  "item.cobblemon.max_potion": "Potion Max",
+  "item.cobblemon.full_restore": "Guérison",
+  "item.cobblemon.red_mint_leaf": "Feuille d'Aromate Rouge",
+  "item.cobblemon.red_mint_leaf.tooltip": "Capable d'influencer l'Attaque d'un Pokémon",
+  "item.cobblemon.blue_mint_leaf": "Feuille d'Aromate Bleu",
+  "item.cobblemon.blue_mint_leaf.tooltip": "Capable d'influencer la Défense d'un Pokémon",
+  "item.cobblemon.cyan_mint_leaf": "Feuille d'Aromate Cyan",
+  "item.cobblemon.cyan_mint_leaf.tooltip": "Capable d'influencer l'Attaque Spéciale d'un Pokémon",
+  "item.cobblemon.pink_mint_leaf": "Feuille d'Aromate Rose",
+  "item.cobblemon.pink_mint_leaf.tooltip": "Capable d'influencer la Défense Spéciale d'un Pokémon",
+  "item.cobblemon.green_mint_leaf": "Feuille d'Aromate Vert",
+  "item.cobblemon.green_mint_leaf.tooltip": "Capable d'influencer la Vitesse d'un Pokémon",
+  "item.cobblemon.white_mint_leaf": "Feuille d'Aromate Blanc",
+  "item.cobblemon.white_mint_leaf.tooltip": "Capable de neutraliser la nature d'un Pokémon",
+  "item.cobblemon.lonely_mint": "Aromate Solo",
+  "item.cobblemon.adamant_mint": "Aromate Rigide",
+  "item.cobblemon.naughty_mint": "Aromate Mauvais",
+  "item.cobblemon.brave_mint": "Aromate Brave",
+  "item.cobblemon.bold_mint": "Aromate Assuré",
+  "item.cobblemon.impish_mint": "Aromate Malin",
+  "item.cobblemon.lax_mint": "Aromate Lâche",
+  "item.cobblemon.relaxed_mint": "Aromate Relax",
+  "item.cobblemon.modest_mint": "Aromate Modeste",
+  "item.cobblemon.mild_mint": "Aromate Doux",
+  "item.cobblemon.rash_mint": "Aromate Foufou",
+  "item.cobblemon.quiet_mint": "Aromate Discret",
+  "item.cobblemon.calm_mint": "Aromate Calme",
+  "item.cobblemon.gentle_mint": "Aromate Gentil",
+  "item.cobblemon.careful_mint": "Aromate Prudent",
+  "item.cobblemon.sassy_mint": "Aromate Malpoli",
+  "item.cobblemon.timid_mint": "Aromate Timide",
+  "item.cobblemon.hasty_mint": "Aromate Pressé",
+  "item.cobblemon.jolly_mint": "Aromate Jovial",
+  "item.cobblemon.naive_mint": "Aromate Naïf",
+  "item.cobblemon.serious_mint": "Aromate Sérieux",
  "item.cobblemon.assault_vest": "Veste de Combat",
  "item.cobblemon.auspicious_armor": "Armure de la Fortune",
-  "item.cobblemon.big_root": "Grosse Racine",
+  "item.cobblemon.malicious_armor": "Armure de la Rancune",
  "item.cobblemon.black_belt": "Ceinture Noire",
  "item.cobblemon.black_glasses": "Lunettes Noires",
  "item.cobblemon.black_sludge": "Boue Noire",
@@ -141,7 +174,21 @@
  "item.cobblemon.spell_tag": "Rune Sort",
  "item.cobblemon.twisted_spoon": "Cuillère Tordue",
  "item.cobblemon.wise_glasses": "Lunettes Sages",
-
+  "item.cobblemon.mental_herb": "Herbe Mental",
+  "item.cobblemon.mirror_herb": "Feuille Copieuse",
+  "item.cobblemon.power_herb": "Herbe Pouvoir",
+  "item.cobblemon.white_herb": "Herbe Blanche",
+  "item.cobblemon.bright_powder": "Poudre Claire",
+  "item.cobblemon.metal_powder": "Poudre Métal",
+  "item.cobblemon.quick_powder": "Poudre Vite",
+  "item.cobblemon.destiny_knot": "Nœud Destin",
+  "item.cobblemon.everstone": "Pierre Stase",
+  "item.cobblemon.power_anklet": "Chaîne Pouvoir",
+  "item.cobblemon.power_band": "Bandeau Pouvoir",
+  "item.cobblemon.power_belt": "Ceinture Pouvoir",
+  "item.cobblemon.power_bracer": "Poignet Pouvoir",
+  "item.cobblemon.power_lens": "Lentille Pouvoir",
+  "item.cobblemon.power_weight": "Poids Pouvoir",
  "item.cobblemon.poke_ball.tooltip": "Taux de capture ×1",
  "item.cobblemon.slate_ball.tooltip": "Taux de capture ×1",
  "item.cobblemon.azure_ball.tooltip": "Taux de capture ×1",
@@ -174,7 +221,56 @@
  "item.cobblemon.park_ball.tooltip": "Taux de capture ×2,5 dans tous les biomes Forêt et Plaines",
  "item.cobblemon.dream_ball.tooltip": "Taux de capture ×4 sur un Pokémon endormi",
  "item.cobblemon.beast_ball.tooltip": "Taux de capture ×5 sur les Ultra-Chimères, sinon ×0,1",
-
+  "item.cobblemon.mulch_base": "Engrais",
+  "item.cobblemon.coarse_mulch": "Ferticanaille",
+  "item.cobblemon.growth_mulch": "Fertipousse",
+  "item.cobblemon.humid_mulch": "Fertihumide",
+  "item.cobblemon.loamy_mulch": "Fertiargile",
+  "item.cobblemon.peat_mulch": "Fertitourbe",
+  "item.cobblemon.rich_mulch": "Fertibondance",
+  "item.cobblemon.sandy_mulch": "Fertisablé",
+  "item.cobblemon.surprise_mulch": "Fertistantané",
+  "item.cobblemon.medicinal_leek": "Soignon",
+  "item.cobblemon.energy_root": "Racinénergie",
+  "item.cobblemon.revival_herb": "Herbe Rappel",
+  "item.cobblemon.roasted_leek": "Poireau Rôti",
+  "item.cobblemon.leek_and_potato_stew": "Ragoût de poireau et pomme de terre",
+  "item.cobblemon.braised_vivichoke": "Bourgeon Vivace Braisé",
+  "item.cobblemon.vivichoke_dip": "Sauce de Bourgeon Vivace",
+  "item.cobblemon.berry_juice": "Jus de Baie",
+  "item.cobblemon.remedy": "Remède",
+  "item.cobblemon.fine_remedy": "Super Remède",
+  "item.cobblemon.superb_remedy": "Hyper Remède",
+  "item.cobblemon.heal_powder": "Poudre Soin",
+  "item.cobblemon.medicinal_brew": "Infusion Médicinale",
+  "item.cobblemon.revive": "Rappel",
+  "item.cobblemon.max_revive": "Rappel Max",
+  "item.cobblemon.pp_up": "PP Plus",
+  "item.cobblemon.pp_max": "PP Max",
+  "item.cobblemon.x_attack": "Attaque +",
+  "item.cobblemon.x_defence": "Défense +",
+  "item.cobblemon.x_accuracy": "Précision +",
+  "item.cobblemon.x_speed": "Vitesse +",
+  "item.cobblemon.x_special_defence": "Déf. Spé. +",
+  "item.cobblemon.x_special_attack": "Atq. Spé. +",
+  "item.cobblemon.dire_hit": "Muscle +",
+  "item.cobblemon.guard_spec": "Garde-Stats",
+  "item.cobblemon.full_heal": "Total Soin",
+  "item.cobblemon.antidote": "Antidote",
+  "item.cobblemon.awakening": "Réveil",
+  "item.cobblemon.burn_heal": "Anti-Brûle",
+  "item.cobblemon.ice_heal": "Antigel",
+  "item.cobblemon.paralyze_heal": "Anti-Para",
+  "item.cobblemon.ether": "Huile",
+  "item.cobblemon.max_ether": "Huile Max",
+  "item.cobblemon.elixir": "Élixir",
+  "item.cobblemon.max_elixir": "Élixir Max",
+  "itemGroup.cobblemon.blocks": "Blocs",
+  "itemGroup.cobblemon.pokeball": "Poké Balls",
+  "itemGroup.cobblemon.agriculture": "Agriculture",
+  "itemGroup.cobblemon.consumables": "Consommables",
+  "itemGroup.cobblemon.held_item": "Objet tenu",
+  "itemGroup.cobblemon.evolution_item": "Objets d'évolution",
  "block.cobblemon.apricorn_log": "Bûche de Noigrume",
  "block.cobblemon.stripped_apricorn_log": "Bûche de Noigrume écorcée",
  "block.cobblemon.apricorn_wood": "Bois de Noigrume",
@@ -188,6 +284,7 @@
  "block.cobblemon.apricorn_button": "Bouton en Noigrume",
  "block.cobblemon.apricorn_slab": "Dalle en Noigrume",
  "block.cobblemon.apricorn_fence_gate": "Portillon en Noigrume",
+  "block.cobblemon.big_root": "Grosse Racine",
  "block.cobblemon.black_apricorn_sapling": "Pousse de noigrume noir",
  "block.cobblemon.blue_apricorn_sapling": "Pousse de Noigrume bleu",
  "block.cobblemon.green_apricorn_sapling": "Pousse de Noigrume vert",
@@ -201,17 +298,26 @@
  "block.cobblemon.healing_machine.tooltip1": "Doit être chargée après avoir été posée.",
  "block.cobblemon.healing_machine.tooltip2": "Se charge avec le temps.",
  "block.cobblemon.pc": "PC",
-
+  "block.cobblemon.red_mint": "Graines d'Aromate Rouge",
+  "block.cobblemon.blue_mint": "Graines d'Aromate Bleu",
+  "block.cobblemon.cyan_mint": "Graines d'Aromate Cyan",
+  "block.cobblemon.pink_mint": "Graines d'Aromate Rose",
+  "block.cobblemon.green_mint": "Graines d'Aromate Vert",
+  "block.cobblemon.white_mint": "Graines d'Aromate Blanc",
+  "block.cobblemon.vivichoke_seeds": "Graines de Bourgeon Vivace",
+  "block.cobblemon.pep_up_flower": "Fleur PP",
+  "block.cobblemon.potted_pep_up_flower": "Pot de Fleur PP",
  "cobblemon.overflow_no_pc": "Votre équipe est pleine et vous n'avez pas de PC !",
  "cobblemon.overflow_no_space": "Votre équipe est pleine et %1$s aussi !",
-  "cobblemon.overflow_to_pc": "Votre équipe est pleine ! %1$s a été ajouté à %2$s.",
-  "cobblemon.your_pc": "Votre PC",
-  "cobblemon.command.pokespawn.invalid-pokemon": "Nom du Pokémon invalide",
+  "cobblemon.overflow_to_pc": "Votre équipe est pleine ! %1$s a été ajouté à %2$s.",
+  "cobblemon.your_pc": "votre PC",
+  "cobblemon.command.pokespawn.invalid-pokemon": "Nom de Pokémon invalide",
  "cobblemon.command.pokespawn.invalid-move": "Nom de la capacité invalide",
-
+  "cobblemon.command.clearparty.nonethere": "Il n'y a pas de Pokémon dans l'équipe de %1$s.",
+  "cobblemon.command.clearparty.cleared": "L'équipe de %1$s a été effacée.",
+  "cobblemon.command.clearpc.cleared": "Le PC de %1$s a été effacé.",
  "cobblemon.ui.generic.yes": "Oui",
  "cobblemon.ui.generic.no": "Non",
-
  "cobblemon.ui.pokenav.title": "PokéNav",
  "cobblemon.ui.summary.title": "Résumé",
  "cobblemon.ui.starter.title": "Sélection du Pokémon de départ",
@@ -219,6 +325,8 @@
  "cobblemon.ui.starter.alreadyselected": "Vous avez déjà sélectionné un Pokémon de départ !",
  "cobblemon.ui.starter.cannotchoose": "Vous ne pouvez pas choisir un Pokémon de départ tout de suite.",
  "cobblemon.ui.starter.hasalreadychosen": "%1$s a déjà choisi un Pokémon de départ.",
+  "cobblemon.ui.starter.choose_starter_title": "Choisissez votre Pokémon de départ !",
+  "cobblemon.ui.starter.choose_starter_description": "Appuyez sur la touche « %1$s »",
  "cobblemon.ui.starter.chooseyourstarter": "Appuyez sur %1$s pour choisir votre Pokémon et commencer votre voyage !",
  "cobblemon.ui.moves": "Capacités",
  "cobblemon.ui.moves.switch": "Gestion des capacités",
@@ -245,6 +353,12 @@
  "cobblemon.ui.info.ability": "Talent",
  "cobblemon.ui.info.experience_points": "Points d'Exp.",
  "cobblemon.ui.info.to_next_level": "Niveau suivant",
+  "cobblemon.ui.trade": "Échanger",
+  "cobblemon.trade.occupied": "%1$s est occupé.",
+  "cobblemon.trade.request_expired": "La demande d'échange avec %1$s a expiré.",
+  "cobblemon.trade.request_already_expired": "Leur demande d'échange a déjà expiré.",
+  "cobblemon.trade.request_sent": "Vous avez proposé d'échanger avec %1$s",
+  "cobblemon.trade.offer": "%1$s a proposé d'échanger des Pokémon avec vous.",
  "cobblemon.ui.party": "Équipe",
  "cobblemon.ui.power": "Puissance",
  "cobblemon.ui.accuracy": "Précision",
@@ -253,6 +367,10 @@
  "cobblemon.ui.exit": "Quitter",
  "cobblemon.ui.pc.box.title": "Boîte %1$s",
  "cobblemon.ui.pc.release": "Relâcher",
+  "cobblemon.ui.pasture": "Pâturage",
+  "cobblemon.ui.pasture.recall_all": "Tout rappeler",
+  "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)",
+  "cobblemon.pasture.too_many_nearby": "Il y a trop de Pokémon à proximité.",
  "key.cobblemon.upshiftparty": "Sélection du Pokémon de l'équipe vers le haut",
  "key.cobblemon.downshiftparty": "Sélection du Pokémon de l'équipe vers le bas",
  "key.cobblemon.hideparty": "Cacher l'équipe",
@@ -263,17 +381,17 @@
  "cobblemon.subtitle.capture_succeeded": "Capture réussie !",
  "cobblemon.healingmachine.alreadyinuse": "Cette machine de soin est déjà utilisé !",
  "cobblemon.healingmachine.nopokemon": "Vous n'avez aucun Pokémon dans votre équipe à soigner !",
-  "cobblemon.healingmachine.alreadyhealed": "Votre équipe Pokémon est déjà complètement soigné !",
-  "cobblemon.healingmachine.healing": "Votre équipe Pokémon est en train d'être soigné !",
-  "cobblemon.healingmachine.healed": "Votre équipe Pokémon a été soigné !",
+  "cobblemon.healingmachine.alreadyhealed": "Votre équipe est déjà complètement soignée !",
+  "cobblemon.healingmachine.healing": "Votre équipe est en train d'être soignée...",
+  "cobblemon.healingmachine.healed": "Votre équipe est soignée !",
  "cobblemon.healingmachine.notenoughcharge": "Cette machine a besoin de %s de charge supplémentaire pour soigner votre équipe !",
  "cobblemon.healingmachine.inbattle": "Vous ne pouvez pas utiliser une machine de soin pendant un combat !",
  "cobblemon.healingmachine.alreadyhealing": "Votre équipe Pokémon est déjà dans une autre machine de soin !",
  "cobblemon.pc.inbattle": "Vous ne pouvez pas utiliser un PC pendant un combat !",
  "cobblemon.held_item": "Objet tenu",
-  "cobblemon.held_item.give": "L'objet %2$s a été donné à %1$s.",
-  "cobblemon.held_item.replace": "Vous avez récupéré l'objet %1$s de %2$s et lui avez donné l'objet %3$s.",
-  "cobblemon.held_item.take": "Vous avez récupéré l'objet %1$s de %2$s.",
+  "cobblemon.held_item.give": "%1$s reçoit l'objet %2$s.",
+  "cobblemon.held_item.replace": "%2$s reçoit l'objet %3$s et vous récupérez l'objet %1$s.",
+  "cobblemon.held_item.take": "Vous récupérez l'objet %1$s de %2$s.",
  "cobblemon.held_item.already_holding": "%1$s tient déjà l'objet %2$s !",
  "cobblemon.ui.pokemonteam": "Équipe Pokémon",
  "cobblemon.ui.lv": "N.",
@@ -299,31 +417,174 @@
  "cobblemon.label.lv": "N. %1$s",
  "cobblemon.challenge_label": "Appuyez sur %1$s pour combattre.",
  "cobblemon.challenge.sender": "Vous avez défié %1$s à un combat !",
-  "cobblemon.challenge.receiver": "%1$s vous a défié au combat ! Appuyez sur %2$s tout en le regardant pour combattre.",
-  "cobblemon.entity.pokemon": "Pokémon",
+  "cobblemon.challenge.receiver": "%1$s vous défie au combat !",
  "cobblemon.drop.item.inventory": "Vous avez reçu %2$s (%1$sx).",
  "cobblemon.drop.item.full": "Votre inventaire était plein, donc %1$s est tombé au sol.",
+  "cobblemon.mint.interact": "Les stats de %1$s ont changé !",
+  "cobblemon.mint.same_nature": "Les stats de %1$s ne semblent pas affectées par l'%2$s.",
+  "itemGroup.cobblemon.plants": "Plantes",
+  "item.cobblemon.aguav_berry": "Baie Gowav",
+  "item.cobblemon.aguav_berry.tooltip": "Restaure 1/3 des PV lorsque le porteur a moins d'1/4 de ses PV max ; rend confus si le Pokémon n'aime pas les Baies amères",
+  "item.cobblemon.apicot_berry": "Baie Abriko",
+  "item.cobblemon.apicot_berry.tooltip": "Augmente la Défense Spéciale de 1 niveau lorsque le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.aspear_berry": "Baie Willia",
+  "item.cobblemon.aspear_berry.tooltip": "Soigne le porteur du gel",
+  "item.cobblemon.babiri_berry": "Baie Babiri",
+  "item.cobblemon.babiri_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Acier",
+  "item.cobblemon.belue_berry": "Baie Myrte",
+  "item.cobblemon.belue_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.bluk_berry": "Baie Remu",
+  "item.cobblemon.bluk_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.charti_berry": "Baie Charti",
+  "item.cobblemon.charti_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Roche",
+  "item.cobblemon.cheri_berry": "Baie Ceriz",
+  "item.cobblemon.cheri_berry.tooltip": "Soigne le porteur de la paralysie",
+  "item.cobblemon.chesto_berry": "Baie Maron",
+  "item.cobblemon.chesto_berry.tooltip": "Soigne le porteur du sommeil",
+  "item.cobblemon.chilan_berry": "Baie Zalis",
+  "item.cobblemon.chilan_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité de type Normal",
+  "item.cobblemon.chople_berry": "Baie Pomroz",
+  "item.cobblemon.chople_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Combat",
+  "item.cobblemon.coba_berry": "Baie Cobaba",
+  "item.cobblemon.coba_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Vol",
+  "item.cobblemon.colbur_berry": "Baie Lampou",
+  "item.cobblemon.colbur_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Ténèbres",
+  "item.cobblemon.cornn_berry": "Baie Siam",
+  "item.cobblemon.cornn_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.custap_berry": "Baie Chérim",
+  "item.cobblemon.custap_berry.tooltip": "Attaque en premier si le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.durin_berry": "Baie Durin",
+  "item.cobblemon.durin_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.enigma_berry": "Baie Enigma",
+  "item.cobblemon.enigma_berry.tooltip": "Restaure 1/4 des PV lorsque le porteur subit une capacité super efficace",
+  "item.cobblemon.figy_berry": "Baie Figuy",
+  "item.cobblemon.figy_berry.tooltip": "Restaure 1/3 des PV lorsque le porteur a moins d'1/4 de ses PV max ; rend confus si le Pokémon n'aime pas les Baies épicées",
+  "item.cobblemon.ganlon_berry": "Baie Lingan",
+  "item.cobblemon.ganlon_berry.tooltip": "Augmente la Défense de 1 niveau lorsque le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.grepa_berry": "Baie Résin",
+  "item.cobblemon.grepa_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.haban_berry": "Baie Fraigo",
+  "item.cobblemon.haban_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Dragon",
+  "item.cobblemon.hondew_berry": "Baie Lonme",
+  "item.cobblemon.hondew_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.hopo_berry": "Baie Bouhlon",
+  "item.cobblemon.hopo_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.iapapa_berry": "Baie Papaya",
+  "item.cobblemon.iapapa_berry.tooltip": "Restaure 1/3 des PV lorsque le porteur a moins d'1/4 de ses PV max ; rend confus si le Pokémon n'aime pas les Baies acides",
+  "item.cobblemon.jaboca_berry": "Baie Jaboca",
+  "item.cobblemon.jaboca_berry.tooltip": "Si le porteur subit une capacité physique, l'adversaire subit un contrecoup d'1/8 de ses PV max",
+  "item.cobblemon.kasib_berry": "Baie Sédra",
+  "item.cobblemon.kasib_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Spectre",
+  "item.cobblemon.kebia_berry": "Baie Kébia",
+  "item.cobblemon.kebia_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Poison",
+  "item.cobblemon.kee_berry": "Baie Éka",
+  "item.cobblemon.kee_berry.tooltip": "Augmente la Défense de 1 niveau lorsque le porteur subit une capacité physique",
+  "item.cobblemon.kelpsy_berry": "Baie Alga",
+  "item.cobblemon.kelpsy_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.lansat_berry": "Baie Lansat",
+  "item.cobblemon.lansat_berry.tooltip": "Augmente le taux de coups critiques lorsque le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.leppa_berry": "Baie Mepo",
+  "item.cobblemon.leppa_berry.tooltip": "Restaure 10 PP de la première capacité qui atteint 0 PP",
+  "item.cobblemon.liechi_berry": "Baie Lichii",
+  "item.cobblemon.liechi_berry.tooltip": "Augmente l'Attaque de 1 niveau lorsque le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.lum_berry": "Baie Prine",
+  "item.cobblemon.lum_berry.tooltip": "Soigne tous les problèmes de statut du porteur",
+  "item.cobblemon.mago_berry": "Baie Mago",
+  "item.cobblemon.mago_berry.tooltip": "Restaure 1/3 des PV lorsque le porteur a moins d'1/4 de ses PV max ; rend confus si le Pokémon n'aime pas les Baies sucrées",
+  "item.cobblemon.magost_berry": "Baie Mangou",
+  "item.cobblemon.magost_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.maranga_berry": "Baie Rangma",
+  "item.cobblemon.maranga_berry.tooltip": "Augmente la Défense Spéciale de 1 niveau lorsque le porteur subit une capacité spéciale",
+  "item.cobblemon.micle_berry": "Baie Micle",
+  "item.cobblemon.micle_berry.tooltip": "Augmente la précision de la prochaine capacité de x1.2 lorsque le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.nanab_berry": "Baie Nanab",
+  "item.cobblemon.nanab_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.touga_berry": "Baie Touga",
+  "item.cobblemon.touga_berry.tooltip": "Soigne le porteur de la confusion",
+  "item.cobblemon.nomel_berry": "Baie Tronci",
+  "item.cobblemon.nomel_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.occa_berry": "Baie Chocco",
+  "item.cobblemon.occa_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Feu",
+  "item.cobblemon.oran_berry": "Baie Oran",
+  "item.cobblemon.oran_berry.tooltip": "Restaure 10 PV lorsque le porteur a moins d'1/2 de ses PV max",
+  "item.cobblemon.pamtre_berry": "Baie Palma",
+  "item.cobblemon.pamtre_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.passho_berry": "Baie Pocpoc",
+  "item.cobblemon.passho_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Eau",
+  "item.cobblemon.payapa_berry": "Baie Yapap",
+  "item.cobblemon.payapa_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Psy",
+  "item.cobblemon.pecha_berry": "Baie Pêcha",
+  "item.cobblemon.pecha_berry.tooltip": "Soigne le porteur de l'empoisonnement",
+  "item.cobblemon.persim_berry": "Baie Kika",
+  "item.cobblemon.persim_berry.tooltip": "Soigne le porteur de la confusion",
+  "item.cobblemon.petaya_berry": "Baie Pitaye",
+  "item.cobblemon.petaya_berry.tooltip": "Augmente l'Attaque Spéciale de 1 niveau lorsque le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.pinap_berry": "Baie Nanana",
+  "item.cobblemon.pinap_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.pomeg_berry": "Baie Grena",
+  "item.cobblemon.pomeg_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.qualot_berry": "Baie Qualot",
+  "item.cobblemon.qualot_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.rabuta_berry": "Baie Rabuta",
+  "item.cobblemon.rabuta_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.rawst_berry": "Baie Fraive",
+  "item.cobblemon.rawst_berry.tooltip": "Soigne le porteur de la brûlure",
+  "item.cobblemon.razz_berry": "Baie Framby",
+  "item.cobblemon.razz_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.rindo_berry": "Baie Ratam",
+  "item.cobblemon.rindo_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Plante",
+  "item.cobblemon.roseli_berry": "Baie Selro",
+  "item.cobblemon.roseli_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Fée",
+  "item.cobblemon.rowap_berry": "Baie Pommo",
+  "item.cobblemon.rowap_berry.tooltip": "Si le porteur subit une capacité spéciale, l'adversaire subit un contrecoup d'1/8 de ses PV max",
+  "item.cobblemon.salac_berry": "Baie Sailak",
+  "item.cobblemon.salac_berry.tooltip": "Augmente la Vitesse de 1 niveau lorsque le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.shuca_berry": "Baie Jouca",
+  "item.cobblemon.shuca_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Sol",
+  "item.cobblemon.sitrus_berry": "Baie Sitrus",
+  "item.cobblemon.sitrus_berry.tooltip": "Restaure 1/4 des PV lorsque le porteur a moins d'1/2 de ses PV max",
+  "item.cobblemon.spelon_berry": "Baie Kiwan",
+  "item.cobblemon.spelon_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.starf_berry": "Baie Frista",
+  "item.cobblemon.starf_berry.tooltip": "Augmente une statistique aléatoire de 2 lorsque le porteur a moins d'1/4 de ses PV max",
+  "item.cobblemon.tamato_berry": "Baie Tamato",
+  "item.cobblemon.tamato_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.tanga_berry": "Baie Panga",
+  "item.cobblemon.tanga_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Insecte",
+  "item.cobblemon.wacan_berry": "Baie Parma",
+  "item.cobblemon.wacan_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Électrik",
+  "item.cobblemon.watmel_berry": "Baie Stekpa",
+  "item.cobblemon.watmel_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.wepear_berry": "Baie Repoi",
+  "item.cobblemon.wepear_berry.tooltip": "Ne peut pas être consommée par le porteur",
+  "item.cobblemon.wiki_berry": "Baie Wiki",
+  "item.cobblemon.wiki_berry.tooltip": "Restaure 1/3 des PV lorsque le porteur a moins d'1/4 de ses PV max ; rend confus si le Pokémon n'aime pas les Baies sèches",
+  "item.cobblemon.yache_berry": "Baie Nanone",
+  "item.cobblemon.yache_berry.tooltip": "Réduit de moitié les dégâts subis par une capacité super efficace de type Glace",
  "cobblemon.command.general.invalid-party-slot": "Il n'y a pas de Pokémon dans l'emplacement %1$s !",
  "cobblemon.command.givepokemon.give": "%2$s a reçu %1$s.",
  "cobblemon.command.pokemonedit": "%1$s de %2$s a été modifié.",
  "cobblemon.command.teach": "%1$s de %2$s a appris %3$s.",
  "cobblemon.command.teach.already_knows": "%1$s connait déjà %2$s !",
-  "cobblemon.command.healpokemon.heal": "L'équipe de %1$s est complètement soigné.",
+  "cobblemon.command.healpokemon.heal": "L'équipe de %1$s est complètement soignée.",
  "cobblemon.command.friendship": " %1$s a %2$s de bonheur.",
-  "cobblemon.command.givepokemon.nospecies": "Erreur : Vous devez inclure le nom d'un Pokémon ou 'random'",
-  "cobblemon.command.spawnpokemon.nospecies": "Erreur : Vous devez inclure le nom d'un Pokémon ou 'random'",
-  "cobblemon.command.spawnpokemonfrompool": "Un %1$s est apparu dans la zone !",
-  "cobblemon.command.spawnpokemonfrompool.unable_to_spawn": "Un Pokémon n'a pas pu apparaître dans la zone !",
+  "cobblemon.command.givepokemon.nospecies": "Erreur : Vous devez inclure le nom d'un Pokémon ou 'random'",
+  "cobblemon.command.spawnpokemon.nospecies": "Erreur : Vous devez inclure le nom d'un Pokémon ou 'random'",
  "cobblemon.command.held_item": "%2$s de %1$s a récupéré l'objet %3$s.",
-  "cobblemon.command.pokebox.box_does_not_exist": "Ce joueur n'a pas de boîte %1$s.",
-  "cobblemon.command.pokebox.box_is_full": "Cette boîte de joueur %1$s est pleinne.",
-  "cobblemon.command.pokebox.last_pokemon": "Le dernier Pokémon du joueur n'a pas été envoyé au PC.",
-  "cobblemon.command.pokebox.storage_is_full": "Le stockage du joueur est plein",
  "cobblemon.command.pokeheal.in_battle": "Vous ne pouvez pas soigner votre équipe pendant un combat !",
+  "cobblemon.command.spawnpokemonfrompool": "%1$s est apparu dans les environs.",
+  "cobblemon.command.spawnpokemonfrompool.unable_to_spawn": "Impossible de faire apparaître un Pokémon.",
+  "cobblemon.command.pokebox.box_does_not_exist": "Ce joueur n'a pas de boîte %1$s.",
+  "cobblemon.command.pokebox.box_is_full": "La boîte %1$s du joueur est pleine.",
+  "cobblemon.command.pokebox.storage_is_full": "Le stockage de ce joueur est plein.",
+  "cobblemon.command.pokebox.last_pokemon": "Le dernier Pokémon du joueur n'a pas été envoyé au PC.",
+  "cobblemon.command.pokemonrestart": "L'équipe et le PC de %1$s ont été effacés.",
  "advancements.cobblemon.root": "Cobblemon, Je te choisis !",
+  "advancements.cobblemon.root.description": "Choisissez un starter et commencez une nouvelle aventure",
  "advancements.cobblemon.obtain_leftovers": "Récolter, réutiliser, recycler !",
  "advancements.cobblemon.obtain_leftovers.description": "Gardez les restes après avoir mangé une pomme.",
-  "advancements.cobblemon.root.description": "Choisissez un starter et commencez une nouvelle aventure",
+  "advancements.cobblemon.any_plant": "La générosité de Mère Nature",
+  "advancements.cobblemon.any_plant.description": "J'espère que vous avez la main verte !",
  "advancements.cobblemon.harvest_apricorn": "Est-ce un Fruit ou une Noisette ?",
  "advancements.cobblemon.harvest_apricorn.description": "Clic droit pour récolter un noigrume entièrement poussé",
  "advancements.cobblemon.harvest_apricorn_seed": "Une pousse à la fois",
@@ -343,7 +604,7 @@
  "advancements.cobblemon.first_catch": "Un nouvel ami !",
  "advancements.cobblemon.first_catch.description": "Utilisez une Poké Ball et attrapez votre premier Pokémon",
  "advancements.cobblemon.full_party": "Main pleine",
-  "advancements.cobblemon.full_party.description": "Attrapez 5 Pokémon et complétez votre équipe",
+  "advancements.cobblemon.full_party.description": "Attrapez plus de Pokémon et faites une équipe de 6",
  "advancements.cobblemon.first_evolution": "Beaucoup de travail et d'attention",
  "advancements.cobblemon.first_evolution.description": "Remplissez les conditions d'évolution d'un Pokémon et faites-le évoluer à partir du menu de votre équipe",
  "advancements.cobblemon.first_battle_victory": "Et ce n'est que le début !",
@@ -351,7 +612,56 @@
  "advancements.cobblemon.first_shiny_catch": "Drôle de couleur",
  "advancements.cobblemon.first_shiny_catch.description": "Attrapez votre premier Pokémon chromatique",
  "advancements.cobblemon.healing_machine": "Repos bien mérité",
-  "advancements.cobblemon.healing_machine.description": "Attendez que la machine de soin soit chargée et soignez votre équipe",
+  "advancements.cobblemon.healing_machine.description": "Attendez que la machine de soin soit chargée, puis soignez votre équipe",
+  "advancements.cobblemon.obtain_leek": "Que quelqu'un soigne le bateau !",
+  "advancements.cobblemon.obtain_leek.description": "Obtenez un Soignon, une plante sauvage qui pousse dans l'eau douce",
+  "advancements.cobblemon.medicinal_brew": "Apothicaire local",
+  "advancements.cobblemon.medicinal_brew.description": "Utilisez un Soignon pour confectionner la base de vos remèdes",
+  "advancements.cobblemon.brew_potion": "Vous ne pouvez pas manier mes potions",
+  "advancements.cobblemon.brew_potion.description": "Incorporez une Baie Oran dans l'Infusion Médicinale pour créer une Potion",
+  "advancements.cobblemon.brew_full_restore": "Le choix du champion",
+  "advancements.cobblemon.brew_full_restore.description": "Suivez l'arbre de brassage et confectionnez une Guérison avec une Baie Prine et une Potion Max",
+  "advancements.cobblemon.brew_all": "Doubles Jumelles, Doubles Problèmes",
+  "advancements.cobblemon.brew_all.description": "Confectionnez tous les objets possibles en utilisant l'Infusion Médicinale",
+  "advancements.cobblemon.obtain_mint": "Aromate fraîche",
+  "advancements.cobblemon.obtain_mint.description": "Obtenez une Aromate, une plante sauvage qui pousse en haute montagne",
+  "advancements.cobblemon.obtain_all_mints": "Un grand engage-menthe",
+  "advancements.cobblemon.obtain_all_mints.description": "Obtenez toutes les 6 couleurs d'Aromates et accédez à un éventail complet de natures",
+  "advancements.cobblemon.obtain_revival_herb": "Herbez votre enthousiasme",
+  "advancements.cobblemon.obtain_revival_herb.description": "Obtenez un Herbe Rappel, une plante sauvage qui pousse dans les cavernes luxuriantes",
+  "advancements.cobblemon.use_revive": "Vivre pour combattre un autre jour !",
+  "advancements.cobblemon.use_revive.description": "Utilisez un Rappel, Rappel Max ou Herbe Rappel pour réanimer un Pokémon K.O.",
+  "advancements.cobblemon.obtain_big_root": "La Racine de la guérison basique",
+  "advancements.cobblemon.obtain_big_root.description": "Obtenez une Grosse Racine, une plante sauvage qui pousse dans les cavernes de terre près de la surface",
+  "advancements.cobblemon.craft_remedy": "Guérison basique",
+  "advancements.cobblemon.craft_remedy.description": "Fabriquez un Remède, un objet de guérison accessible en début de partie, qui peut être transformé en éléments plus puissants",
+  "advancements.cobblemon.obtain_vivichoke": "Une vivacité bourgeonnante",
+  "advancements.cobblemon.obtain_vivichoke.description": "Obtenez un Bourgeon Vivace, cultivé à partir de graines de Bourgeon Vivace étrangement rares",
+  "advancements.cobblemon.obtain_berry": "Très fruité",
+  "advancements.cobblemon.obtain_berry.description": "Obtenez une Baie, des fruits sauvages qui poussent à la surface et qui ont de nombreuses utilisations",
+  "advancements.cobblemon.obtain_mutated_berry": "Un résultat inattendu",
+  "advancements.cobblemon.obtain_mutated_berry.description": "Plantez des Baies de différents types les unes à côté des autres et observez la mutation en action",
+  "advancements.cobblemon.obtain_all_berries": "Oups, toutes les Baies !",
+  "advancements.cobblemon.obtain_all_berries.description": "Obtenez toutes les types de Baies dans Cobblemon",
+  "advancements.cobblemon.use_pasture": "Liberté : Activé",
+  "advancements.cobblemon.use_pasture.description": "Fabriquez un bloc de pâturage et laissez vos amis se promener",
+  "advancements.cobblemon.catch_all_vivillon": "Ailes à motifs",
+  "advancements.cobblemon.catch_all_vivillon.description": "Obtenez tous les motifs de Prismillon",
+  "advancements.cobblemon.evolve_veevees": "Des évolutions de valeur",
+  "advancements.cobblemon.evolve_veevees.description": "Faites évoluer Évoli en 8 évolutions différentes",
+  "advancements.cobblemon.evolve_shedinja": "Un fantôme dans la carapace",
+  "advancements.cobblemon.evolve_shedinja.description": "Gardez une Poké Ball supplémentaire dans votre inventaire et obtenez un Munja",
+  "advancements.cobblemon.trade_pokemon": "Prends bien soin de lui !",
+  "advancements.cobblemon.trade_pokemon.description": "Échangez un Pokémon avec un autre dresseur",
+  "advancements.cobblemon.trade_shelmet_karrablast": "Je voudrais signaler un vol !",
+  "advancements.cobblemon.trade_shelmet_karrablast.description": "Échangez un Escargaume et un Carabing",
+  "advancements.cobblemon.max_level_baby": "Darwin ? C'est qui ?",
+  "advancements.cobblemon.max_level_baby.description": "Montez un Pokémon évolutif au stade initial jusqu'au niveau 100 sans l'évoluer",
+  "advancements.cobblemon.use_candy": "Dent sucrée",
+  "advancements.cobblemon.use_candy.description": "Utilisez n'importe quel Bonbon Exp. sur un Pokémon",
+  "advancements.cobblemon.own_zangoose_seviper": "Partenaires à contrecœur",
+  "advancements.cobblemon.own_zangoose_seviper.description": "Disposez d'un Mangriff et d'un Séviper dans votre équipe en même temps",
+  "cobblemon.battle.crash": "Une erreur lors du combat est survenue. Si vous jouez seul, signalez ceci à l'équipe de modération. Sinon, signalez à l'administrateur du serveur.",
  "cobblemon.battle.damage_dealt": "%1$s a subi %2$s dégâts !",
  "cobblemon.battle.used_move": "%1$s utilise %2$s !",
  "cobblemon.battle.used_move_on": "%1$s utilise %2$s sur %3$s !",
@@ -359,7 +669,6 @@
  "cobblemon.battle.owned_pokemon": "%2$s de %1$s",
  "cobblemon.battle.fainted": "%1$s est K.O. !",
  "cobblemon.battle.win": "%1$s a gagné !",
-  "cobblemon.battle.yawn_start": "%1$s est somnolent !",
  "cobblemon.battle.flee": "Vous avez pris la fuite.",
  "cobblemon.battle.switch_option": "Changer de Pokémon: ",
  "cobblemon.battle.your_team": "Votre équipe:",
@@ -370,17 +679,21 @@
  "cobblemon.battle.resisted": "Ce n'est pas très efficace...",
  "cobblemon.battle.superEffective": "C'est super efficace !",
  "cobblemon.battle.crit": "Coup critique !",
-  "cobblemon.battle.cure_status.ability.naturalcure": "%1$s est soigné par Médic Nature!",
  "cobblemon.battle.nothing": "Mais rien ne se passe !",
  "cobblemon.battle.clearallboost": "Les changements de statistiques ont été réinitialisés.",
+  "cobblemon.battle.clearallnegativeboost": "Les stats de %1$s sont revenues à la normale !",
+  "cobblemon.battle.clearallnegativeboost.zeffect": "%1$s utilise la Force Z pour annuler ses baisses de stats !",
  "cobblemon.battle.unboost.slight": "%2$s de %1$s baisse !",
  "cobblemon.battle.unboost.sharp": "%2$s de %1$s baisse beaucoup !",
  "cobblemon.battle.unboost.severe": "%2$s de %1$s baisse énormément !",
  "cobblemon.battle.unboost.cap.single": "%2$s de %1$s ne peut plus baisser !",
  "cobblemon.battle.unboost.cap.multiple": "Les statistiques de %1$s ne peuvent plus baisser !",
  "cobblemon.battle.boost.slight": "%2$s de %1$s augmente !",
+  "cobblemon.battle.boost.slight.zeffect": "%1$s utilise la Force Z pour augmenter sa statistique %2$s !",
  "cobblemon.battle.boost.sharp": "%2$s de %1$s augmente beaucoup !",
+  "cobblemon.battle.boost.sharp.zeffect": "%1$s utilise la Force Z pour beaucoup augmenter sa statistique %2$s !",
  "cobblemon.battle.boost.severe": "%2$s de %1$s augmente énormément !",
+  "cobblemon.battle.boost.severe.zeffect": "%1$s utilise la Force Z pour augmenter énormément sa statistique %2$s !",
  "cobblemon.battle.boost.cap.single": "%2$s de %1$s ne peut plus augmenter !",
  "cobblemon.battle.boost.cap.multiple": "Les statistiques de %1$s ne peuvent plus augmenter !",
  "cobblemon.battle.setboost.bellydrum": "%1$s sacrifie des PV et monte son Attaque au maximum !",
@@ -398,165 +711,247 @@
  "cobblemon.capture.not_single": "Vous ne pouvez capturer un Pokémon sauvage seulement dans un combat 1 vs 1.",
  "cobblemon.you_in_battle": "Vous ne pouvez pas faire cela durant un combat !",
  "cobblemon.battle.turn": "C'est maintenant le tour %1$s",
-  "cobblemon.battle.rain_dance": "Il commence à pleuvoir !",
-  "cobblemon.battle.rain_dance_upkeep": "La pluie continue de tomber.",
-  "cobblemon.battle.sandstorm": "Une tempête de sable se prépare !",
-  "cobblemon.battle.sandstorm_buffeted": "La tempête de sable inflige des dégâts à %1$s !",
-  "cobblemon.battle.sandstorm_upkeep": "La tempête de sable fait rage.",
-  "cobblemon.battle.sunny_day": "Les rayons du soleil brillent !",
-  "cobblemon.battle.sunny_day_upkeep": "Les rayons du soleil continuent de briller.",
-  "cobblemon.battle.hail": "Il commence à grêler !",
-  "cobblemon.battle.hail_upkeep": "La grêle continue.",
-  "cobblemon.battle.hail_buffeted": "La tempête de grêle inflige des dégâts à %1$s !",
-  "cobblemon.battle.no_weather": "Les effets de la météo se dissipent.",
-  "cobblemon.battle.confusion_start": "%1$s est confus !",
-  "cobblemon.battle.confusion_activate": "Il se blesse dans sa confusion !",
-  "cobblemon.battle.confusion_snapped": "%1$s n'est plus confus !",
-  "cobblemon.battle.protect_start": "%1$s est prêt à se protéger !",
-  "cobblemon.battle.protect_activate": "%1$s s'est protégé !",
-  "cobblemon.battle.magnitude_level": "Ampleur %1$s !",
-  "cobblemon.battle.bide_start": "%1$s commence à se concentrer !",
-  "cobblemon.battle.bide_activate": "%1$s se concentre !",
-  "cobblemon.battle.bide_end": "%1$s envoie la sauce !",
-  "cobblemon.battle.field_start.electric_terrain": "De l'électricité parcourt le terrain !",
-  "cobblemon.battle.field_start.grassy_terrain": "Un beau gazon pousse sur le terrain !",
-  "cobblemon.battle.field_start.gravity": "La Gravité est intensifiée !",
-  "cobblemon.battle.field_start.magic_room": "L'effet des objets tenus est neutralisé !",
-  "cobblemon.battle.field_start.misty_terrain": "La brume recouvre le terrain !",
-  "cobblemon.battle.field_start.mud_sport": "La puissance des capacités de type Électrik est diminuée !",
-  "cobblemon.battle.field_start.psychic_terrain": "Le sol se met à réagir de façon bizarre !",
-  "cobblemon.battle.field_start.trick_room": "%1$s fausse les dimensions !",
-  "cobblemon.battle.field_start.water_sport": "La puissance des capacités de type Feu est diminuée !",
-  "cobblemon.battle.field_start.wonder_room": "La Défense et la Déf. Spé. sont interverties !",
-  "cobblemon.battle.field_end.electric_terrain": "L'électricité se dissipe du terrain.",
-  "cobblemon.battle.field_end.grassy_terrain": "Le beau gazon se dissipe du terrain.",
-  "cobblemon.battle.field_end.gravity": "La gravité est revenue à la normale !",
-  "cobblemon.battle.field_end.magic_room": "La Zone Magique est terminée, les effets des objets sont retournés à la normale !",
-  "cobblemon.battle.field_end.misty_terrain": "La brume qui recouvrait le terrain se dissipe.",
-  "cobblemon.battle.field_end.mud_sport": "Les effets de Lance-Boue se sont dissipés.",
-  "cobblemon.battle.field_end.psychic_terrain": "Le sol redevient normal !",
-  "cobblemon.battle.field_end.trick_room": "Les dimensions sont revenues à la normale !",
-  "cobblemon.battle.field_end.water_sport": "Les effets de Tourniquet se sont dissipés.",
-  "cobblemon.battle.field_end.wonder_room": "La Défense et la Déf. Spé. sont revenues à la normale !",
-  "cobblemon.battle.cant.generic_block": "%1$s ne peut pas utiliser %2$s !",
+  "cobblemon.battle.side_subject.ally": "votre",
+  "cobblemon.battle.side_subject.opponent": "l'adversaire",
+  "cobblemon.battle.weather.raindance.start": "Il commence à pleuvoir !",
+  "cobblemon.battle.weather.raindance.upkeep": "La pluie continue de tomber.",
+  "cobblemon.battle.weather.raindance.end": "La pluie s'est arrêtée !",
+  "cobblemon.battle.weather.sandstorm.start": "Une tempête de sable se prépare !",
+  "cobblemon.battle.weather.sandstorm.upkeep": "La tempête de sable fait rage.",
+  "cobblemon.battle.weather.sandstorm.end": "La tempête de sable se calme !",
+  "cobblemon.battle.weather.sunnyday.start": "Les rayons du soleil brillent !",
+  "cobblemon.battle.weather.sunnyday.upkeep": "Les rayons du soleil s’intensifient !",
+  "cobblemon.battle.weather.sunnyday.end": "Les rayons du soleil s’affaiblissent !",
+  "cobblemon.battle.weather.hail.start": "Il commence à grêler !",
+  "cobblemon.battle.weather.hail.upkeep": "Il y a un déluge de grêle.",
+  "cobblemon.battle.weather.hail.end": "La grêle s’est arrêtée !",
+  "cobblemon.battle.start.bide": "%1$s commence à se concentrer !",
+  "cobblemon.battle.start.yawn": "Ça rend %1$s somnolent !",
+  "cobblemon.battle.start.perish": "Le compte à rebours de Requiem de %1$s descend à %2$s !",
+  "cobblemon.battle.start.leechseed": "%1$s est infecté !",
+  "cobblemon.battle.start.aquaring": "%1$s s'entoure d'un voile d'eau !",
+  "cobblemon.battle.start.charge": "%1$s se met à charger son énergie !",
+  "cobblemon.battle.start.taunt": "%1$s répond à la Provoc !",
+  "cobblemon.battle.start.autotomize": "%1$s est devenu très vif !",
+  "cobblemon.battle.start.attract": "%1$s est amoureux !",
+  "cobblemon.battle.start.focusenergy": "%1$s se gonfle !",
+  "cobblemon.battle.start.uproar": "%1$s provoque du brouhaha !",
+  "cobblemon.battle.start.curse": "%1$s sacrifie des PV et lance une malédiction à %2$s !",
+  "cobblemon.battle.start.miracleeye": "%1$s est identifié !",
+  "cobblemon.battle.start.dynamax": "%1$s a dynamaxé !",
+  "cobblemon.battle.start.gmax": "%1$s a gigamaxé !",
+  "cobblemon.battle.fieldstart.electricterrain": "De l’électricité parcourt le terrain !",
+  "cobblemon.battle.fieldstart.grassyterrain": "Un beau gazon pousse sur le terrain !",
+  "cobblemon.battle.fieldstart.gravity": "La gravité est intensifiée !",
+  "cobblemon.battle.fieldstart.magicroom": "L’effet des objets tenus est neutralisé !",
+  "cobblemon.battle.fieldstart.mistyterrain": "La brume recouvre le terrain !",
+  "cobblemon.battle.fieldstart.mudsport": "La puissance des capacités de type Électrik est diminuée !",
+  "cobblemon.battle.fieldstart.psychicterrain": "Le sol se met à réagir de façon bizarre...",
+  "cobblemon.battle.fieldstart.trickroom": "%1$s fausse les dimensions !",
+  "cobblemon.battle.fieldstart.watersport": "La puissance des capacités de type Feu est diminuée !",
+  "cobblemon.battle.fieldstart.wonderroom": "La Défense et la Défense Spéciale sont interverties !",
+  "cobblemon.battle.fieldend.electricterrain": "L’électricité parcourant le terrain s’est dissipée...",
+  "cobblemon.battle.fieldend.grassyterrain": "Le gazon disparaît...",
+  "cobblemon.battle.fieldend.gravity": "La gravité est revenue à la normale !",
+  "cobblemon.battle.fieldend.magicroom": "L’effet des objets tenus est rétabli !",
+  "cobblemon.battle.fieldend.mistyterrain": "La brume qui recouvrait le terrain se dissipe.",
+  "cobblemon.battle.fieldend.mudsport": "L’effet de Lance-Boue se dissipe !",
+  "cobblemon.battle.fieldend.psychicterrain": "Le sol redevient normal !",
+  "cobblemon.battle.fieldend.trickroom": "Les dimensions faussées reviennent à la normale !",
+  "cobblemon.battle.fieldend.watersport": "L’effet de Tourniquet se dissipe !",
+  "cobblemon.battle.fieldend.wonderroom": "La Défense et la Défense Spéciale sont revenues à la normale !",
+  "cobblemon.battle.fieldactivate.perishsong": "Les Pokémon au combat seront K.O. dans trois tours !",
+  "cobblemon.battle.sidestart.stealthrock": "Des pierres pointues lévitent autour de l'équipe de %1$s !",
+  "cobblemon.battle.sidestart.spikes": "Des picots s'éparpillent autour de l'équipe de %1$s !",
+  "cobblemon.battle.sidestart.toxicspikes": "Des pics toxiques se répandent autour de l'équipe de %1$s !",
+  "cobblemon.battle.sidestart.stickyweb": "Le terrain est couvert d'une toile gluante du côté de l'équipe de %1$s !",
+  "cobblemon.battle.sidestart.reflect": "Protection augmente la résistance de l'équipe de %1$s aux capacités physiques !",
+  "cobblemon.battle.sidestart.lightscreen": "Mur Lumière augmente la résistance de l'équipe de %1$s aux capacités spéciales !",
+  "cobblemon.battle.sidestart.auroraveil": "Voile Aurore augmente la résistance de l'équipe de %1$s aux capacités physiques et spéciales !",
+  "cobblemon.battle.sidestart.tailwind": "Un vent arrière souffle sur l'équipe de %1$s !",
+  "cobblemon.battle.sidestart.safeguard": "Un voile mystérieux recouvre l'équipe de %1$s !",
+  "cobblemon.battle.sideend.stealthrock": "Les pierres pointues autour de l'équipe de %1$s ont disparu !",
+  "cobblemon.battle.sideend.spikes": "Il n'y a plus de picots autour de l'équipe de %1$s !",
+  "cobblemon.battle.sideend.toxicspikes": "Il n'y a plus de pics toxiques autour de l'équipe de %1$s !",
+  "cobblemon.battle.sideend.stickyweb": "La toile gluante du côté de l'équipe de %1$s a disparu !",
+  "cobblemon.battle.sideend.reflect": "Protection n'a plus d'effet sur l'équipe de %1$s !",
+  "cobblemon.battle.sideend.lightscreen": "Mur Lumière n'a plus d'effet sur l'équipe de %1$s !",
+  "cobblemon.battle.sideend.auroraveil": "Voile Aurore n'a plus d'effet sur l'équipe de %1$s !",
+  "cobblemon.battle.sideend.tailwind": "Le vent arrière soufflant sur l'équipe de %1$s s'arrête !",
+  "cobblemon.battle.sideend.safeguard": "L'équipe de %1$s n’est plus protégée par le voile mystérieux !",
+  "cobblemon.battle.cant.generic": "%1$s ne peut pas utiliser %2$s !",
  "cobblemon.battle.cant.truant": "%1$s n'obéit pas !",
-  "cobblemon.battle.cant.flinched": "%1$s a la trouille ! Il ne peut plus attaquer !",
+  "cobblemon.battle.cant.flinch": "%1$s a la trouille ! Il ne peut plus attaquer !",
  "cobblemon.battle.cant.recharge": "%1$s doit se reposer !",
  "cobblemon.battle.cant.attract": "L'amour empêche %1$s d'agir !",
  "cobblemon.battle.cant.disable": "%2$s de %1$s est mis sous entrave !",
-  "cobblemon.battle.cant.focus_punch": "%1$s a perdu sa concentration et ne peux pas attaquer !",
-  "cobblemon.battle.cant.heal_block": "%1$s ne peut pas utiliser %2$s à cause de la Capacité Anti-Soin !",
+  "cobblemon.battle.cant.focuspunch": "%1$s n’est plus concentré. Il ne peut plus attaquer !",
+  "cobblemon.battle.cant.healblock": "%1$s ne peut pas utiliser la capacité %2$s à cause d’Anti-Soin !",
  "cobblemon.battle.cant.imprison": "%1$s ne peut pas utiliser la capacité %2$s, car elle est bloquée !",
  "cobblemon.battle.cant.gravity": "%1$s ne peut pas utiliser la capacité %2$s à cause de la gravité !",
-  "cobblemon.battle.cant.shell_trap": "La capacité Carapiège de %1$s n'a pas fonctionné !",
+  "cobblemon.battle.cant.shelltrap": "Le Carapiège de %1$s n'a pas explosé...",
  "cobblemon.battle.cant.taunt": "%1$s ne peut pas utiliser %2$s après la provocation !",
-  "cobblemon.battle.cant.throat_chop": "Les effets de Exécu-Son empêchent %1$s d'utiliser des capacités sonores !",
-  "cobblemon.battle.cant.no_pp": "%1$s a essayé d'utiliser la capacité %2$s, mais n'avais plus de PP restant !",
+  "cobblemon.battle.cant.throatchop": "Exécu-Son empêche %1$s d'utiliser la capacité !",
+  "cobblemon.battle.activate.confusion": "%1$s est confus !",
  "cobblemon.battle.activate.gravity": "%1$s ne tiens plus en l'air à cause de la gravité !",
-  "cobblemon.battle.activate.misty_terrain": "%1$s se couvre d'une brume protectrice !",
-  "cobblemon.battle.activate.psychic_terrain": "%1$s s'entoure d'un champ Psychique !",
-  "cobblemon.battle.activate.heal_bell": "Un grelot sonne !",
+  "cobblemon.battle.activate.mistyterrain": "%1$s est protégé par un champ brumeux !",
+  "cobblemon.battle.activate.psychicterrain": "%1$s est protégé par un champ psychique !",
+  "cobblemon.battle.activate.healbell": "Un grelot sonne !",
  "cobblemon.battle.activate.aromatherapy": "Une odeur apaisante flotte dans l'air !",
  "cobblemon.battle.activate.trapped": "%1$s ne peut plus s'échapper !",
-  "cobblemon.battle.activate.wrap": "%1$s est envellopé par %2$s !",
  "cobblemon.battle.activate.bind": "%1$s est pris dans l'étreinte de %2$s !",
-  "cobblemon.battle.activate.court_change": "Les effets affectant chaque côté du terrain ont été changés par %1$s !",
-  "cobblemon.battle.activate.guard_split": "%1$s partage sa garde avec sa cible !",
+  "cobblemon.battle.activate.wrap": "%1$s est ligoté par %2$s !",
+  "cobblemon.battle.activate.struggle": "%1$s n'a plus de capacités utilisables !",
+  "cobblemon.battle.activate.courtchange": "Les effets affectant chaque côté du terrain ont été changés par %1$s !",
+  "cobblemon.battle.activate.guardsplit": "%1$s partage sa garde avec sa cible !",
  "cobblemon.battle.activate.spite": "Les PP de la capacité %2$s de %1$s baissent de %3$s !",
+  "cobblemon.battle.activate.lockon": "%1$s vise %2$s !",
+  "cobblemon.battle.activate.protosynthesis": "Le soleil brille, ce qui a permis à %1$s d'activer Paléosynthèse !",
+  "cobblemon.battle.activate.bide": "%1$s se concentre !",
+  "cobblemon.battle.activate.protect": "%1$s s'est protégé !",
+  "cobblemon.battle.activate.magnitude": "Ampleur %1$s !",
+  "cobblemon.battle.activate.destinybond": "%1$s emmène son adversaire au tapis !",
+  "cobblemon.battle.activate.synchronize": "[Synchro de %1$s]",
+  "cobblemon.battle.activate.endure": "%1$s encaisse les coups !",
+  "cobblemon.battle.activate.attract": "%1$s est amoureux de %2$s !",
+  "cobblemon.battle.activate.firespin": "%1$s est piégé dans un tourbillon de feu !",
+  "cobblemon.battle.activate.trick": "%1$s échange son objet avec celui de sa cible !",
+  "cobblemon.battle.activate.quickclaw": "La Vive Griffe permet à %1$s d'agir en priorité !",
+  "cobblemon.battle.activate.focusband": "%1$s tient bon grâce à la %2$s !",
+  "cobblemon.battle.activate.forewarn": "La capacité %2$s de %1$s a été détectée !",
+  "cobblemon.battle.activate.disguise": "Le déguisement absorbe l’attaque !",
+  "cobblemon.battle.activate.liquidooze": "%1$s aspire le suintement !",
+  "cobblemon.battle.activate.whirlpool": "%1$s est piégé dans le tourbillon !",
+  "cobblemon.battle.activate.clamp": "%1$s est pris dans le Claquoir de %2$s !",
  "cobblemon.battle.prepare.bounce": "%1$s se propulse dans les airs !",
  "cobblemon.battle.prepare.dig": "%1$s se cache dans le sol !",
  "cobblemon.battle.prepare.dive": "%1$s se cache sous l'eau !",
  "cobblemon.battle.prepare.fly": "%1$s s'envole !",
-  "cobblemon.battle.prepare.freeze_shock": "%1$s est baigné d'une lumière blafarde !",
+  "cobblemon.battle.prepare.freezeshock": "%1$s est baigné d'une lumière blafarde !",
  "cobblemon.battle.prepare.geomancy": "%1$s concentre son énergie !",
-  "cobblemon.battle.prepare.ice_burn": "%1$s est entouré d'un air glacial !",
-  "cobblemon.battle.prepare.meteor_beam": "La puissance du cosmos afflue dans le corps de %1$s !",
-  "cobblemon.battle.prepare.phantom_force": "%1$s disparaît instantanément !",
-  "cobblemon.battle.prepare.razor_wind": "%1$s se prépare à lancer une bourrasque !",
-  "cobblemon.battle.prepare.skull_bash": "%1$s baisse la tête !",
-  "cobblemon.battle.prepare.sky_attack": "%1$s est entouré d'une lumière intense !",
-  "cobblemon.battle.prepare.sky_drop": "%1$s emporte sa cible haut dans le ciel !",
-  "cobblemon.battle.prepare.solar_beam": "%1$s absorbe la lumière !",
+  "cobblemon.battle.prepare.iceburn": "%1$s est entouré d'un air glacial !",
+  "cobblemon.battle.prepare.meteorbeam": "La puissance du cosmos afflue dans le corps de %1$s !",
+  "cobblemon.battle.prepare.phantomforce": "%1$s disparaît instantanément !",
+  "cobblemon.battle.prepare.razorwind": "%1$s se prépare à lancer une bourrasque !",
+  "cobblemon.battle.prepare.skullbash": "%1$s baisse la tête !",
+  "cobblemon.battle.prepare.skyattack": "%1$s est entouré d'une lumière intense !",
+  "cobblemon.battle.prepare.skydrop": "%1$s emporte sa cible haut dans le ciel !",
+  "cobblemon.battle.prepare.solarbeam": "%1$s absorbe la lumière !",
  "cobblemon.battle.swapboost.generic": "%1$s a changé les bonus de stats avec %2$s !",
  "cobblemon.battle.singleturn.protect": "%1$s s'est protégé !",
  "cobblemon.battle.singleturn.endure": "%1$s encaisse les coups !",
-  "cobblemon.battle.singleturn.crafty_shield": "L'équipe de %1$s est protégée par la capacité Vigilance !",
+  "cobblemon.battle.singleturn.craftyshield": "L'équipe de %1$s est protégée par la capacité Vigilance !",
  "cobblemon.battle.singleturn.powder": "%1$s est couvert de poudre !",
-  "cobblemon.battle.singleturn.follow_me": "%1$s devient le centre d'attention !",
+  "cobblemon.battle.singleturn.followme": "%1$s devient le centre d'attention !",
  "cobblemon.battle.singleturn.snatch": "%1$s attend qu'une cible agisse !",
-  "cobblemon.battle.singleturn.quick_guard": "Vigilance a protégé l'équipe de %1$s !",
-  "cobblemon.battle.singleturn.wide_guard": "Garde Large a protégé l'équipe de %1$s !",
+  "cobblemon.battle.singleturn.quickguard": "L'équipe de %1$s est protégée par la capacité Prévention !",
+  "cobblemon.battle.singleturn.wideguard": "L'équipe de %1$s est protégée par la capacité Garde Large !",
  "cobblemon.battle.singleturn.roost": "(%1$s perd son type Vol ce tour-ci.)",
-  "cobblemon.battle.singleturn.mat_block": "%1$s se prépare à utilliser un tatami pour bloquer les attaques !",
-  "cobblemon.battle.singleturn.max_guard": "%1$s s'est protégé !",
+  "cobblemon.battle.singleturn.matblock": "%1$s se prépare à utiliser un tatami pour bloquer les attaques !",
+  "cobblemon.battle.singleturn.maxguard": "%1$s se protège !",
  "cobblemon.battle.singleturn.instruct": "%1$s obéit à la Sommation de %2$s !",
-  "cobblemon.battle.singleturn.focus_punch": "%1$s se concentre au maximum !",
+  "cobblemon.battle.singleturn.focuspunch": "%1$s se concentre au maximum !",
  "cobblemon.battle.singleturn.electrify": "L'Électrisation donne le type Électrik à la prochaine capacité de %1$s !",
-  "cobblemon.battle.singleturn.beak_blast": "%1$s fait chauffer son bec !",
-  "cobblemon.battle.singleturn.helping_hand": "%2$s est prêt à aider %1$s !",
-  "cobblemon.battle.singleturn.magic_coat": "%1$s s'entoure du Reflet Magik !",
-  "cobblemon.battle.singleturn.rage_powder": "%1$s devient le centre d'attention !",
-  "cobblemon.battle.singleturn.shell_trap": "%1$s déclenche le Carapiège !",
+  "cobblemon.battle.singleturn.beakblast": "%1$s fait chauffer son bec !",
+  "cobblemon.battle.singleturn.helpinghand": "%2$s est prêt à aider %1$s !",
+  "cobblemon.battle.singleturn.magiccoat": "%1$s s'entoure du Reflet Magik !",
+  "cobblemon.battle.singleturn.ragepowder": "%1$s devient le centre d'attention !",
+  "cobblemon.battle.singleturn.shelltrap": "%1$s déclenche le Carapiège !",
  "cobblemon.battle.singleturn.spotlight": "%1$s devient le centre d'attention !",
-  "cobblemon.battle.singlemove.destiny_bond": "%1$s veut emmener son adversaire au tapis !",
-  "cobblemon.battle.singlemove.glaive_rush": "%1$s se lance dans une charge imprudente !",
+  "cobblemon.battle.singlemove.destinybond": "%1$s veut emmener son ennemi au tapis !",
+  "cobblemon.battle.singlemove.glaiverush": "%1$s se lance dans une charge imprudente !",
  "cobblemon.battle.singlemove.grudge": "%1$s veut que son adversaire subisse sa Rancune !",
  "cobblemon.battle.singlemove.rage": "La Frénésie de %1$s s'intensifie !",
+  "cobblemon.battle.damage.wrap": "%1$s est blessé par la capacité Ligotage !",
+  "cobblemon.battle.damage.confusion": "%1$s se blesse dans sa confusion !",
+  "cobblemon.battle.damage.leechseed": "Vampigraine draine l'énergie de %1$s !",
+  "cobblemon.battle.damage.sandstorm": "La tempête de sable inflige des dégâts à %1$s !",
+  "cobblemon.battle.damage.hail": "La tempête de grêle inflige des dégâts à %1$s !",
+  "cobblemon.battle.damage.stealthrock": "Des pierres pointues transpercent %1$s !",
+  "cobblemon.battle.damage.spikes": "%1$s est blessé par les picots !",
+  "cobblemon.battle.damage.recoil": "%1$s est blessé par le contrecoup !",
+  "cobblemon.battle.damage.item": "%1$s est blessé par le %2$s !",
+  "cobblemon.battle.damage.lifeorb": "%1$s perd quelques PV !",
+  "cobblemon.battle.damage.rockyhelmet": "%1$s est blessé par le Casque Brut de %2$s !",
+  "cobblemon.battle.damage.generic": "%1$s s’est blessé en attaquant !",
+  "cobblemon.battle.damage.pokemonmimikyubusted": "Le déguisement de %1$s tombe !",
+  "cobblemon.battle.damage.whirlpool": "%1$s est blessé par la capacité Siphon !",
+  "cobblemon.battle.damage.clamp": "%1$s est blessé par la capacité Claquoir !",
+  "cobblemon.battle.damage.curse": "%1$s est touché par la malédiction !",
  "cobblemon.battle.end.bind": "%1$s est libéré de la capacité Étreinte !",
-  "cobblemon.battle.end.wrap": "%1$s a été libéré de l'emballage!",
-  "cobblemon.battle.set_hp.pain_split": "Les adversaires partagent leur PV !",
+  "cobblemon.battle.end.wrap": "%1$s est libéré de la capacité Ligotage !",
+  "cobblemon.battle.end.disable": "La capacité de %1$s n'est plus sous entrave !",
+  "cobblemon.battle.end.protosynthesis": "L'effet du talent Paléosynthèse de %1$s s'est dissipé !",
+  "cobblemon.battle.end.taunt": "%1$s s'est remis de la Provoc !",
+  "cobblemon.battle.end.firespin": "%1$s est libéré de la capacité Danse Flammes !",
+  "cobblemon.battle.end.bide": "%1$s envoie la sauce !",
+  "cobblemon.battle.end.confusion": "%1$s n'est plus confus !",
+  "cobblemon.battle.end.whirlpool": "%1$s est libéré de la capacité Siphon !",
+  "cobblemon.battle.end.clamp": "%1$s est libéré de la capacité Claquoir !",
+  "cobblemon.battle.end.dynamax": "%1$s revient à la normale !",
+  "cobblemon.battle.sethp.painsplit": "Les adversaires partagent leurs PV !",
  "cobblemon.battle.ability.sturdy": "%1$s encaisse les coups !",
-  "cobblemon.battle.ability.speed_boost": "Turbo de %1$s activé !",
-  "cobblemon.battle.ability.intimidate": "Intimidation de %1$s activé !",
  "cobblemon.battle.ability.unnerve": "%1$s rend l'adversaire tendu et ne peut plus manger de Baies !",
  "cobblemon.battle.ability.anticipation": "%1$s est tout tremblant !",
-  "cobblemon.battle.ability.air_lock": "Les effets de la météo ont disparu.",
+  "cobblemon.battle.ability.airlock": "Les effets de la météo se dissipent !",
  "cobblemon.battle.ability.generic": "%2$s de %1$s activé !",
+  "cobblemon.battle.ability.magicbounce": "%1$s repousse la capacité %2$s ! Retour à l'envoyeur !",
  "cobblemon.battle.errors.busy": "%1$s est occupé !",
  "cobblemon.battle.error.in_battle": "%1$s est déjà au combat.",
  "cobblemon.battle.error.in_battle.personal": "Vous êtes déjà dans un combat !",
  "cobblemon.battle.error.no_pokemon": "Vous n'avez plus de Pokémon utilisable !",
+  "cobblemon.battle.error.no_pokemon_opponent": "Votre adversaire n'a plus de Pokémon utilisable !",
  "cobblemon.battle.error.insufficient_pokemon": "%1$s a %2 Pokémon alors que %3 sont nécessaires pour le combat.",
  "cobblemon.battle.error.insufficient_pokemon.personal": "Vous avez %1 Pokémon utilisable, mais vous avez besoin de %2 minimum.",
+  "cobblemon.battle.error.pokemon_is_trapped": "[Choix indisponible] Impossible de changer : Le Pokémon actif est piégé",
  "cobblemon.battle.immune": "Mais %1$s est immunisé !",
  "cobblemon.battle.missed": "Mais cela échoue !",
  "cobblemon.battle.hit_count": "Touché %1$s fois !",
  "cobblemon.battle.hit_count_singular": "Touché une fois !",
-  "cobblemon.battle.hurt.wrap": "%1$s souffre a cause de l'emballage !",
-  "cobblemon.battle.item.air_balloon.start": "%1$s flotte dans l'air grâce à son ballon !",
-  "cobblemon.battle.item.recycle_or_pickup.start": "%1$s trouve l'objet %2$s !",
-  "cobblemon.battle.item.frisk.start": "%1$s fouille %2$s et trouve l'objet %3$s !",
-  "cobblemon.battle.item.take_item.start": "%1$s a volé l'objet %3$s de %2$s !",
-  "cobblemon.battle.item.harvest.start": "%1$s a récolté l'objet %2$s !",
-  "cobblemon.battle.item.bestow.start": "%1$s obtient l'objet %2$s de %3$s !",
-  "cobblemon.battle.item.tricked.start": "%1$s échange son objet avec celui de sa cible !",
-  "cobblemon.battle.item.eat.end": "%1$s a mangé sa %2$s !",
-  "cobblemon.battle.item.fling.end": "%1$s lance une %2$s !",
-  "cobblemon.battle.item.knock_off.end": "%1$s sabote l'objet %3$s de %2$s !",
-  "cobblemon.battle.item.gem.end": "Le %1$s a renforcé la puissance de %2$s !",
-  "cobblemon.battle.item.incinerate.end": "%2$s de %1$s a été brulé !",
-  "cobblemon.battle.item.air_balloon.end": "Le ballon de %1$s a éclaté !",
-  "cobblemon.battle.item.hung_on.end": "%1$s tient bon grâce à la %2$s !",
-  "cobblemon.battle.item.red_card.end": "%1$s tient un carton rouge contre %2$s !",
-  "cobblemon.battle.item.steal_eat.end": "%1$s a volé et mangé la %3$s de %2$s !",
-  "cobblemon.battle.item.berry_juice.end": "%1$s boit son jus de baie !",
-  "cobblemon.battle.item.used_its.end": "%1$s utilise l'objet %2$s !",
-  "cobblemon.battle.item.mental_herb.end": "%1$s annule les effets mentaux grâce à l'Herbe Mental !",
-  "cobblemon.battle.item.power_herb.end": "%1$s est déjà reposé grâce à son herbe pouvoir !",
-  "cobblemon.battle.item.mirror_herb.end": "%1$s a copié les changements de statistiques grâce à sa Feuille Copieuse !",
-  "cobblemon.battle.item.white_herb.end": "%1$s annule les changements négatifs grâce à l'Herbe Blanche !",
-  "cobblemon.battle.item.quick_claw.end": "La Vive Griffe permet à %1$s d'agir en priorité !",
-  "cobblemon.battle.heal.z_effect": "Les PV de %1$s ont été restaurés grâce la capacité Z !",
+  "cobblemon.battle.item.airballoon": "%1$s flotte grâce à son %2$s !",
+  "cobblemon.battle.item.recycle": "%1$s trouve l'objet %2$s !",
+  "cobblemon.battle.item.frisk": "%3$s fouille %1$s et trouve l'objet %2$s !",
+  "cobblemon.battle.item.thief": "%1$s vole l'objet %2$s de %3$s !",
+  "cobblemon.battle.item.harvest": "%1$s a récolté une %2$s !",
+  "cobblemon.battle.item.bestow": "%1$s obtient l'objet %2$s de %3$s !",
+  "cobblemon.battle.item.trick": "%1$s obtient l'objet %2$s !",
+  "cobblemon.battle.item.eat": "%1$s mange une %2$s !",
+  "cobblemon.battle.enditem.eat": "%1$s mange une %2$s !",
+  "cobblemon.battle.enditem.fling": "%1$s lance l'objet %2$s !",
+  "cobblemon.battle.enditem.knockoff": "%3$s fait tomber l'objet %2$s de %1$s !",
+  "cobblemon.battle.enditem.gem": "Le %2$s renforce la capacité %1$s !",
+  "cobblemon.battle.enditem.incinerate": "L'objet %2$s de %1$s est détruit par le feu !",
+  "cobblemon.battle.enditem.airballoon": "Le Ballon de %1$s a éclaté !",
+  "cobblemon.battle.enditem.redcard": "%1$s a mis un Carton Rouge à %3$s !",
+  "cobblemon.battle.enditem.pluck": "%3$s vole et mange la %2$s de %1$s !",
+  "cobblemon.battle.enditem.berryjuice": "Le Jus de Baie de %1$s est activé !",
+  "cobblemon.battle.enditem.generic": "%1$s utilise l'objet %2$s !",
+  "cobblemon.battle.enditem.mentalherb": "%1$s annule les effets mentaux grâce à l'Herbe Mental !",
+  "cobblemon.battle.enditem.powerherb": "%1$s est déjà reposé grâce à l'Herbe Pouvoir !",
+  "cobblemon.battle.enditem.mirrorherb": "%1$s a copié les changements de stats grâce à sa Feuille Copieuse !",
+  "cobblemon.battle.enditem.whiteherb": "%1$s annule les changements négatifs grâce à l'Herbe Blanche !",
+  "cobblemon.battle.heal.zeffect": "%1$s utilise la Force Z pour se soigner !",
  "cobblemon.battle.heal.wish": "Le Vœu de %1$s se réalise !",
  "cobblemon.battle.heal.drain": "%1$s s'est fait drainer ses PV !",
-  "cobblemon.battle.heal.healing_wish": "Le vœu soin est devenu réalité pour %1$s !",
-  "cobblemon.battle.heal.revival_blessing": "%1$s a été réanimé et est prêt à se battre à nouveau !",
-  "cobblemon.battle.heal.aqua_ring": "Le voile d'eau restaure les PV de %1$s !",
+  "cobblemon.battle.heal.healingwish": "Le Vœu Soin est exaucé et profite à %1$s !",
+  "cobblemon.battle.heal.revivalblessing": "%1$s a repris connaissance et est prêt à se battre de nouveau !",
+  "cobblemon.battle.heal.aquaring": "Le voile d'eau restaure les PV de %1$s !",
  "cobblemon.battle.heal.ingrain": "%1$s a absorbé des nutriments avec ses racines !",
-  "cobblemon.battle.heal.grassy_terrain": "Quelques PV de %1$s ont été restaurés.",
-  "cobblemon.battle.heal.leftovers": "Les Restes de %1$s restaurent un peu ses PV !",
-  "cobblemon.battle.heal.rain_dish": "Cuvette de %1$s restaure un peu ses PV !",
+  "cobblemon.battle.heal.grassyterrain": "%1$s récupère des PV !",
+  "cobblemon.battle.heal.leftovers": "Les %2$s de %1$s restaurent un peu ses PV !",
+  "cobblemon.battle.heal.item": "%1$s récupère des PV avec l'objet %2$s !",
+  "cobblemon.battle.heal.raindish": "%1$s récupère des PV grâce à Cuvette !",
  "cobblemon.battle.heal.generic": "%1$s a restauré ses PV.",
+  "cobblemon.battle.heal.bagitempotion": "%1$s récupère des PV !",
+  "cobblemon.battle.curestatus.naturalcure": "%1$s est guéri grâce à Médic Nature !",
+  "cobblemon.battle.bagitem.use": "%1$s utilise l'objet %2$s sur %3$s !",
+  "cobblemon.battle.bagitem.cannot": "Vous ne pouvez pas utiliser d'objets pour le moment.",
+  "cobblemon.battle.bagitem.invalid": "Cet objet ne fonctionnera pas.",
+  "cobblemon.battle.zpower": "%1$s déploie sa Force Z comme une aura !",
+  "cobblemon.battle.zbroken": "%1$s n’arrive pas à parer toute l’attaque et subit des dégâts !",
+  "cobblemon.battle.terastallize": "%1$s se téracristallise en type %2$s !",
+  "cobblemon.battle.detailschange.mega": "%1$s réagit à la Gemme Sésame !",
+  "cobblemon.battle.mega": "%1$s a méga-évolué !",
  "cobblemon.experience.gained": "%1$s a reçu %2$s points d'expérience.",
  "cobblemon.experience.level_up": "%1$s est maintenant niveau %2$s !",
  "cobblemon.experience.learned_move": "%1$s a appris %2$s.",
@@ -629,16 +1024,19 @@
  "cobblemon.move.category.status": "Statut",
  "cobblemon.status.sleep.apply": "%1$s est prit de somnolence !",
  "cobblemon.status.sleep.is": "%1$s est endormi.",
-  "cobblemon.status.sleep.woke": "%1$s s'est réveillé !",
+  "cobblemon.status.sleep.cure": "%1$s se réveille !",
  "cobblemon.status.paralysis.apply": "%1$s est paralysé !",
  "cobblemon.status.paralysis.is": "%1$s est paralysé et n'a pas pu attaquer !",
+  "cobblemon.status.paralysis.cure": "%1$s n'est plus paralysé !",
  "cobblemon.status.poison.apply": "%1$s est empoisonné !",
+  "cobblemon.status.poison.cure": "%1$s n'est plus empoisonné !",
  "cobblemon.status.poisonbadly.apply": "%1$s est gravement empoisonné !",
  "cobblemon.status.poison.hurt": "%1$s souffre du poison !",
  "cobblemon.status.burn.apply": "%1$s est brûlé !",
  "cobblemon.status.burn.hurt": "%1$s souffre de brûlure !",
+  "cobblemon.status.burn.cure": "%1$s n'est plus brûlé !",
  "cobblemon.status.frozen.apply": "%1$s est gelé !",
-  "cobblemon.status.frozen.thawed": "%1$s n'est plus gelé !",
+  "cobblemon.status.frozen.cure": "%1$s n’est plus gelé !",
  "cobblemon.status.frozen.is": "%1$s est toujours gelé !",
  "block.cobblemon.dawn_stone_ore": "Minerai de Pierre Aube",
  "block.cobblemon.dusk_stone_ore": "Minerai de Pierre Nuit",
@@ -661,10 +1059,47 @@
  "block.cobblemon.deepslate_thunder_stone_ore": "Minerai de Pierre Foudre des abîmes",
  "block.cobblemon.deepslate_water_stone_ore": "Minerai de Pierre Eau des abîmes",
  "block.cobblemon.dripstone_moon_stone_ore": "Minerai de Pierre Lune de Spéléothème",
+  "block.cobblemon.pasture": "Bloc de pâturage",
  "gamerule.doPokemonSpawning": "Apparition de Pokémon",
+  "gamerule.doShinyStarters": "Les Pokémon de départ seront chromatiques",
  "cobblemon.command.checkspawns.invalid-bucket": "Rareté d'apparition invalide",
  "cobblemon.command.checkspawns.spawns": "Apparitions",
  "cobblemon.command.checkspawns.nothing": "Rien ne peut apparaître ici pour le moment.",
+  "cobblemon.interaction.ev.add": "Les EV %2$s de %1$s augmentent de %3$s !",
+  "cobblemon.interaction.ev.deduct": "Les EV %2$s de %1$s diminuent de %3$s !",
+  "cobblemon.interaction.pp.restore": "Les PP de %1$s ont été restaurés !",
+  "cobblemon.interaction.friendsip.add": "%1$s est devenu plus amical envers vous !",
+  "cobblemon.interaction.status.cure": "Les altérations de statut de %1$s ont été soignées !",
+  "cobblemon.interaction.hp.heal": "%1$s restaure un peu ses PV !",
+  "tag.item.cobblemon.apricorn_logs": "Bûches de Noigrume",
+  "tag.item.cobblemon.apricorn_sprouts": "Germes de Noigrume",
+  "tag.item.cobblemon.apricorns": "Noigrumes",
+  "tag.item.cobblemon.azalea_tree": "Arbres d'azalée",
+  "tag.item.cobblemon.berries": "Baies",
+  "tag.item.cobblemon.cobblemon_seeds": "Graines",
+  "tag.item.cobblemon.evolution_items": "Objets d'évolution",
+  "tag.item.cobblemon.evolution_stones": "Pierres d'évolution",
+  "tag.item.cobblemon.experience_candies": "Bonbons Exp.",
+  "tag.item.cobblemon.held.destiny_knot": "Nœuds Destin",
+  "tag.item.cobblemon.held.everstone": "Pierres Stase",
+  "tag.item.cobblemon.held.experience_share": "Multi Exp",
+  "tag.item.cobblemon.held.is_held_item": "Objets tenus",
+  "tag.item.cobblemon.held.lucky_egg": "Œufs Chance",
+  "tag.item.cobblemon.held.power_anklet": "Chaînes Pouvoir",
+  "tag.item.cobblemon.held.power_band": "Bandeaux Pouvoir",
+  "tag.item.cobblemon.held.power_belt": "Ceintures Pouvoir",
+  "tag.item.cobblemon.held.power_bracer": "Poignets Pouvoir",
+  "tag.item.cobblemon.held.power_lens": "Lentilles Pouvoir",
+  "tag.item.cobblemon.held.power_weight": "Poids Pouvoir",
+  "tag.item.cobblemon.herbs": "Herbes",
+  "tag.item.cobblemon.mint_leaf": "Feuilles d'Aromate",
+  "tag.item.cobblemon.mints": "Aromates",
+  "tag.item.cobblemon.mutated_berries": "Baies mutées",
+  "tag.item.cobblemon.plants": "Plantes",
+  "tag.item.cobblemon.poke_balls": "Poké Balls",
+  "tag.item.cobblemon.protein_ingredients": "Ingrédients de Protéine",
+  "tag.item.cobblemon.zinc_ingredients": "Ingrédients de Zinc",
+  "tag.item.cobblemon.seeds": "Graines",

  "cobblemon.ability.adaptability": "Adaptabilité",
  "cobblemon.ability.adaptability.desc": "Quand le Pokémon utilise une capacité du même type que lui, le bonus de puissance qu’elle reçoit est encore plus important que normalement.",
@@ -1,5 +1,4 @@
 {
-  "itemGroup.cobblemon.pokeball": "Poké Ball",
  "item.cobblemon.poke_ball": "Poké Ball",
  "item.cobblemon.slate_ball": "Slate Ball",
  "item.cobblemon.azure_ball": "Azure Ball",
@@ -32,13 +31,13 @@
  "item.cobblemon.park_ball": "Parco Ball",
  "item.cobblemon.dream_ball": "Dream Ball",
  "item.cobblemon.beast_ball": "UC Ball",
-  "item.cobblemon.black_apricorn_seed": "Seme di Ghicocca Nera",
-  "item.cobblemon.blue_apricorn_seed": "Seme di Ghicocca Blu",
-  "item.cobblemon.green_apricorn_seed": "Seme di Ghicocca Verde",
-  "item.cobblemon.pink_apricorn_seed": "Seme di Ghicocca Rosa",
-  "item.cobblemon.red_apricorn_seed": "Seme di Ghicocca Rossa",
-  "item.cobblemon.white_apricorn_seed": "Seme di Ghicocca Bianca",
-  "item.cobblemon.yellow_apricorn_seed": "Seme di Ghicocca Gialla",
+  "item.cobblemon.black_apricorn_seed": "Germoglio Di Ghicocca Nera",
+  "item.cobblemon.blue_apricorn_seed": "Germoglio di Ghicocca Blu",
+  "item.cobblemon.green_apricorn_seed": "Germoglio di Ghicocca Verde",
+  "item.cobblemon.pink_apricorn_seed": "Germoglio di Ghicocca Rosa",
+  "item.cobblemon.red_apricorn_seed": "Germoglio di Ghicocca Rossa",
+  "item.cobblemon.white_apricorn_seed": "Germoglio di Ghicocca Bianca",
+  "item.cobblemon.yellow_apricorn_seed": "Germoglio di Ghicocca Gialla",
  "item.cobblemon.black_apricorn": "Ghicocca Nera",
  "item.cobblemon.blue_apricorn": "Ghicocca Blu",
  "item.cobblemon.green_apricorn": "Ghicocca Verde",
@@ -46,7 +45,8 @@
  "item.cobblemon.red_apricorn": "Ghicocca Rossa",
  "item.cobblemon.white_apricorn": "Ghicocca Bianca",
  "item.cobblemon.yellow_apricorn": "Ghicocca Gialla",
-  "itemGroup.cobblemon.evolution_item": "Strumenti Evolutivi",
+  "item.cobblemon.vivichoke_seeds": "Seme di Revitalboccio",
+  "item.cobblemon.vivichoke": "Revitalboccio",
  "item.cobblemon.link_cable": "Cavo Link",
  "item.cobblemon.dragon_scale": "Squama Drago",
  "item.cobblemon.kings_rock": "Roccia di Re",
@@ -88,7 +88,6 @@
  "item.cobblemon.sun_stone": "Pietrasole",
  "item.cobblemon.thunder_stone": "Pietratuono",
  "item.cobblemon.water_stone": "Pietraidrica",
-  "itemGroup.cobblemon.medicine": "Strumenti Medicinali",
  "item.cobblemon.rare_candy": "Caramella Rara",
  "item.cobblemon.exp_candy_xs": "Caram. Esp. XS",
  "item.cobblemon.exp_candy_s": "Caram. Esp. S",
@@ -101,10 +100,47 @@
  "item.cobblemon.iron": "Ferro",
  "item.cobblemon.protein": "Proteina",
  "item.cobblemon.zinc": "Zinco",
-  "itemGroup.cobblemon.held_item": "Oggetti Tenuti",
+  "item.cobblemon.potion": "Pozione",
+  "item.cobblemon.super_potion": "Superpozione",
+  "item.cobblemon.hyper_potion": "Iperpozione",
+  "item.cobblemon.max_potion": "Pozione Max",
+  "item.cobblemon.full_restore": "Ricarica Totale",
+  "item.cobblemon.red_mint_leaf": "Foglia di Menta Rossa",
+  "item.cobblemon.red_mint_leaf.tooltip": "È in grado di influenzare la statistica attacco di un Pokémon",
+  "item.cobblemon.blue_mint_leaf": "Foglia di Menta Blu",
+  "item.cobblemon.blue_mint_leaf.tooltip": "È in grado di influenzare la statistica difesa di un Pokémon",
+  "item.cobblemon.cyan_mint_leaf": "Foglia di Menta Ciano",
+  "item.cobblemon.cyan_mint_leaf.tooltip": "È in grado di influenzare la statistica attacco speciale di un Pokémon",
+  "item.cobblemon.pink_mint_leaf": "Foglia di Menta Rosa",
+  "item.cobblemon.pink_mint_leaf.tooltip": "È in grado di influenzare la statistica difesa speciale di un Pokémon",
+  "item.cobblemon.green_mint_leaf": "Foglia di Menta Verde",
+  "item.cobblemon.green_mint_leaf.tooltip": "È in grado di influenzare la statistica velocità di un Pokémon",
+  "item.cobblemon.white_mint_leaf": "Foglia di Menta Rossa",
+  "item.cobblemon.white_mint_leaf.tooltip": "Capable of neutralizing a Pokémon's nature",
+  "item.cobblemon.lonely_mint": "Menta Ardita",
+  "item.cobblemon.adamant_mint": "Menta Decisa",
+  "item.cobblemon.naughty_mint": "Menta Birbona",
+  "item.cobblemon.brave_mint": "Menta Audace",
+  "item.cobblemon.bold_mint": "Menta Sicura",
+  "item.cobblemon.impish_mint": "Menta Scaltra",
+  "item.cobblemon.lax_mint": "Menta Fiacca",
+  "item.cobblemon.relaxed_mint": "Menta Placida",
+  "item.cobblemon.modest_mint": "Menta Modesta",
+  "item.cobblemon.mild_mint": "Menta Mite",
+  "item.cobblemon.rash_mint": "Menta Ardente",
+  "item.cobblemon.quiet_mint": "Menta Quieta",
+  "item.cobblemon.calm_mint": "Menta Calma",
+  "item.cobblemon.gentle_mint": "Menta Gentile",
+  "item.cobblemon.careful_mint": "Menta Cauta",
+  "item.cobblemon.sassy_mint": "Menta Vivace",
+  "item.cobblemon.timid_mint": "Menta Timida",
+  "item.cobblemon.hasty_mint": "Menta Lesta",
+  "item.cobblemon.jolly_mint": "Menta Allegra",
+  "item.cobblemon.naive_mint": "Menta Ingenua",
+  "item.cobblemon.serious_mint": "Menta Seria",
  "item.cobblemon.assault_vest": "Corpetto Assalto",
  "item.cobblemon.auspicious_armor": "Armatura fausta",
-  "item.cobblemon.big_root": "Granradice",
+  "item.cobblemon.malicious_armor": "Malicious Armor",
  "item.cobblemon.black_belt": "Cinturanera",
  "item.cobblemon.black_glasses": "Occhialineri",
  "item.cobblemon.black_sludge": "Fangopece",
@@ -138,6 +174,21 @@
  "item.cobblemon.spell_tag": "Spettrotarga",
  "item.cobblemon.twisted_spoon": "Cucchiaio torto",
  "item.cobblemon.wise_glasses": "Saviocchiali",
+  "item.cobblemon.mental_herb": "Mental Herb",
+  "item.cobblemon.mirror_herb": "Mirror Herb",
+  "item.cobblemon.power_herb": "Power Herb",
+  "item.cobblemon.white_herb": "White Herb",
+  "item.cobblemon.bright_powder": "Bright Powder",
+  "item.cobblemon.metal_powder": "Metal Powder",
+  "item.cobblemon.quick_powder": "Quick Powder",
+  "item.cobblemon.destiny_knot": "Destiny Knot",
+  "item.cobblemon.everstone": "Everstone",
+  "item.cobblemon.power_anklet": "Power Anklet",
+  "item.cobblemon.power_band": "Power Band",
+  "item.cobblemon.power_belt": "Power Belt",
+  "item.cobblemon.power_bracer": "Power Bracer",
+  "item.cobblemon.power_lens": "Power Lens",
+  "item.cobblemon.power_weight": "Power Weight",
  "item.cobblemon.poke_ball.tooltip": "1× tasso di cattura",
  "item.cobblemon.slate_ball.tooltip": "1× tasso di cattura",
  "item.cobblemon.azure_ball.tooltip": "1× tasso di cattura",
@@ -170,6 +221,56 @@
  "item.cobblemon.park_ball.tooltip": "2.5x in tutti i biomi Foresta o Pianura",
  "item.cobblemon.dream_ball.tooltip": "4x sui Pokémon addormentati",
  "item.cobblemon.beast_ball.tooltip": "5× sulle Ultra Creature, altrimenti 0.1×",
+  "item.cobblemon.mulch_base": "Fertilizzante",
+  "item.cobblemon.coarse_mulch": "Coarse Mulch",
+  "item.cobblemon.growth_mulch": "Fertilrapido",
+  "item.cobblemon.humid_mulch": "Fertilidro",
+  "item.cobblemon.loamy_mulch": "Loamy Mulch",
+  "item.cobblemon.peat_mulch": "Peat Mulch",
+  "item.cobblemon.rich_mulch": "Rich Mulch",
+  "item.cobblemon.sandy_mulch": "Sandy Mulch",
+  "item.cobblemon.surprise_mulch": "Fertilsorpresa",
+  "item.cobblemon.medicinal_leek": "Porro Officinale",
+  "item.cobblemon.energy_root": "Radicenergia",
+  "item.cobblemon.revival_herb": "Vitalerba",
+  "item.cobblemon.roasted_leek": "Porro Arrostito",
+  "item.cobblemon.leek_and_potato_stew": "Stufato di Porro e Patata",
+  "item.cobblemon.braised_vivichoke": "Revitalboccio Brasato",
+  "item.cobblemon.vivichoke_dip": "Vivichoke Dip",
+  "item.cobblemon.berry_juice": "Berry Juice",
+  "item.cobblemon.remedy": "Preparato",
+  "item.cobblemon.fine_remedy": "Preparato Buono",
+  "item.cobblemon.superb_remedy": "Preparato Ottimo",
+  "item.cobblemon.heal_powder": "Polvocura",
+  "item.cobblemon.medicinal_brew": "Medicinal Brew",
+  "item.cobblemon.revive": "Revitalizzante",
+  "item.cobblemon.max_revive": "Revitalizzante Max",
+  "item.cobblemon.pp_up": "PP-Su",
+  "item.cobblemon.pp_max": "PP-Max",
+  "item.cobblemon.x_attack": "Attacco X",
+  "item.cobblemon.x_defence": "X Defense",
+  "item.cobblemon.x_accuracy": "Precisione X",
+  "item.cobblemon.x_speed": "Velicità X",
+  "item.cobblemon.x_special_defence": "X Special Defense",
+  "item.cobblemon.x_special_attack": "X Special Attack",
+  "item.cobblemon.dire_hit": "Dire Hit",
+  "item.cobblemon.guard_spec": "Guard Spec",
+  "item.cobblemon.full_heal": "Full Heal",
+  "item.cobblemon.antidote": "Antidote",
+  "item.cobblemon.awakening": "Awakening",
+  "item.cobblemon.burn_heal": "Burn Heal",
+  "item.cobblemon.ice_heal": "Ice Heal",
+  "item.cobblemon.paralyze_heal": "Paralyze Heal",
+  "item.cobblemon.ether": "Ether",
+  "item.cobblemon.max_ether": "Max Ether",
+  "item.cobblemon.elixir": "Elixir",
+  "item.cobblemon.max_elixir": "Max Elixir",
+  "itemGroup.cobblemon.blocks": "Blocchi",
+  "itemGroup.cobblemon.pokeball": "Poké Ball",
+  "itemGroup.cobblemon.agriculture": "Colture",
+  "itemGroup.cobblemon.consumables": "Consumabili",
+  "itemGroup.cobblemon.held_item": "Oggetti Tenuti",
+  "itemGroup.cobblemon.evolution_item": "Strumenti Evolutivi",
  "block.cobblemon.apricorn_log": "Tronco di Ghicocca",
  "block.cobblemon.stripped_apricorn_log": "Tronco di ghicocca scortecciato",
  "block.cobblemon.apricorn_wood": "Legno di ghicocca",
@@ -183,6 +284,7 @@
  "block.cobblemon.apricorn_button": "Bottone di ghicocca",
  "block.cobblemon.apricorn_slab": "Lastra di ghicocca",
  "block.cobblemon.apricorn_fence_gate": "Cancelletto di ghicocca",
+  "block.cobblemon.big_root": "Big Root",
  "block.cobblemon.black_apricorn_sapling": "Arboscello di Ghicocca Nera",
  "block.cobblemon.blue_apricorn_sapling": "Arboscello di Ghicocca Blu",
  "block.cobblemon.green_apricorn_sapling": "Arboscello di Ghicocca Verde",
@@ -196,12 +298,24 @@
  "block.cobblemon.healing_machine.tooltip1": "Deve caricarsi dopo essere stato posizionato.",
  "block.cobblemon.healing_machine.tooltip2": "Si ricarica nel tempo.",
  "block.cobblemon.pc": "PC",
+  "block.cobblemon.red_mint": "Seme di Menta Rossa",
+  "block.cobblemon.blue_mint": "Seme di Menta Blu",
+  "block.cobblemon.cyan_mint": "Seme di Menta Ciano",
+  "block.cobblemon.pink_mint": "Seme di Menta Rosa",
+  "block.cobblemon.green_mint": "Seme di Menta Verde",
+  "block.cobblemon.white_mint": "Seme di Menta Bianco",
+  "block.cobblemon.vivichoke_seeds": "Seme di Revitalboccio",
+  "block.cobblemon.pep_up_flower": "Pep-Up Flower",
+  "block.cobblemon.potted_pep_up_flower": "Potted Pep-Up Flower",
  "cobblemon.overflow_no_pc": "La tua squadra era piena e non hai un PC!",
  "cobblemon.overflow_no_space": "Il tuo party era pieno perciò è stato %1$s!",
  "cobblemon.overflow_to_pc": "La tua squadra è al completo! %1$s è stato aggiunto a %2$s.",
  "cobblemon.your_pc": "Il tuo PC",
-  "cobblemon.command.pokespawn.invalid-pokemon": "Nome del Pokémon non valido",
+  "cobblemon.command.pokespawn.invalid-pokemon": "Il nome del Pokémon non è valido",
  "cobblemon.command.pokespawn.invalid-move": "Nome della mossa non valido",
+  "cobblemon.command.clearparty.nonethere": "Non ci sono Pokémon nella squadra di %1$s.",
+  "cobblemon.command.clearparty.cleared": "Squadra di %1$s cancellata.",
+  "cobblemon.command.clearpc.cleared": "Cleared %1$s's PC.",
  "cobblemon.ui.generic.yes": "Sì",
  "cobblemon.ui.generic.no": "No",
  "cobblemon.ui.pokenav.title": "PokéNav",
@@ -211,6 +325,8 @@
  "cobblemon.ui.starter.alreadyselected": "Hai già selezionato uno starter!",
  "cobblemon.ui.starter.cannotchoose": "Al momento non puoi scegliere uno starter.",
  "cobblemon.ui.starter.hasalreadychosen": "%1$s ha già scelto uno starter.",
+  "cobblemon.ui.starter.choose_starter_title": "Scegli il tuo starter!",
+  "cobblemon.ui.starter.choose_starter_description": "Premi il tasto \"%1$s\"",
  "cobblemon.ui.starter.chooseyourstarter": "Premi %1$s per scegliere il tuo Pokémon e cominciare il tuo viaggio!",
  "cobblemon.ui.moves": "Mosse",
  "cobblemon.ui.moves.switch": "Cambia Mossa",
@@ -237,6 +353,12 @@
  "cobblemon.ui.info.ability": "Abilità",
  "cobblemon.ui.info.experience_points": "Punti Esp.",
  "cobblemon.ui.info.to_next_level": "Al Prossimo Lv.",
+  "cobblemon.ui.trade": "Scambia",
+  "cobblemon.trade.occupied": "%1$s è occupato.",
+  "cobblemon.trade.request_expired": "La richiesta di scambio con %1$s è scaduta.",
+  "cobblemon.trade.request_already_expired": "La richiesta è già scaduta.",
+  "cobblemon.trade.request_sent": "Richiesta di scambio con %1$s inviata",
+  "cobblemon.trade.offer": "%1$s vuole scambiare dei Pokémon.",
  "cobblemon.ui.party": "Squadra",
  "cobblemon.ui.power": "Potenza",
  "cobblemon.ui.accuracy": "Precisione",
@@ -245,6 +367,10 @@
  "cobblemon.ui.exit": "Esci",
  "cobblemon.ui.pc.box.title": "Box %1$s",
  "cobblemon.ui.pc.release": "Libera",
+  "cobblemon.ui.pasture": "Pascolo",
+  "cobblemon.ui.pasture.recall_all": "Richiama Tutti",
+  "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)",
+  "cobblemon.pasture.too_many_nearby": "Ci sono troppi Pokémon nei dintorni.",
  "key.cobblemon.upshiftparty": "Selezione Pokémon Su",
  "key.cobblemon.downshiftparty": "Selezione Pokémon Giù",
  "key.cobblemon.hideparty": "Nascondi Overlay della Squadra",
@@ -291,9 +417,150 @@
  "cobblemon.label.lv": "Lv. %1$s",
  "cobblemon.challenge_label": "Premi %1$s per combattere.",
  "cobblemon.challenge.sender": "Hai sfidato %1$s ad una lotta!",
-  "cobblemon.challenge.receiver": "Sei stato sfidato da %1$s! premi %2$s mentre lo guardi per lottare.",
+  "cobblemon.challenge.receiver": "%1$s ti ha sfidato a combattere!",
  "cobblemon.drop.item.inventory": "Hai ricevuto %1$s %2$s.",
  "cobblemon.drop.item.full": "Il tuo inventario era pieno, %1$s è caduto a terra.",
+  "cobblemon.mint.interact": "La Natura di %1$s è cambiata!",
+  "cobblemon.mint.same_nature": "%1$s ha già quella Natura.",
+  "itemGroup.cobblemon.plants": "Piante",
+  "item.cobblemon.aguav_berry": "Bacca Guava",
+  "item.cobblemon.aguav_berry.tooltip": "Ripristina 1/3 degli HP massimi quando a 1/4 o meno; confonde se la natura da -SpD",
+  "item.cobblemon.apicot_berry": "Apicot Berry",
+  "item.cobblemon.apicot_berry.tooltip": "Raises holder's Sp. Def by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.aspear_berry": "Aspear Berry",
+  "item.cobblemon.aspear_berry.tooltip": "Holder is cured if it is frozen",
+  "item.cobblemon.babiri_berry": "Babiri Berry",
+  "item.cobblemon.babiri_berry.tooltip": "Halves damage taken from a supereffective Steel-type attack",
+  "item.cobblemon.belue_berry": "Belue Berry",
+  "item.cobblemon.belue_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.bluk_berry": "Bluk Berry",
+  "item.cobblemon.bluk_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.charti_berry": "Charti Berry",
+  "item.cobblemon.charti_berry.tooltip": "Halves damage taken from a supereffective Rock-type attack",
+  "item.cobblemon.cheri_berry": "Cheri Berry",
+  "item.cobblemon.cheri_berry.tooltip": "Holder cures itself if it is paralyzed",
+  "item.cobblemon.chesto_berry": "Chesto Berry",
+  "item.cobblemon.chesto_berry.tooltip": "Holder wakes up if it is asleep",
+  "item.cobblemon.chilan_berry": "Chilan Berry",
+  "item.cobblemon.chilan_berry.tooltip": "Halves damage taken from a Normal-type attack",
+  "item.cobblemon.chople_berry": "Chople Berry",
+  "item.cobblemon.chople_berry.tooltip": "Halves damage taken from a supereffective Fighting-type attack",
+  "item.cobblemon.coba_berry": "Coba Berry",
+  "item.cobblemon.coba_berry.tooltip": "Halves damage taken from a supereffective Flying-type attac",
+  "item.cobblemon.colbur_berry": "Colbur Berry",
+  "item.cobblemon.colbur_berry.tooltip": "Halves damage taken from a supereffective Dark-type attack",
+  "item.cobblemon.cornn_berry": "Cornn Berry",
+  "item.cobblemon.cornn_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.custap_berry": "Custap Berry",
+  "item.cobblemon.custap_berry.tooltip": "Holder moves first in its priority bracket when at 1/4 max HP or less",
+  "item.cobblemon.durin_berry": "Durin Berry",
+  "item.cobblemon.durin_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.enigma_berry": "Enigma Berry",
+  "item.cobblemon.enigma_berry.tooltip": "Restores 1/4 max HP after holder is hit by a supereffective move",
+  "item.cobblemon.figy_berry": "Figy Berry",
+  "item.cobblemon.figy_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -Atk Nature",
+  "item.cobblemon.ganlon_berry": "Ganlon Berry",
+  "item.cobblemon.ganlon_berry.tooltip": "Raises holder's Defense by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.grepa_berry": "Grepa Berry",
+  "item.cobblemon.grepa_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.haban_berry": "Haban Berry",
+  "item.cobblemon.haban_berry.tooltip": "Halves damage taken from a supereffective Dragon-type attack",
+  "item.cobblemon.hondew_berry": "Hondew Berry",
+  "item.cobblemon.hondew_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.hopo_berry": "Hopo Berry",
+  "item.cobblemon.hopo_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.iapapa_berry": "Iapapa Berry",
+  "item.cobblemon.iapapa_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -Def Nature",
+  "item.cobblemon.jaboca_berry": "Jaboca Berry",
+  "item.cobblemon.jaboca_berry.tooltip": "If holder is hit by a physical move, attacker loses 1/8 of its max HP",
+  "item.cobblemon.kasib_berry": "Kasib Berry",
+  "item.cobblemon.kasib_berry.tooltip": "Halves damage taken from a supereffective Ghost-type attack",
+  "item.cobblemon.kebia_berry": "Kebia Berry",
+  "item.cobblemon.kebia_berry.tooltip": "Halves damage taken from a supereffective Poison-type attack",
+  "item.cobblemon.kee_berry": "Kee Berry",
+  "item.cobblemon.kee_berry.tooltip": "Raises holder's Defense by 1 stage after it is hit by a physical attack",
+  "item.cobblemon.kelpsy_berry": "Kelpsy Berry",
+  "item.cobblemon.kelpsy_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.lansat_berry": "Lansat Berry",
+  "item.cobblemon.lansat_berry.tooltip": "Holder gains the Focus Energy effect when at 1/4 max HP or less",
+  "item.cobblemon.leppa_berry": "Leppa Berry",
+  "item.cobblemon.leppa_berry.tooltip": "Restores 10 PP to the first of the holder's moves to reach 0 PP",
+  "item.cobblemon.liechi_berry": "Liechi Berry",
+  "item.cobblemon.liechi_berry.tooltip": "Raises holder's Attack by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.lum_berry": "Lum Berry",
+  "item.cobblemon.lum_berry.tooltip": "Holder cures itself if it has a non-volatile status or is confused",
+  "item.cobblemon.mago_berry": "Mago Berry",
+  "item.cobblemon.mago_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -Spe Nature",
+  "item.cobblemon.magost_berry": "Magost Berry",
+  "item.cobblemon.magost_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.maranga_berry": "Maranga Berry",
+  "item.cobblemon.maranga_berry.tooltip": "Raises holder's Sp. Def by 1 stage after it is hit by a special attack",
+  "item.cobblemon.micle_berry": "Micle Berry",
+  "item.cobblemon.micle_berry.tooltip": "Holder's next move has 1.2x accuracy when at 1/4 max HP or less",
+  "item.cobblemon.nanab_berry": "Nanab Berry",
+  "item.cobblemon.nanab_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.touga_berry": "Touga Berry",
+  "item.cobblemon.touga_berry.tooltip": "Holder is cured if it is confused",
+  "item.cobblemon.nomel_berry": "Nomel Berry",
+  "item.cobblemon.nomel_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.occa_berry": "Occa Berry",
+  "item.cobblemon.occa_berry.tooltip": "Halves damage taken from a supereffective Fire-type attack",
+  "item.cobblemon.oran_berry": "Oran Berry",
+  "item.cobblemon.oran_berry.tooltip": "Restores 10 HP when at 1/2 max HP or less",
+  "item.cobblemon.pamtre_berry": "Pamtre Berry",
+  "item.cobblemon.pamtre_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.passho_berry": "Passho Berry",
+  "item.cobblemon.passho_berry.tooltip": "Halves damage taken from a supereffective Water-type attack",
+  "item.cobblemon.payapa_berry": "Payapa Berry",
+  "item.cobblemon.payapa_berry.tooltip": "Halves damage taken from a supereffective Psychic-type attack",
+  "item.cobblemon.pecha_berry": "Pecha Berry",
+  "item.cobblemon.pecha_berry.tooltip": "Holder is cured if it is poisoned",
+  "item.cobblemon.persim_berry": "Persim Berry",
+  "item.cobblemon.persim_berry.tooltip": "Holder is cured if it is confused",
+  "item.cobblemon.petaya_berry": "Petaya Berry",
+  "item.cobblemon.petaya_berry.tooltip": "Raises holder's Sp. Atk by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.pinap_berry": "Pinap Berry",
+  "item.cobblemon.pinap_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.pomeg_berry": "Pomeg Berry",
+  "item.cobblemon.pomeg_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.qualot_berry": "Qualot Berry",
+  "item.cobblemon.qualot_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.rabuta_berry": "Rabuta Berry",
+  "item.cobblemon.rabuta_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.rawst_berry": "Rawst Berry",
+  "item.cobblemon.rawst_berry.tooltip": "Holder is cured if it is burned",
+  "item.cobblemon.razz_berry": "Razz Berry",
+  "item.cobblemon.razz_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.rindo_berry": "Rindo Berry",
+  "item.cobblemon.rindo_berry.tooltip": "Halves damage taken from a supereffective Grass-type attack",
+  "item.cobblemon.roseli_berry": "Roseli Berry",
+  "item.cobblemon.roseli_berry.tooltip": "Halves damage taken from a supereffective Fairy-type attack",
+  "item.cobblemon.rowap_berry": "Rowap Berry",
+  "item.cobblemon.rowap_berry.tooltip": "If holder is hit by a special move, attacker loses 1/8 of its max HP",
+  "item.cobblemon.salac_berry": "Salac Berry",
+  "item.cobblemon.salac_berry.tooltip": "Raises holder's Speed by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.shuca_berry": "Shuca Berry",
+  "item.cobblemon.shuca_berry.tooltip": "Halves damage taken from a supereffective Ground-type attack",
+  "item.cobblemon.sitrus_berry": "Sitrus Berry",
+  "item.cobblemon.sitrus_berry.tooltip": "Restores 1/4 max HP when at 1/2 max HP or less",
+  "item.cobblemon.spelon_berry": "Spelon Berry",
+  "item.cobblemon.spelon_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.starf_berry": "Starf Berry",
+  "item.cobblemon.starf_berry.tooltip": "Raises a random stat by 2 when at 1/4 max HP or less",
+  "item.cobblemon.tamato_berry": "Tamato Berry",
+  "item.cobblemon.tamato_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.tanga_berry": "Tanga Berry",
+  "item.cobblemon.tanga_berry.tooltip": "Halves damage taken from a supereffective Bug-type attack",
+  "item.cobblemon.wacan_berry": "Wacan Berry",
+  "item.cobblemon.wacan_berry.tooltip": "Halves damage taken from a supereffective Electric-type attack",
+  "item.cobblemon.watmel_berry": "Watmel Berry",
+  "item.cobblemon.watmel_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.wepear_berry": "Wepear Berry",
+  "item.cobblemon.wepear_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.wiki_berry": "Wiki Berry",
+  "item.cobblemon.wiki_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -SpA Nature",
+  "item.cobblemon.yache_berry": "Yache Berry",
+  "item.cobblemon.yache_berry.tooltip": "Halves damage taken from a supereffective Ice-type attack",
  "cobblemon.command.general.invalid-party-slot": "Non c'è nessun pokemon nello slot %1$s!",
  "cobblemon.command.givepokemon.give": "Hai dato %1$s a %2$s.",
  "cobblemon.command.pokemonedit": "Hai modificato il valore %2$s di %1$s.",
@@ -305,10 +572,19 @@
  "cobblemon.command.spawnpokemon.nospecies": "Errore: Devi specificare il nome di un Pokémon oppure 'random'",
  "cobblemon.command.held_item": "Hai dato %3$s a %2$s.",
  "cobblemon.command.pokeheal.in_battle": "Non puoi curare la tua squadra mentre sei in battaglia!",
+  "cobblemon.command.spawnpokemonfrompool": "Un %1$s è spawnato nell'area.",
+  "cobblemon.command.spawnpokemonfrompool.unable_to_spawn": "Impossibile spawnare il Pokémon.",
+  "cobblemon.command.pokebox.box_does_not_exist": "Quel Giocatore non ha una box %1$s.",
+  "cobblemon.command.pokebox.box_is_full": "La box %1$s del Giocatore è piena.",
+  "cobblemon.command.pokebox.storage_is_full": "Lo spazio di quel Giocatore è pieno.",
+  "cobblemon.command.pokebox.last_pokemon": "Non è stato possibile inviare l'ultimo Pokémon di quel giocatore al PC.",
+  "cobblemon.command.pokemonrestart": "La Squadra e il PC di %1$s sono stati cancellati.",
  "advancements.cobblemon.root": "Il Mondo dei Cobblemon!",
+  "advancements.cobblemon.root.description": "Scegli un Pokémon starter e comincia la tua nuova avventura",
  "advancements.cobblemon.obtain_leftovers": "Riduci, Riutilizza, Ricicla!",
  "advancements.cobblemon.obtain_leftovers.description": "Mangiare una mela e conservarla.",
-  "advancements.cobblemon.root.description": "Scegli un Pokémon starter e comincia la tua nuova avventura",
+  "advancements.cobblemon.any_plant": "Mother Nature's Bounty",
+  "advancements.cobblemon.any_plant.description": "Hope you've got a green thumb!",
  "advancements.cobblemon.harvest_apricorn": "È un Frutto o una Ghianda?",
  "advancements.cobblemon.harvest_apricorn.description": "Premi Tasto Destro per raccogliere una Ghicocca matura",
  "advancements.cobblemon.harvest_apricorn_seed": "Fare la propria parte",
@@ -328,7 +604,7 @@
  "advancements.cobblemon.first_catch": "Un Nuovo Amico!",
  "advancements.cobblemon.first_catch.description": "Utilizza una PokéBall per catturare il tuo primo Pokémon",
  "advancements.cobblemon.full_party": "Al Completo",
-  "advancements.cobblemon.full_party.description": "Cattura altri 5 Pokémon e forma una squadra completa",
+  "advancements.cobblemon.full_party.description": "Catch more Pokémon and make a full party of 6",
  "advancements.cobblemon.first_evolution": "Duro Lavoro e Dedizione",
  "advancements.cobblemon.first_evolution.description": "Raggiungi i requisiti di evoluzione di un Pokémon e fallo evolvere dal menù della squadra",
  "advancements.cobblemon.first_battle_victory": "Dov'è la mia musica della vittoria?",
@@ -337,6 +613,55 @@
  "advancements.cobblemon.first_shiny_catch.description": "Cattura il tuo primo Pokémon Cromatico",
  "advancements.cobblemon.healing_machine": "Competenza Medica",
  "advancements.cobblemon.healing_machine.description": "Aspetta che una Macchina Curativa si carichi, dopodiché cura la tua squadra",
+  "advancements.cobblemon.obtain_leek": "There's a Leek in the Boat!",
+  "advancements.cobblemon.obtain_leek.description": "Obtain a Medicinal Leek, a wild crop that grows in freshwater",
+  "advancements.cobblemon.medicinal_brew": "Local Apothecary",
+  "advancements.cobblemon.medicinal_brew.description": "Brew a Medicinal Leek to create the basis for your healing needs",
+  "advancements.cobblemon.brew_potion": "You cannot handle my Potions",
+  "advancements.cobblemon.brew_potion.description": "Brew an Oran Berry into Medicinal Brew to create a Potion",
+  "advancements.cobblemon.brew_full_restore": "Champion's Choice",
+  "advancements.cobblemon.brew_full_restore.description": "Follow the brewing tree and create a Full Restore with a Lum Berry and Max Potion",
+  "advancements.cobblemon.brew_all": "Double Double Toil & Trouble",
+  "advancements.cobblemon.brew_all.description": "Brew every possible item using Medicinal Brew",
+  "advancements.cobblemon.obtain_mint": "Minty Fresh",
+  "advancements.cobblemon.obtain_mint.description": "Obtain a Nature Mint, a wild crop that grows high in the mountains",
+  "advancements.cobblemon.obtain_all_mints": "A Big Commit-mint",
+  "advancements.cobblemon.obtain_all_mints.description": "Obtain all 6 colors of Nature Mint and gain access to a full array of natures",
+  "advancements.cobblemon.obtain_revival_herb": "Herb your Enthusiasm",
+  "advancements.cobblemon.obtain_revival_herb.description": "Obtain a Revival Herb, a wild crop that grows in lush caves",
+  "advancements.cobblemon.use_revive": "Live to fight another day!",
+  "advancements.cobblemon.use_revive.description": "Use a Revive, Max Revive, or Revival Herb to revive a fainted Pokémon",
+  "advancements.cobblemon.obtain_big_root": "The Root of Basic Healing",
+  "advancements.cobblemon.obtain_big_root.description": "Obtain a Big Root, a wild crop that grows in dirt caves close to the surface",
+  "advancements.cobblemon.craft_remedy": "Basic Healing",
+  "advancements.cobblemon.craft_remedy.description": "Craft a Remedy, an early-game healing item that can be crafted into stronger forms",
+  "advancements.cobblemon.obtain_vivichoke": "Oki-Doki Vivichokey",
+  "advancements.cobblemon.obtain_vivichoke.description": "Obtain a Vivichoke, grown from strangely scarce Vivichoke Seeds",
+  "advancements.cobblemon.obtain_berry": "Very Berry",
+  "advancements.cobblemon.obtain_berry.description": "Obtain any Berry, wild crops that grow on the surface and have many uses",
+  "advancements.cobblemon.obtain_mutated_berry": "An Unexpected Result",
+  "advancements.cobblemon.obtain_mutated_berry.description": "Plant Berry Trees of different types next to each other and witness Mutation in action",
+  "advancements.cobblemon.obtain_all_berries": "Oops, all Berries!",
+  "advancements.cobblemon.obtain_all_berries.description": "Obtain one of every Berry in Cobblemon",
+  "advancements.cobblemon.use_pasture": "Free Roam: Enabled",
+  "advancements.cobblemon.use_pasture.description": "Craft a Pasture Block and allow your friends to wander",
+  "advancements.cobblemon.catch_all_vivillon": "Patterned Wings",
+  "advancements.cobblemon.catch_all_vivillon.description": "Obtain all patterns of Vivillon",
+  "advancements.cobblemon.evolve_veevees": "Valued Veevees",
+  "advancements.cobblemon.evolve_veevees.description": "Evolve Eevee into 8 different forms",
+  "advancements.cobblemon.evolve_shedinja": "Ghost in the Shell",
+  "advancements.cobblemon.evolve_shedinja.description": "Have an extra Poké Ball in your inventory and obtain a Shedinja",
+  "advancements.cobblemon.trade_pokemon": "Take Good Care!",
+  "advancements.cobblemon.trade_pokemon.description": "Trade a Pokémon with another Trainer",
+  "advancements.cobblemon.trade_shelmet_karrablast": "I'd like to report a theft!",
+  "advancements.cobblemon.trade_shelmet_karrablast.description": "Trade a Shelmet and Karrablast",
+  "advancements.cobblemon.max_level_baby": "Darwin? Who's That?",
+  "advancements.cobblemon.max_level_baby.description": "Take a first-stage Pokémon capable of evolution up to level 100",
+  "advancements.cobblemon.use_candy": "Sweet Tooth",
+  "advancements.cobblemon.use_candy.description": "Use any XP Candy on a Pokémon",
+  "advancements.cobblemon.own_zangoose_seviper": "Begrudging Partners",
+  "advancements.cobblemon.own_zangoose_seviper.description": "Have a Zangoose and Seviper in your party at the same time",
+  "cobblemon.battle.crash": "Si è verificato un errore nella battaglia. Se stai giocando in single-player, segnalalo al team dei mod. Altrimenti, segnalano agli amministratori del server.",
  "cobblemon.battle.damage_dealt": "%1$s ha subito %2$s di danno!",
  "cobblemon.battle.used_move": "%1$s usa %2$s!",
  "cobblemon.battle.used_move_on": "%1$s usa %2$s su %3$s!",
@@ -356,14 +681,19 @@
  "cobblemon.battle.crit": "Brutto colpo!",
  "cobblemon.battle.nothing": "Ma non succede nulla!",
  "cobblemon.battle.clearallboost": "Le modifiche alle statistiche sono state resettate.",
+  "cobblemon.battle.clearallnegativeboost": "%1$s's negative stat changes were removed!",
+  "cobblemon.battle.clearallnegativeboost.zeffect": "%1$s's returned its decreased stats to normal using its Z-Power!",
  "cobblemon.battle.unboost.slight": "%1$s di %2$s diminuisce.",
  "cobblemon.battle.unboost.sharp": "La statistica %2$s di %1$s cala di molto.",
  "cobblemon.battle.unboost.severe": "La statistica %2$s di %1$s cala drasticamente.",
  "cobblemon.battle.unboost.cap.single": "La statistica %2$s di %1$s non può diminuire oltre.",
  "cobblemon.battle.unboost.cap.multiple": "Le statistiche di %1$s non possono diminuire oltre.",
  "cobblemon.battle.boost.slight": "La statistica %2$s di %1$s sale.",
+  "cobblemon.battle.boost.slight.zeffect": "%1$s boosted its %2$s using its Z-Power!",
  "cobblemon.battle.boost.sharp": "La statistica %2$s di %1$s sale di molto.",
+  "cobblemon.battle.boost.sharp.zeffect": "%1$s boosted its %2$s sharply using its Z-Power!",
  "cobblemon.battle.boost.severe": "La statistica %2$s di %1$s sale drasticamente.",
+  "cobblemon.battle.boost.severe.zeffect": "%1$s boosted its %2$s drastically using its Z-Power!",
  "cobblemon.battle.boost.cap.single": "La statistica %1$s di %2$s non può salire oltre.",
  "cobblemon.battle.boost.cap.multiple": "le statistiche di %1$s non possono salire oltre.",
  "cobblemon.battle.setboost.bellydrum": "%1$s dimezza i suoi PS per massimizzare il suo Attacco!",
@@ -381,162 +711,247 @@
  "cobblemon.capture.not_single": "Puoi catturare Pokémon selvatici solo in una battaglia 1v1.",
  "cobblemon.you_in_battle": "Non puoi farlo mentre sei in battaglia!",
  "cobblemon.battle.turn": "È il turno di %1$s",
-  "cobblemon.battle.rain_dance": "Inizia a piovere!",
-  "cobblemon.battle.rain_dance_upkeep": "La pioggia continua a cadere.",
-  "cobblemon.battle.sandstorm": "Inizia una tempesta di sabbia!",
-  "cobblemon.battle.sandstorm_buffeted": "%1$s è stato danneggiato dalla tempesta di sabbia.",
-  "cobblemon.battle.sandstorm_upkeep": "La tempesta di sabbia continua imperterrita.",
-  "cobblemon.battle.sunny_day": "La luce solare si intensifica!",
-  "cobblemon.battle.sunny_day_upkeep": "La luce solare è forte.",
-  "cobblemon.battle.hail": "Inizia a grandinare!",
-  "cobblemon.battle.hail_upkeep": "Inizia a grandinare.",
-  "cobblemon.battle.hail_buffeted": "%1$s è stato ferito dalla grandine.",
-  "cobblemon.battle.no_weather": "Il tempo si schiarisce.",
-  "cobblemon.battle.confusion_start": "%1$s è confuso!",
-  "cobblemon.battle.confusion_activate": "È così confuso da colpirsi da solo!",
-  "cobblemon.battle.confusion_snapped": "%1$s non è più confuso!",
-  "cobblemon.battle.protect_start": "%1$s si è protetto!",
-  "cobblemon.battle.protect_activate": "%1$s si protegge!",
-  "cobblemon.battle.magnitude_level": "Magnitudo %1$s!",
-  "cobblemon.battle.bide_start": "%1$s inizia a immagazzinare energia!",
-  "cobblemon.battle.bide_activate": "%1$s sta immagazzinando energia!",
-  "cobblemon.battle.bide_end": "%1$s ha liberato la sua energia!",
-  "cobblemon.battle.field_start.electric_terrain": "Una corrente elettrica attraversa il campo di battaglia!",
-  "cobblemon.battle.field_start.grassy_terrain": "L'erba è cresciuta fino a coprire il campo di battaglia!",
-  "cobblemon.battle.field_start.gravity": "La forza di gravità si intensifica!",
-  "cobblemon.battle.field_start.magic_room": "Una zona bizzarra dove gli oggetti tenuti perdono i loro effetti è stata creata!",
-  "cobblemon.battle.field_start.misty_terrain": "La nebbia si infittisce attorno al campo di battaglia!",
-  "cobblemon.battle.field_start.mud_sport": "Il potere dell'elettricità è stato indebolito!",
-  "cobblemon.battle.field_start.psychic_terrain": "Il campo di battaglia è diventato strano!",
-  "cobblemon.battle.field_start.trick_room": "%1$s ha contorto le dimensioni!",
-  "cobblemon.battle.field_start.water_sport": "Il potere del fuoco è stato indebolito!",
-  "cobblemon.battle.field_start.wonder_room": "Ha creato una bizzarra area in cui Difesa e Dif. Spec sono scambiate!",
-  "cobblemon.battle.field_end.electric_terrain": "L'elettricità è scomparsa dal campo di battaglia.",
-  "cobblemon.battle.field_end.grassy_terrain": "L'erba è scomparsa dal campo di battaglia.",
-  "cobblemon.battle.field_end.gravity": "La gravità è tornata alla normalità!",
-  "cobblemon.battle.field_end.magic_room": "L'effetto di Magicozona è terminato, gli effetti degli oggetti tenuti tornano alla normalità!",
-  "cobblemon.battle.field_end.misty_terrain": "La nebbia è scomparsa dal campo di battaglia.",
-  "cobblemon.battle.field_end.mud_sport": "L'effetto di Fangata termina.",
-  "cobblemon.battle.field_end.psychic_terrain": "La stranezza è scomparsa dal campo di battaglia!",
-  "cobblemon.battle.field_end.trick_room": "Le distorsione termina e tutto torna alla normalità!",
-  "cobblemon.battle.field_end.water_sport": "L'effetto di Docciascudo termina.",
-  "cobblemon.battle.field_end.wonder_room": "Gli effetti di Mirabilzona sono terminati, la Difesa e la Dif. Spec ritornano alla normalità!",
-  "cobblemon.battle.cant.generic_block": "%1$s non può utilizzare %2$s!",
+  "cobblemon.battle.side_subject.ally": "tuo",
+  "cobblemon.battle.side_subject.opponent": "l'avversario",
+  "cobblemon.battle.weather.raindance.start": "It started to rain!",
+  "cobblemon.battle.weather.raindance.upkeep": "Rain continues to fall.",
+  "cobblemon.battle.weather.raindance.end": "The rain stopped.",
+  "cobblemon.battle.weather.sandstorm.start": "A sandstorm kicked up!",
+  "cobblemon.battle.weather.sandstorm.upkeep": "The sandstorm rages.",
+  "cobblemon.battle.weather.sandstorm.end": "The sandstorm subsided.",
+  "cobblemon.battle.weather.sunnyday.start": "The sunlight turned harsh!",
+  "cobblemon.battle.weather.sunnyday.upkeep": "The sunlight is strong.",
+  "cobblemon.battle.weather.sunnyday.end": "The sunlight faded.",
+  "cobblemon.battle.weather.hail.start": "It started to hail!",
+  "cobblemon.battle.weather.hail.upkeep": "The hail is crashing down.",
+  "cobblemon.battle.weather.hail.end": "The hail stopped.",
+  "cobblemon.battle.start.bide": "%1$s inizia ad accumulare energia!",
+  "cobblemon.battle.start.yawn": "%1$s è diventato sonnolento!",
+  "cobblemon.battle.start.perish": "%1$s's perish count fell to %2$s.",
+  "cobblemon.battle.start.leechseed": "%1$s was seeded!",
+  "cobblemon.battle.start.aquaring": "%1$s surrounded itself with a veil of water!",
+  "cobblemon.battle.start.charge": "%1$s began charging power!",
+  "cobblemon.battle.start.taunt": "%1$s fell for the taunt!",
+  "cobblemon.battle.start.autotomize": "%1$s became nimble!",
+  "cobblemon.battle.start.attract": "%1$s fell in love!",
+  "cobblemon.battle.start.focusenergy": "%1$s is getting pumped!",
+  "cobblemon.battle.start.uproar": "%1$s caused an uproar!",
+  "cobblemon.battle.start.curse": "%1$s cut its own HP and put a curse on %2$s!",
+  "cobblemon.battle.start.miracleeye": "%1$s was identified!",
+  "cobblemon.battle.start.dynamax": "%1$s Dynamaxed!",
+  "cobblemon.battle.start.gmax": "%1$s Gigantamaxed!",
+  "cobblemon.battle.fieldstart.electricterrain": "An electric current ran across the battlefield!",
+  "cobblemon.battle.fieldstart.grassyterrain": "Grass grew to cover the battlefield!",
+  "cobblemon.battle.fieldstart.gravity": "Gravity intensified!",
+  "cobblemon.battle.fieldstart.magicroom": "A bizarre area where held items lose their effects was created!",
+  "cobblemon.battle.fieldstart.mistyterrain": "Mist swirls around the battlefield!",
+  "cobblemon.battle.fieldstart.mudsport": "Electricity's power was weakened!",
+  "cobblemon.battle.fieldstart.psychicterrain": "The battlefield got weird!",
+  "cobblemon.battle.fieldstart.trickroom": "%1$s twisted the dimensions!",
+  "cobblemon.battle.fieldstart.watersport": "Fire's power was weakened!",
+  "cobblemon.battle.fieldstart.wonderroom": "It created a bizarre area in which Defense and Sp. Def stats are swapped!",
+  "cobblemon.battle.fieldend.electricterrain": "The electricity disappeared from the battlefield.",
+  "cobblemon.battle.fieldend.grassyterrain": "The grass disappeared from the battlefield.",
+  "cobblemon.battle.fieldend.gravity": "Gravity returned to normal!",
+  "cobblemon.battle.fieldend.magicroom": "Magic Room wore off, and held items' effects returned to normal!",
+  "cobblemon.battle.fieldend.mistyterrain": "The mist disappeared from the battlefield.",
+  "cobblemon.battle.fieldend.mudsport": "The effects of Mud Sport have faded.",
+  "cobblemon.battle.fieldend.psychicterrain": "The weirdness disappeared from the battlefield!",
+  "cobblemon.battle.fieldend.trickroom": "The twisted dimensions returned to normal!",
+  "cobblemon.battle.fieldend.watersport": "The effects of Water Sport have faded.",
+  "cobblemon.battle.fieldend.wonderroom": "Wonder Room wore off, and Defense and Sp. Def stats returned to normal!",
+  "cobblemon.battle.fieldactivate.perishsong": "All Pokémon that heard the song will faint in three turns!",
+  "cobblemon.battle.sidestart.stealthrock": "Polished stones float in the air around %1$s team!",
+  "cobblemon.battle.sidestart.spikes": "Spikes were scattered on the ground all around %1$s team!",
+  "cobblemon.battle.sidestart.toxicspikes": "Poison spikes were scattered on the ground all around %1$s team!",
+  "cobblemon.battle.sidestart.stickyweb": "A sticky web has been laid on the ground around %1$s team!",
+  "cobblemon.battle.sidestart.reflect": "Reflect made %1$s team stronger against physical moves!",
+  "cobblemon.battle.sidestart.lightscreen": "Light Screen made %1$s team stronger against special moves!",
+  "cobblemon.battle.sidestart.auroraveil": "Aurora Veil made %1$s team stronger against physical and special moves!",
+  "cobblemon.battle.sidestart.tailwind": "The Tailwind blew from behind %1$s team!",
+  "cobblemon.battle.sidestart.safeguard": "%1$s's team cloaked itself in a mystical veil!",
+  "cobblemon.battle.sideend.stealthrock": "The pointed stones disappeared from around %1$s team!",
+  "cobblemon.battle.sideend.spikes": "The spikes disappeared from the ground around %1$s team!",
+  "cobblemon.battle.sideend.toxicspikes": "The poison spikes disappeared from the ground around %1$s team!",
+  "cobblemon.battle.sideend.stickyweb": "The sticky web has disappeared from the ground around %1$s team",
+  "cobblemon.battle.sideend.reflect": "%1$s team's Reflect wore off!",
+  "cobblemon.battle.sideend.lightscreen": "%1$s team's Light Screen wore off!",
+  "cobblemon.battle.sideend.auroraveil": "%1$s team's Aurora Veil wore off!",
+  "cobblemon.battle.sideend.tailwind": "%1$s team's Tailwind petered out!",
+  "cobblemon.battle.sideend.safeguard": "%1$s's team is no longer protected by Safeguard!",
+  "cobblemon.battle.cant.generic": "%1$s can't use %2$s!",
  "cobblemon.battle.cant.truant": "%1$s ciondola!",
-  "cobblemon.battle.cant.flinched": "%1$s tentenna e non riesce ad agire!",
+  "cobblemon.battle.cant.flinch": "%1$s flinched and couldn't move!",
  "cobblemon.battle.cant.recharge": "%1$s deve ricaricarsi!",
  "cobblemon.battle.cant.attract": "L'infatuazione impedisce a %1$s di agire!",
  "cobblemon.battle.cant.disable": "%2$s di %1$s è disabilitato!",
-  "cobblemon.battle.cant.focus_punch": "%1$s ha perso la concentrazione e non è riuscito ad agire!",
-  "cobblemon.battle.cant.heal_block": "%1$s non può utilizzare %2$s per via di Anticura!",
+  "cobblemon.battle.cant.focuspunch": "%1$s lost its focus and couldn't move!",
+  "cobblemon.battle.cant.healblock": "%1$s can't use %2$s because of Heal Block!",
  "cobblemon.battle.cant.imprison": "%1$s non può utilizzare il suo %2$s!",
  "cobblemon.battle.cant.gravity": "%1$s non può utilizzare %2$s per via della gravità!",
-  "cobblemon.battle.cant.shell_trap": "Gusciotrappola di %1$s non ha funzionato!",
+  "cobblemon.battle.cant.shelltrap": "%1$s's shell trap didn't work!",
  "cobblemon.battle.cant.taunt": "%1$s non può usare %2$s dopo la provocazione ricevuta!",
-  "cobblemon.battle.cant.throat_chop": "Gli effetti di Colpo Infernale impediscono a %1$s di usare determinate mosse!",
-  "cobblemon.battle.cant.no_pp": "%1$s ha provato ad usare %2$s ma non ha più PP!",
+  "cobblemon.battle.cant.throatchop": "The effects of Throat Chop prevent %1$s from using certain moves!",
+  "cobblemon.battle.activate.confusion": "%1$s is confused!",
  "cobblemon.battle.activate.gravity": "%1$s non è riuscito a rimanere in aria a causa della gravità!",
-  "cobblemon.battle.activate.misty_terrain": "%1$s si circonda di una nebbia protettiva!",
-  "cobblemon.battle.activate.psychic_terrain": "%1$s si circonda di terreno psichico!",
-  "cobblemon.battle.activate.heal_bell": "Una campana rintocca!",
+  "cobblemon.battle.activate.mistyterrain": "%1$s surrounds itself with a protective mist!",
+  "cobblemon.battle.activate.psychicterrain": "%1$s surrounds itself with psychic terrain!",
+  "cobblemon.battle.activate.healbell": "A bell chimed!",
  "cobblemon.battle.activate.aromatherapy": "Un aroma rilassante dilaga nell'area!",
  "cobblemon.battle.activate.trapped": "%1$s non può più scappare!",
  "cobblemon.battle.activate.bind": "%1$s è stato spremuto da %2$s!",
-  "cobblemon.battle.activate.court_change": "%1$s ha scambiato gli effetti della battaglia per ogni lato del campo di gioco!",
-  "cobblemon.battle.activate.guard_split": "%1$s ha condiviso la propria guardia col suo bersaglio!",
+  "cobblemon.battle.activate.wrap": "%1$s è stato avvolto da %2$s!",
+  "cobblemon.battle.activate.struggle": "%1$s has no moves left!",
+  "cobblemon.battle.activate.courtchange": "%1$s swapped the battle effects affecting each side of the field!",
+  "cobblemon.battle.activate.guardsplit": "%1$s shared its guard with the target!",
  "cobblemon.battle.activate.spite": "Ha ridotto di %3$s i PP del %2$s di %1$s!",
+  "cobblemon.battle.activate.lockon": "%1$s took aim at %2$s!",
+  "cobblemon.battle.activate.protosynthesis": "The harsh sunlight activated %1$s's Protosynthesis!",
+  "cobblemon.battle.activate.bide": "%1$s is storing energy!",
+  "cobblemon.battle.activate.protect": "%1$s si protegge!",
+  "cobblemon.battle.activate.magnitude": "Magnitudo %1$s!",
+  "cobblemon.battle.activate.destinybond": "%1$s took its attacker down with it!",
+  "cobblemon.battle.activate.synchronize": "[%1$s's Synchronize]",
+  "cobblemon.battle.activate.endure": "%1$s sopporta il colpo!",
+  "cobblemon.battle.activate.attract": "%1$s is in love with %2$s!",
+  "cobblemon.battle.activate.firespin": "%1$s became trapped in the fiery vortex!",
+  "cobblemon.battle.activate.trick": "%1$s switched items with its target!",
+  "cobblemon.battle.activate.quickclaw": "%1$s can act faster than normal, thanks to its Quick Claw!",
+  "cobblemon.battle.activate.focusband": "%1$s hung on using its %2$s!",
+  "cobblemon.battle.activate.forewarn": "%1$s's %2$s was revealed!",
+  "cobblemon.battle.activate.disguise": "It's disguise served it as a decoy!",
+  "cobblemon.battle.activate.liquidooze": "%1$s sucked up the liquid ooze!",
+  "cobblemon.battle.activate.whirlpool": "%1$s became trapped in the vortex!",
+  "cobblemon.battle.activate.clamp": "%2$s clamped down on %1$s!",
  "cobblemon.battle.prepare.bounce": "%1$s è balzato!",
  "cobblemon.battle.prepare.dig": "%1$s scava e si nasconde sottoterra!",
  "cobblemon.battle.prepare.dive": "%1$s si è nascosto sott'acqua!",
  "cobblemon.battle.prepare.fly": "%1$s ha spiccato il volo!",
-  "cobblemon.battle.prepare.freeze_shock": "%1$s è stato congelato!",
+  "cobblemon.battle.prepare.freezeshock": "%1$s became cloaked in a freezing light!",
  "cobblemon.battle.prepare.geomancy": "%1$s sta assorbendo potenza!",
-  "cobblemon.battle.prepare.ice_burn": "%1$s è avvolto da un'aria gelida!",
-  "cobblemon.battle.prepare.meteor_beam": "%1$s è traboccante di energia spaziale!",
-  "cobblemon.battle.prepare.phantom_force": "%1$s è sparito all'istante!",
-  "cobblemon.battle.prepare.razor_wind": "%1$s scatena un vortice!",
-  "cobblemon.battle.prepare.skull_bash": "%1$s si prepara caricando la testa indietro!",
-  "cobblemon.battle.prepare.sky_attack": "%1$s viene coperto da una luce intensa!",
-  "cobblemon.battle.prepare.sky_drop": "%1$s porta il suo bersaglio in aria!",
-  "cobblemon.battle.prepare.solar_beam": "%1$s assorbe luce solare!",
+  "cobblemon.battle.prepare.iceburn": "%1$s became cloaked in freezing air!",
+  "cobblemon.battle.prepare.meteorbeam": "%1$s is overflowing with space power!",
+  "cobblemon.battle.prepare.phantomforce": "%1$s vanished instantly!",
+  "cobblemon.battle.prepare.razorwind": "%1$s whipped up a whirlwind!",
+  "cobblemon.battle.prepare.skullbash": "%1$s tucked in its head!",
+  "cobblemon.battle.prepare.skyattack": "%1$s became cloaked in a harsh light!",
+  "cobblemon.battle.prepare.skydrop": "%1$s took its target into the sky!",
+  "cobblemon.battle.prepare.solarbeam": "%1$s absorbed light!",
  "cobblemon.battle.swapboost.generic": "%1$s ha scambiato l'aumento delle stats con %2$s!",
  "cobblemon.battle.singleturn.protect": "%1$s si protegge!",
  "cobblemon.battle.singleturn.endure": "%1$s si rafforza!",
-  "cobblemon.battle.singleturn.crafty_shield": "Truccodifesa protegge la squadra di %1$s!",
+  "cobblemon.battle.singleturn.craftyshield": "Crafty Shield protected %1$s's team!",
  "cobblemon.battle.singleturn.powder": "%1$s è coperto da polvere infiammabile!",
-  "cobblemon.battle.singleturn.follow_me": "%1$s è al centro dell'attenzione!",
+  "cobblemon.battle.singleturn.followme": "%1$s became the center of attention!",
  "cobblemon.battle.singleturn.snatch": "%1$s sta aspettando che il bersaglio faccia una mossa!",
-  "cobblemon.battle.singleturn.quick_guard": "Anticipo protegge la squadra di %1$s!",
-  "cobblemon.battle.singleturn.wide_guard": "Bodyguard ha protetto la squadra di %1$s!",
+  "cobblemon.battle.singleturn.quickguard": "Quick Guard protected %1$s's team!",
+  "cobblemon.battle.singleturn.wideguard": "Wide Guard protected %1$s's team!",
  "cobblemon.battle.singleturn.roost": "(%1$s perde il tipo Volante per questo turno)",
-  "cobblemon.battle.singleturn.mat_block": "%1$s intende sollevare un tappetino per bloccare gli attacchi in arrivo!",
-  "cobblemon.battle.singleturn.max_guard": "%1$s si è protetto!",
+  "cobblemon.battle.singleturn.matblock": "%1$s intends to flip up a mat and block incoming attacks!",
+  "cobblemon.battle.singleturn.maxguard": "%1$s protected itself!",
  "cobblemon.battle.singleturn.instruct": "%1$s ha seguito le istruzioni di %2$s!",
-  "cobblemon.battle.singleturn.focus_punch": "%1$s sta migliorando la sua messa a fuoco!",
+  "cobblemon.battle.singleturn.focuspunch": "%1$s is tightening its focus!",
  "cobblemon.battle.singleturn.electrify": "Le mosse di %1$s sono state elettrificate!",
-  "cobblemon.battle.singleturn.beak_blast": "%1$s ha iniziato a scaldarsi il becco!",
-  "cobblemon.battle.singleturn.helping_hand": "%2$s è pronto per aiutare %1$s!",
-  "cobblemon.battle.singleturn.magic_coat": "%1$s si è avvolto con Magivelo!",
-  "cobblemon.battle.singleturn.rage_powder": "%1$s è al centro dell'attenzione!",
-  "cobblemon.battle.singleturn.shell_trap": "%1$s fissa una trappola guscio!",
+  "cobblemon.battle.singleturn.beakblast": "%1$s started heating up its beak!",
+  "cobblemon.battle.singleturn.helpinghand": "%2$s is ready to help %1$s!",
+  "cobblemon.battle.singleturn.magiccoat": "%1$s shrouded itself with Magic Coat!",
+  "cobblemon.battle.singleturn.ragepowder": "%1$s became the center of attention!",
+  "cobblemon.battle.singleturn.shelltrap": "%1$s set a shell trap!",
  "cobblemon.battle.singleturn.spotlight": "%1$s è al centro dell'attenzione!",
-  "cobblemon.battle.singlemove.destiny_bond": "%1$s sta sperando di poter portare con sé il suo attaccante!",
-  "cobblemon.battle.singlemove.glaive_rush": "%1$s si lancia in una carica spericolata!",
+  "cobblemon.battle.singlemove.destinybond": "%1$s is hoping to take its attacker down with it!",
+  "cobblemon.battle.singlemove.glaiverush": "%1$s throws itself into a reckless charge!",
  "cobblemon.battle.singlemove.grudge": "%1$s vuole che il suo bersaglio serbi rancore!",
  "cobblemon.battle.singlemove.rage": "%1$s va su tutte le furie!",
+  "cobblemon.battle.damage.wrap": "%1$s was hurt by wrap!",
+  "cobblemon.battle.damage.confusion": "%1$s hurt itself in confusion!",
+  "cobblemon.battle.damage.leechseed": "%1$s's health is sapped by Leech Seed!",
+  "cobblemon.battle.damage.sandstorm": "%1$s was buffeted by the sandstorm.",
+  "cobblemon.battle.damage.hail": "%1$s was buffeted by hail.",
+  "cobblemon.battle.damage.stealthrock": "Pointed stones dug into %1$s!",
+  "cobblemon.battle.damage.spikes": "%1$s was hurt by the spikes!",
+  "cobblemon.battle.damage.recoil": "%1$s was damaged by the recoil!",
+  "cobblemon.battle.damage.item": "%1$s was hurt by its %2$s!",
+  "cobblemon.battle.damage.lifeorb": "%1$s lost some of its HP!",
+  "cobblemon.battle.damage.rockyhelmet": "%1$s was hurt by %2$s's Rocky Helmet!",
+  "cobblemon.battle.damage.generic": "%1$s was hurt!",
+  "cobblemon.battle.damage.pokemonmimikyubusted": "%1$s's disguise was busted!",
+  "cobblemon.battle.damage.whirlpool": "%1$s was hurt by Whirlpool!",
+  "cobblemon.battle.damage.clamp": "%1$s was hurt by Clamp!",
+  "cobblemon.battle.damage.curse": "%1$s was afflicted by the curse!",
  "cobblemon.battle.end.bind": "%1$s non sta più essendo schiacciato!",
-  "cobblemon.battle.set_hp.pain_split": "I combattenti condividono il loro dolore!",
+  "cobblemon.battle.end.wrap": "%1$s si è liberato dall'avvolgimento!",
+  "cobblemon.battle.end.disable": "%1$s's move is no longer disabled!",
+  "cobblemon.battle.end.protosynthesis": "The effects of %1$s's Protosynthesis wore off!",
+  "cobblemon.battle.end.taunt": "%1$s shook off the taunt!",
+  "cobblemon.battle.end.firespin": "%1$s was freed from Fire Spin!",
+  "cobblemon.battle.end.bide": "%1$s unleashed its energy!",
+  "cobblemon.battle.end.confusion": "%1$s snapped out of its confusion!",
+  "cobblemon.battle.end.whirlpool": "%1$s was freed from the vortex!",
+  "cobblemon.battle.end.clamp": "%1$s was freed from Clamp!",
+  "cobblemon.battle.end.dynamax": "%1$s returned to normal!",
+  "cobblemon.battle.sethp.painsplit": "The battlers shared their pain!",
  "cobblemon.battle.ability.sturdy": "%1$s ha sopportato il colpo!",
-  "cobblemon.battle.ability.speed_boost": "Acceleratore di %1$s attivato!",
-  "cobblemon.battle.ability.intimidate": "Prepotenza di %1$s attivato!",
  "cobblemon.battle.ability.unnerve": "%1$s ha reso il suo avversario troppo nervoso per permettergli di mangiare bacche!",
  "cobblemon.battle.ability.anticipation": "%1$s ha rabbrividito in anticipo!",
-  "cobblemon.battle.ability.air_lock": "Gli effetti del tempo atmosferico sono svaniti.",
+  "cobblemon.battle.ability.airlock": "The effects of the weather disappeared.",
  "cobblemon.battle.ability.generic": "%2$s di %1$s attivato!",
+  "cobblemon.battle.ability.magicbounce": "%1$s bounced the %2$s back!",
  "cobblemon.battle.errors.busy": "%1$s è occupato!",
  "cobblemon.battle.error.in_battle": "%1$s è già in una lotta.",
  "cobblemon.battle.error.in_battle.personal": "Sei già in una battaglia!",
  "cobblemon.battle.error.no_pokemon": "Non hai più Pokémon disponibili!",
+  "cobblemon.battle.error.no_pokemon_opponent": "Your opponent doesn't have any usable Pokémon!",
  "cobblemon.battle.error.insufficient_pokemon": "%1$s ha %2 Pokémon quando invece ne sono necessari %3.",
  "cobblemon.battle.error.insufficient_pokemon.personal": "Ti servono %2 Pokémon utilizzabili, tu ne hai solo %1.",
+  "cobblemon.battle.error.pokemon_is_trapped": "[Unavailable choice] Can't switch: The active Pokémon is trapped",
  "cobblemon.battle.immune": "Non ha effetto su %1$s.",
  "cobblemon.battle.missed": "Ma fallisce.",
  "cobblemon.battle.hit_count": "Colpi inflitti: %1$s!",
  "cobblemon.battle.hit_count_singular": "Colpi inflitti: 1!",
-  "cobblemon.battle.item.air_balloon.start": "%1$s fluttua in aria con il suo Palloncino!",
-  "cobblemon.battle.item.recycle_or_pickup.start": "%1$s ha trovato %2$s!",
-  "cobblemon.battle.item.frisk.start": "%1$s ha indagato su %2$s e ha scovato il suo %3$s!",
-  "cobblemon.battle.item.take_item.start": "%1$s ha rubato %3$s di %2$s!",
-  "cobblemon.battle.item.harvest.start": "%1$s ha raccolto %2$s!",
-  "cobblemon.battle.item.bestow.start": "%1$s ha ricevuto %2$s da %3$s!",
-  "cobblemon.battle.item.tricked.start": "%1$s ha scambiato gli oggetti con il suo avversario!",
-  "cobblemon.battle.item.eat.end": "%1$s ha mangiato la sua %2$s!",
-  "cobblemon.battle.item.fling.end": "%1$s ha lanciato il suo %2$s!",
-  "cobblemon.battle.item.knock_off.end": "%1$s ha fatto cadere a %3$s il suo %2$s!",
-  "cobblemon.battle.item.gem.end": "La %1$s ha potenziato la potenza di %2$s!",
-  "cobblemon.battle.item.incinerate.end": "La %1$s di %2$s viene distrutta dal fuoco!",
-  "cobblemon.battle.item.air_balloon.end": "Il Palloncino di %1$s è scoppiato!",
-  "cobblemon.battle.item.hung_on.end": "%1$s ha resistito grazie alla sua %2$s!",
-  "cobblemon.battle.item.red_card.end": "%1$s dà un Cartelrosso al %2$s avversario!",
-  "cobblemon.battle.item.steal_eat.end": "%1$s ha rubato la %3$s di %2$s e se l'è mangiata!",
-  "cobblemon.battle.item.berry_juice.end": "Il Succo di bacca di %1$s si è attivato!",
-  "cobblemon.battle.item.used_its.end": "%1$s ha usato il suo %2$s!",
-  "cobblemon.battle.item.mental_herb.end": "%1$s si è disfatto degli effetti mentali grazie alla sua Mentalerba!",
-  "cobblemon.battle.item.power_herb.end": "%1$s è stato completamente caricato grazie alla sua Vigorerba!",
-  "cobblemon.battle.item.mirror_herb.end": "%1$s ha copiato i cambiamenti di statistiche grazie alla sua Foglia Carbone!",
-  "cobblemon.battle.item.white_herb.end": "%1$s è tornato alla normalità usando la sua Erba Bianca!",
-  "cobblemon.battle.item.quick_claw.end": "%1$s agisce più velocemente grazie a Rapidartigli!",
-  "cobblemon.battle.heal.z_effect": "i PS di %1$s sono stati curati grazie al Potere Z!",
+  "cobblemon.battle.item.airballoon": "%1$s floats in the air with its %2$s!",
+  "cobblemon.battle.item.recycle": "%1$s found one %2$s!",
+  "cobblemon.battle.item.frisk": "%3$s frisked %1$s and found its %2$s!",
+  "cobblemon.battle.item.thief": "%1$s stole %3$s's %2$s!",
+  "cobblemon.battle.item.harvest": "%1$s harvested one %2$s!",
+  "cobblemon.battle.item.bestow": "%1$s received %2$s from %3$s!",
+  "cobblemon.battle.item.trick": "%1$s obtained one %2$s.",
+  "cobblemon.battle.item.eat": "%1$s ate its %2$s.",
+  "cobblemon.battle.enditem.eat": "%1$s ate its %2$s!",
+  "cobblemon.battle.enditem.fling": "%1$s flung its %2$s!",
+  "cobblemon.battle.enditem.knockoff": "%3$s knocked off %1$s's %2$s!",
+  "cobblemon.battle.enditem.gem": "The %2$s strengthened %1$s's power!",
+  "cobblemon.battle.enditem.incinerate": "%1$s's %2$s was burned up!",
+  "cobblemon.battle.enditem.airballoon": "%1$s's Air Balloon popped!",
+  "cobblemon.battle.enditem.redcard": "%1$s held up its Red Card against %3$s!",
+  "cobblemon.battle.enditem.pluck": "%3$s stole and ate %1$s's %2$s!",
+  "cobblemon.battle.enditem.berryjuice": "%1$s's Berry Juice activated!",
+  "cobblemon.battle.enditem.generic": "%1$s used its %2$s!",
+  "cobblemon.battle.enditem.mentalherb": "%1$s shook off mental effects due to its Mental Herb!",
+  "cobblemon.battle.enditem.powerherb": "%1$s became fully charged due to its Power Herb!",
+  "cobblemon.battle.enditem.mirrorherb": "%1$s copied stat changes with its Mirror Herb!",
+  "cobblemon.battle.enditem.whiteherb": "%1$s returned its status to normal using its White Herb!",
+  "cobblemon.battle.heal.zeffect": "%1$s's HP was restored by the Z-Power!",
  "cobblemon.battle.heal.wish": "Il desiderio di %1$s si è avverato!",
  "cobblemon.battle.heal.drain": "Sono stati sottratti PS a %1$s!",
-  "cobblemon.battle.heal.healing_wish": "Il desiderio di cura si è avverato per %1$s!",
-  "cobblemon.battle.heal.revival_blessing": "%1$s torna in forze!",
-  "cobblemon.battle.heal.aqua_ring": "Un velo d'acqua ha curato i PS di %1$s!",
+  "cobblemon.battle.heal.healingwish": "The healing wish came true for %1$s!",
+  "cobblemon.battle.heal.revivalblessing": "%1$s was revived and is ready to fight again!",
+  "cobblemon.battle.heal.aquaring": "A veil of water restored %1$s's HP!",
  "cobblemon.battle.heal.ingrain": "%1$s ha assorbito sostanze nutritive attraverso le sue radici!",
-  "cobblemon.battle.heal.grassy_terrain": "I PS di %1$s sono stati ripristinati.",
-  "cobblemon.battle.heal.leftovers": "%1$s ha ripristinato un po' di HP usando i suoi Avanzi!",
-  "cobblemon.battle.heal.rain_dish": "%1$s ha recuperato HP da Copripioggia!",
+  "cobblemon.battle.heal.grassyterrain": "%1$s's HP was restored.",
+  "cobblemon.battle.heal.leftovers": "%1$s restored a little HP using its %2$s!",
+  "cobblemon.battle.heal.item": "%1$s restored HP using its %2$s!",
+  "cobblemon.battle.heal.raindish": "%1$s restored HP from Rain Dish!",
  "cobblemon.battle.heal.generic": "%1$s ha ripristinato i suoi PS.",
+  "cobblemon.battle.heal.bagitempotion": "It restored %1$s's HP",
+  "cobblemon.battle.curestatus.naturalcure": "%1$s is cured by its Natural Cure!",
+  "cobblemon.battle.bagitem.use": "%1$s used a %2$s on %3$s!",
+  "cobblemon.battle.bagitem.cannot": "You cannot use items right now.",
+  "cobblemon.battle.bagitem.invalid": "This item would not work.",
+  "cobblemon.battle.zpower": "%1$s surrounded itself with its Z-Power!",
+  "cobblemon.battle.zbroken": "%1$s couldn't fully protect itself and got hurt!",
+  "cobblemon.battle.terastallize": "%1$s has Terastallized into the %2$s-type!",
+  "cobblemon.battle.detailschange.mega": "%1$s is reacting to the Key Stone!",
+  "cobblemon.battle.mega": "%1$s has Mega Evolved!",
  "cobblemon.experience.gained": "%1$s riceve %2$s punti Esp.",
  "cobblemon.experience.level_up": "%1$s ha raggiunto il livello %2$s!",
  "cobblemon.experience.learned_move": "%1$s ha imparato %2$s.",
@@ -609,16 +1024,19 @@
  "cobblemon.move.category.status": "Stato",
  "cobblemon.status.sleep.apply": "%1$s si è addormentato!",
  "cobblemon.status.sleep.is": "%1$s stà dormendo.",
-  "cobblemon.status.sleep.woke": "%1$s si è svegliato!",
+  "cobblemon.status.sleep.cure": "%1$s si è svegliato!",
  "cobblemon.status.paralysis.apply": "%1$s è stato paralizzato! Forse non riuscirà ad agire!",
  "cobblemon.status.paralysis.is": "%1$s è paralizzato! Non può agire!",
+  "cobblemon.status.paralysis.cure": "%1$s è stato curato dalla paralisi!",
  "cobblemon.status.poison.apply": "%1$s è stato avvelenato!",
+  "cobblemon.status.poison.cure": "%1$s è stato curato dall'avvelenamento!",
  "cobblemon.status.poisonbadly.apply": "%1$s è stato iperavvelenato!",
  "cobblemon.status.poison.hurt": "Il veleno ha effetto su %1$s!",
  "cobblemon.status.burn.apply": "%1$s è stato scottato!",
  "cobblemon.status.burn.hurt": "%1$s soffre per la scottatura!",
+  "cobblemon.status.burn.cure": "%1$s è stato curato dalla scottatura!",
  "cobblemon.status.frozen.apply": "%1$s è stato congelato!",
-  "cobblemon.status.frozen.thawed": "%1$s si è scongelato!",
+  "cobblemon.status.frozen.cure": "%1$s si è scongelato!",
  "cobblemon.status.frozen.is": "%1$s è congelato!",
  "block.cobblemon.dawn_stone_ore": "Minerale di pietralbore",
  "block.cobblemon.dusk_stone_ore": "Minerale di neropietra",
@@ -641,10 +1059,47 @@
  "block.cobblemon.deepslate_thunder_stone_ore": "Minerale di pietratuono in ardesia profonda",
  "block.cobblemon.deepslate_water_stone_ore": "Minerale di pietraidrica in ardesia profonda",
  "block.cobblemon.dripstone_moon_stone_ore": "Minerale di pietralunare in speleotema",
+  "block.cobblemon.pasture": "Blocco Pascolo",
  "gamerule.doPokemonSpawning": "Generazione dei Pokémon",
+  "gamerule.doShinyStarters": "Starters will be shiny",
  "cobblemon.command.checkspawns.invalid-bucket": "Bucket di generazione non valido",
  "cobblemon.command.checkspawns.spawns": "Generazioni possibili",
  "cobblemon.command.checkspawns.nothing": "Nulla può venire generato in questo momento.",
+  "cobblemon.interaction.ev.add": "%1$s' %2$s EVs increased by %3$s!",
+  "cobblemon.interaction.ev.deduct": "%1$s' %2$s EVs decreased by %3$s!",
+  "cobblemon.interaction.pp.restore": "You restore the PP of %1$s.",
+  "cobblemon.interaction.friendsip.add": "%1$s grows closer to you!",
+  "cobblemon.interaction.status.cure": "%1$s is cured of its status condition!",
+  "cobblemon.interaction.hp.heal": "%1$s restored its HP a bit!",
+  "tag.item.cobblemon.apricorn_logs": "Apricorn Logs",
+  "tag.item.cobblemon.apricorn_sprouts": "Apricorn Sprouts",
+  "tag.item.cobblemon.apricorns": "Apricorns",
+  "tag.item.cobblemon.azalea_tree": "Azalea Trees",
+  "tag.item.cobblemon.berries": "Bacche",
+  "tag.item.cobblemon.cobblemon_seeds": "Semi",
+  "tag.item.cobblemon.evolution_items": "Evolution Items",
+  "tag.item.cobblemon.evolution_stones": "Evolution Stones",
+  "tag.item.cobblemon.experience_candies": "Experience Candies",
+  "tag.item.cobblemon.held.destiny_knot": "Destiny Knots",
+  "tag.item.cobblemon.held.everstone": "Everstones",
+  "tag.item.cobblemon.held.experience_share": "Condividi Esperienza",
+  "tag.item.cobblemon.held.is_held_item": "Held Items",
+  "tag.item.cobblemon.held.lucky_egg": "Fortunuovo",
+  "tag.item.cobblemon.held.power_anklet": "Power Anklets",
+  "tag.item.cobblemon.held.power_band": "Power Bands",
+  "tag.item.cobblemon.held.power_belt": "Power Belts",
+  "tag.item.cobblemon.held.power_bracer": "Power Bracers",
+  "tag.item.cobblemon.held.power_lens": "Power Lenses",
+  "tag.item.cobblemon.held.power_weight": "Power Weights",
+  "tag.item.cobblemon.herbs": "Herbs",
+  "tag.item.cobblemon.mint_leaf": "Mint Leaves",
+  "tag.item.cobblemon.mints": "Mente",
+  "tag.item.cobblemon.mutated_berries": "Mutation Berries",
+  "tag.item.cobblemon.plants": "Piante",
+  "tag.item.cobblemon.poke_balls": "Poké Ball",
+  "tag.item.cobblemon.protein_ingredients": "Protein Ingredients",
+  "tag.item.cobblemon.zinc_ingredients": "Zinc Ingredients",
+  "tag.item.cobblemon.seeds": "Semi",

  "cobblemon.ability.adaptability": "Adattabilità",
  "cobblemon.ability.adaptability.desc": "Potenzia di molto le mosse dello stesso tipo del Pokémon.",
@@ -1,5 +1,4 @@
 {
-  "itemGroup.cobblemon.pokeball": "ボール",
  "item.cobblemon.poke_ball": "モンスターボール",
  "item.cobblemon.slate_ball": "ブラックボール",
  "item.cobblemon.azure_ball": "ブルーボール",
@@ -32,13 +31,13 @@
  "item.cobblemon.park_ball": "パークボール",
  "item.cobblemon.dream_ball": "ドリームボール",
  "item.cobblemon.beast_ball": "ウルトラボール",
-  "item.cobblemon.black_apricorn_seed": "くろぼんぐりの種",
-  "item.cobblemon.blue_apricorn_seed": "あおぼんぐりの種",
-  "item.cobblemon.green_apricorn_seed": "みどぼんぐりの種",
-  "item.cobblemon.pink_apricorn_seed": "ももぼんぐりの種",
-  "item.cobblemon.red_apricorn_seed": "あかぼんぐりの種",
-  "item.cobblemon.white_apricorn_seed": "しろぼんぐりの種",
-  "item.cobblemon.yellow_apricorn_seed": "きぼんぐりの種",
+  "item.cobblemon.black_apricorn_seed": "くろぼんぐりの新芽",
+  "item.cobblemon.blue_apricorn_seed": "あおぼんぐりの新芽",
+  "item.cobblemon.green_apricorn_seed": "みどぼんぐりの新芽",
+  "item.cobblemon.pink_apricorn_seed": "ももぼんぐりの新芽",
+  "item.cobblemon.red_apricorn_seed": "あかぼんぐりの新芽",
+  "item.cobblemon.white_apricorn_seed": "しろぼんぐりの新芽",
+  "item.cobblemon.yellow_apricorn_seed": "きぼんぐりの新芽",
  "item.cobblemon.black_apricorn": "くろぼんぐり",
  "item.cobblemon.blue_apricorn": "あおぼんぐり",
  "item.cobblemon.green_apricorn": "みどぼんぐり",
@@ -46,7 +45,8 @@
  "item.cobblemon.red_apricorn": "あかぼんぐり",
  "item.cobblemon.white_apricorn": "しろぼんぐり",
  "item.cobblemon.yellow_apricorn": "きぼんぐり",
-  "itemGroup.cobblemon.evolution_item": "進化アイテム",
+  "item.cobblemon.vivichoke_seeds": "ゲンキノツボミの種",
+  "item.cobblemon.vivichoke": "ゲンキノツボミ",
  "item.cobblemon.link_cable": "つながりのヒモ",
  "item.cobblemon.dragon_scale": "りゅうのうろこ",
  "item.cobblemon.kings_rock": "おうじゃのしるし",
@@ -88,7 +88,6 @@
  "item.cobblemon.sun_stone": "たいようのいし",
  "item.cobblemon.thunder_stone": "かみなりのいし",
  "item.cobblemon.water_stone": "みずのいし",
-  "itemGroup.cobblemon.medicine": "くすり",
  "item.cobblemon.rare_candy": "ふしぎなアメ",
  "item.cobblemon.exp_candy_xs": "けいけんアメXS",
  "item.cobblemon.exp_candy_s": "けいけんアメS",
@@ -101,10 +100,47 @@
  "item.cobblemon.iron": "ブロムヘキシン",
  "item.cobblemon.protein": "タウリン",
  "item.cobblemon.zinc": "キトサン",
-  "itemGroup.cobblemon.held_item": "もちもの",
+  "item.cobblemon.potion": "Potion",
+  "item.cobblemon.super_potion": "Super Potion",
+  "item.cobblemon.hyper_potion": "Hyper Potion",
+  "item.cobblemon.max_potion": "Max Potion",
+  "item.cobblemon.full_restore": "Full Restore",
+  "item.cobblemon.red_mint_leaf": "あかミントの葉",
+  "item.cobblemon.red_mint_leaf.tooltip": "捕まえたポケモンの攻撃が上がりやすくなる",
+  "item.cobblemon.blue_mint_leaf": "あおミントの葉",
+  "item.cobblemon.blue_mint_leaf.tooltip": "捕まえたポケモンの防御が上がりやすくなる",
+  "item.cobblemon.cyan_mint_leaf": "あおみどミントの葉",
+  "item.cobblemon.cyan_mint_leaf.tooltip": "捕まえたポケモンの特攻が上がりやすくなる",
+  "item.cobblemon.pink_mint_leaf": "ももミントの葉",
+  "item.cobblemon.pink_mint_leaf.tooltip": "捕まえたポケモンの特防が上がりやすくなる",
+  "item.cobblemon.green_mint_leaf": "みどミントの葉",
+  "item.cobblemon.green_mint_leaf.tooltip": "捕まえたポケモンの素早さが上がりやすくなる",
+  "item.cobblemon.white_mint_leaf": "しろミントの葉",
+  "item.cobblemon.white_mint_leaf.tooltip": "捕まえたポケモンが万遍なく育つ",
+  "item.cobblemon.lonely_mint": "さみしがりミント",
+  "item.cobblemon.adamant_mint": "いじっぱりミント",
+  "item.cobblemon.naughty_mint": "やんちゃミント",
+  "item.cobblemon.brave_mint": "ゆうかんミント",
+  "item.cobblemon.bold_mint": "ずぶといミント",
+  "item.cobblemon.impish_mint": "わんぱくミント",
+  "item.cobblemon.lax_mint": "のうてんきミント",
+  "item.cobblemon.relaxed_mint": "のんきミント",
+  "item.cobblemon.modest_mint": "ひかえめミント",
+  "item.cobblemon.mild_mint": "おっとりミント",
+  "item.cobblemon.rash_mint": "うっかりやミント",
+  "item.cobblemon.quiet_mint": "れいせいミント",
+  "item.cobblemon.calm_mint": "おだやかミント",
+  "item.cobblemon.gentle_mint": "おとなしいミント",
+  "item.cobblemon.careful_mint": "しんちょうミント",
+  "item.cobblemon.sassy_mint": "なまいきミント",
+  "item.cobblemon.timid_mint": "おくびょうミント",
+  "item.cobblemon.hasty_mint": "せっかちミント",
+  "item.cobblemon.jolly_mint": "ようきミント",
+  "item.cobblemon.naive_mint": "むじゃきミント",
+  "item.cobblemon.serious_mint": "まじめミント",
  "item.cobblemon.assault_vest": "とつげきチョッキ",
  "item.cobblemon.auspicious_armor": "イワイノヨロイ",
-  "item.cobblemon.big_root": "おおきなねっこ",
+  "item.cobblemon.malicious_armor": "Malicious Armor",
  "item.cobblemon.black_belt": "くろおび",
  "item.cobblemon.black_glasses": "くろいメガネ",
  "item.cobblemon.black_sludge": "くろいヘドロ",
@@ -138,6 +174,21 @@
  "item.cobblemon.spell_tag": "のろいのおふだ",
  "item.cobblemon.twisted_spoon": "まがったスプーン",
  "item.cobblemon.wise_glasses": "ものしりメガネ",
+  "item.cobblemon.mental_herb": "Mental Herb",
+  "item.cobblemon.mirror_herb": "Mirror Herb",
+  "item.cobblemon.power_herb": "Power Herb",
+  "item.cobblemon.white_herb": "White Herb",
+  "item.cobblemon.bright_powder": "Bright Powder",
+  "item.cobblemon.metal_powder": "Metal Powder",
+  "item.cobblemon.quick_powder": "Quick Powder",
+  "item.cobblemon.destiny_knot": "Destiny Knot",
+  "item.cobblemon.everstone": "Everstone",
+  "item.cobblemon.power_anklet": "Power Anklet",
+  "item.cobblemon.power_band": "Power Band",
+  "item.cobblemon.power_belt": "Power Belt",
+  "item.cobblemon.power_bracer": "Power Bracer",
+  "item.cobblemon.power_lens": "Power Lens",
+  "item.cobblemon.power_weight": "Power Weight",
  "item.cobblemon.poke_ball.tooltip": "捕獲率1倍",
  "item.cobblemon.slate_ball.tooltip": "捕獲率1倍",
  "item.cobblemon.azure_ball.tooltip": "捕獲率1倍",
@@ -170,6 +221,56 @@
  "item.cobblemon.park_ball.tooltip": "草原と森林バイオームに棲むポケモンに対して2.5倍",
  "item.cobblemon.dream_ball.tooltip": "ねむり状態のポケモンに対して4倍",
  "item.cobblemon.beast_ball.tooltip": "ウルトラビーストに対して5倍、それ以外は0.1倍",
+  "item.cobblemon.mulch_base": "こやし",
+  "item.cobblemon.coarse_mulch": "ざらざらこやし",
+  "item.cobblemon.growth_mulch": "すくすくこやし",
+  "item.cobblemon.humid_mulch": "じめじめこやし",
+  "item.cobblemon.loamy_mulch": "くろくろこやし",
+  "item.cobblemon.peat_mulch": "でいたんこやし",
+  "item.cobblemon.rich_mulch": "たわわこやし",
+  "item.cobblemon.sandy_mulch": "すなすなこやし",
+  "item.cobblemon.surprise_mulch": "びっくりこやし",
+  "item.cobblemon.medicinal_leek": "クスリソウ",
+  "item.cobblemon.energy_root": "ちからのねっこ",
+  "item.cobblemon.revival_herb": "ふっかつそう",
+  "item.cobblemon.roasted_leek": "焼きながねぎ",
+  "item.cobblemon.leek_and_potato_stew": "ながねぎとポテトシチュー",
+  "item.cobblemon.braised_vivichoke": "煮込みゲンキノツボミ",
+  "item.cobblemon.vivichoke_dip": "Vivichoke Dip",
+  "item.cobblemon.berry_juice": "Berry Juice",
+  "item.cobblemon.remedy": "カンポーやく",
+  "item.cobblemon.fine_remedy": "いいカンポーやく",
+  "item.cobblemon.superb_remedy": "すごいカンポーやく",
+  "item.cobblemon.heal_powder": "ばんのうごな",
+  "item.cobblemon.medicinal_brew": "クスリチャ",
+  "item.cobblemon.revive": "げんきのかけら",
+  "item.cobblemon.max_revive": "げんきのかたまり",
+  "item.cobblemon.pp_up": "ポイントアップ",
+  "item.cobblemon.pp_max": "ポイントマックス",
+  "item.cobblemon.x_attack": "プラスパワー",
+  "item.cobblemon.x_defence": "X Defense",
+  "item.cobblemon.x_accuracy": "ヨクアタール",
+  "item.cobblemon.x_speed": "スピーダー",
+  "item.cobblemon.x_special_defence": "X Special Defense",
+  "item.cobblemon.x_special_attack": "X Special Attack",
+  "item.cobblemon.dire_hit": "Dire Hit",
+  "item.cobblemon.guard_spec": "Guard Spec",
+  "item.cobblemon.full_heal": "Full Heal",
+  "item.cobblemon.antidote": "Antidote",
+  "item.cobblemon.awakening": "Awakening",
+  "item.cobblemon.burn_heal": "Burn Heal",
+  "item.cobblemon.ice_heal": "Ice Heal",
+  "item.cobblemon.paralyze_heal": "Paralyze Heal",
+  "item.cobblemon.ether": "Ether",
+  "item.cobblemon.max_ether": "Max Ether",
+  "item.cobblemon.elixir": "Elixir",
+  "item.cobblemon.max_elixir": "Max Elixir",
+  "itemGroup.cobblemon.blocks": "ブロック",
+  "itemGroup.cobblemon.pokeball": "ボール",
+  "itemGroup.cobblemon.agriculture": "農業",
+  "itemGroup.cobblemon.consumables": "消費アイテム",
+  "itemGroup.cobblemon.held_item": "もちもの",
+  "itemGroup.cobblemon.evolution_item": "進化アイテム",
  "block.cobblemon.apricorn_log": "ぼんぐりの原木",
  "block.cobblemon.stripped_apricorn_log": "樹皮を剥いだぼんぐりの原木",
  "block.cobblemon.apricorn_wood": "ぼんぐりの木",
@@ -183,6 +284,7 @@
  "block.cobblemon.apricorn_button": "ぼんぐりのボタン",
  "block.cobblemon.apricorn_slab": "ぼんぐりのハーフブロック",
  "block.cobblemon.apricorn_fence_gate": "ぼんぐりのフェンスゲート",
+  "block.cobblemon.big_root": "Big Root",
  "block.cobblemon.black_apricorn_sapling": "くろぼんぐりの苗木",
  "block.cobblemon.blue_apricorn_sapling": "あおぼんぐりの苗木",
  "block.cobblemon.green_apricorn_sapling": "みどぼんぐりの苗木",
@@ -196,12 +298,24 @@
  "block.cobblemon.healing_machine.tooltip1": "設置後にチャージが必要",
  "block.cobblemon.healing_machine.tooltip2": "時間の経過とともにチャージされる",
  "block.cobblemon.pc": "パソコン",
+  "block.cobblemon.red_mint": "あかミントの種",
+  "block.cobblemon.blue_mint": "あおミントの種",
+  "block.cobblemon.cyan_mint": "あおみどミントの種",
+  "block.cobblemon.pink_mint": "ももミントの種",
+  "block.cobblemon.green_mint": "みどミントの種",
+  "block.cobblemon.white_mint": "しろミントの種",
+  "block.cobblemon.vivichoke_seeds": "ゲンキノツボミの種",
+  "block.cobblemon.pep_up_flower": "Pep-Up Flower",
+  "block.cobblemon.potted_pep_up_flower": "Potted Pep-Up Flower",
  "cobblemon.overflow_no_pc": "てもちがいっぱいだけど、パソコンがない！",
  "cobblemon.overflow_no_space": "てもちがいっぱいで、%1$sも満杯だ！",
  "cobblemon.overflow_to_pc": "てもちがいっぱいだ！ %1$sは%2$sに転送された！",
  "cobblemon.your_pc": "あなたのパソコン",
  "cobblemon.command.pokespawn.invalid-pokemon": "無効なポケモン名",
  "cobblemon.command.pokespawn.invalid-move": "無効なわざ名",
+  "cobblemon.command.clearparty.nonethere": "%1$sのてもちにポケモンがいません",
+  "cobblemon.command.clearparty.cleared": "%1$sのてもちを消去しました",
+  "cobblemon.command.clearpc.cleared": "Cleared %1$s's PC.",
  "cobblemon.ui.generic.yes": "はい",
  "cobblemon.ui.generic.no": "いいえ",
  "cobblemon.ui.pokenav.title": "ポケナビ",
@@ -211,6 +325,8 @@
  "cobblemon.ui.starter.alreadyselected": "もう最初の一匹を選んだ！",
  "cobblemon.ui.starter.cannotchoose": "今は最初の一匹を選べない！",
  "cobblemon.ui.starter.hasalreadychosen": "%1$sはもう最初の一匹を選んだ！",
+  "cobblemon.ui.starter.choose_starter_title": "最初のポケモンを選ぼう！",
+  "cobblemon.ui.starter.choose_starter_description": "”%1$s”キーを押す",
  "cobblemon.ui.starter.chooseyourstarter": "%1$sを押して最初の一匹を選んで、旅を始めよう！",
  "cobblemon.ui.moves": "わざ",
  "cobblemon.ui.moves.switch": "わざの入れ替え",
@@ -237,6 +353,12 @@
  "cobblemon.ui.info.ability": "とくせい",
  "cobblemon.ui.info.experience_points": "現在の経験値",
  "cobblemon.ui.info.to_next_level": "次のレベルまで",
+  "cobblemon.ui.trade": "交換",
+  "cobblemon.trade.occupied": "%1$sは それどころじゃない",
+  "cobblemon.trade.request_expired": "%1$sとの 交換の 申し込みは タイムアウトしてしまった",
+  "cobblemon.trade.request_already_expired": "彼らの 交換の 申し込みは すでに タイムアウトしている",
+  "cobblemon.trade.request_sent": "%1$sとの 交換の 申し込み",
+  "cobblemon.trade.offer": "%1$sが ポケモン交換を 申し込んできた",
  "cobblemon.ui.party": "てもち",
  "cobblemon.ui.power": "いりょく",
  "cobblemon.ui.accuracy": "めいちゅう",
@@ -245,6 +367,10 @@
  "cobblemon.ui.exit": "閉じる",
  "cobblemon.ui.pc.box.title": "ボックス%1$s",
  "cobblemon.ui.pc.release": "逃がす",
+  "cobblemon.ui.pasture": "ぼくじょう",
+  "cobblemon.ui.pasture.recall_all": "全て入れ替える",
+  "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)",
+  "cobblemon.pasture.too_many_nearby": "近くに ポケモンが 多すぎる！",
  "key.cobblemon.upshiftparty": "てもちの上を選択",
  "key.cobblemon.downshiftparty": "てもちの下を選択",
  "key.cobblemon.hideparty": "てもちの表示",
@@ -291,9 +417,150 @@
  "cobblemon.label.lv": "Lv. %1$s",
  "cobblemon.challenge_label": "%1$sを押して戦闘",
  "cobblemon.challenge.sender": "%1$sに 勝負を しかけた！",
-  "cobblemon.challenge.receiver": "%1$sが 勝負を しかけてきた！ 勝負を始めるには目と目を合わせて%2$sを押す",
+  "cobblemon.challenge.receiver": "%1$sが 勝負を しかけてきた！",
  "cobblemon.drop.item.inventory": "%2$sを 受け取った！ (%1$sx)",
  "cobblemon.drop.item.full": "インベントリがいっぱい！ %1$sはドロップされた！",
+  "cobblemon.mint.interact": "%1$sの 能力に 変化が 起きたようだ",
+  "cobblemon.mint.same_nature": "%1$sに %2$sを使っても 効果がないよ",
+  "itemGroup.cobblemon.plants": "Plants",
+  "item.cobblemon.aguav_berry": "Aguav Berry",
+  "item.cobblemon.aguav_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -SpD Nature",
+  "item.cobblemon.apicot_berry": "Apicot Berry",
+  "item.cobblemon.apicot_berry.tooltip": "Raises holder's Sp. Def by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.aspear_berry": "Aspear Berry",
+  "item.cobblemon.aspear_berry.tooltip": "Holder is cured if it is frozen",
+  "item.cobblemon.babiri_berry": "Babiri Berry",
+  "item.cobblemon.babiri_berry.tooltip": "Halves damage taken from a supereffective Steel-type attack",
+  "item.cobblemon.belue_berry": "Belue Berry",
+  "item.cobblemon.belue_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.bluk_berry": "Bluk Berry",
+  "item.cobblemon.bluk_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.charti_berry": "Charti Berry",
+  "item.cobblemon.charti_berry.tooltip": "Halves damage taken from a supereffective Rock-type attack",
+  "item.cobblemon.cheri_berry": "Cheri Berry",
+  "item.cobblemon.cheri_berry.tooltip": "Holder cures itself if it is paralyzed",
+  "item.cobblemon.chesto_berry": "Chesto Berry",
+  "item.cobblemon.chesto_berry.tooltip": "Holder wakes up if it is asleep",
+  "item.cobblemon.chilan_berry": "Chilan Berry",
+  "item.cobblemon.chilan_berry.tooltip": "Halves damage taken from a Normal-type attack",
+  "item.cobblemon.chople_berry": "Chople Berry",
+  "item.cobblemon.chople_berry.tooltip": "Halves damage taken from a supereffective Fighting-type attack",
+  "item.cobblemon.coba_berry": "Coba Berry",
+  "item.cobblemon.coba_berry.tooltip": "Halves damage taken from a supereffective Flying-type attac",
+  "item.cobblemon.colbur_berry": "Colbur Berry",
+  "item.cobblemon.colbur_berry.tooltip": "Halves damage taken from a supereffective Dark-type attack",
+  "item.cobblemon.cornn_berry": "Cornn Berry",
+  "item.cobblemon.cornn_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.custap_berry": "Custap Berry",
+  "item.cobblemon.custap_berry.tooltip": "Holder moves first in its priority bracket when at 1/4 max HP or less",
+  "item.cobblemon.durin_berry": "Durin Berry",
+  "item.cobblemon.durin_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.enigma_berry": "Enigma Berry",
+  "item.cobblemon.enigma_berry.tooltip": "Restores 1/4 max HP after holder is hit by a supereffective move",
+  "item.cobblemon.figy_berry": "Figy Berry",
+  "item.cobblemon.figy_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -Atk Nature",
+  "item.cobblemon.ganlon_berry": "Ganlon Berry",
+  "item.cobblemon.ganlon_berry.tooltip": "Raises holder's Defense by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.grepa_berry": "Grepa Berry",
+  "item.cobblemon.grepa_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.haban_berry": "Haban Berry",
+  "item.cobblemon.haban_berry.tooltip": "Halves damage taken from a supereffective Dragon-type attack",
+  "item.cobblemon.hondew_berry": "Hondew Berry",
+  "item.cobblemon.hondew_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.hopo_berry": "Hopo Berry",
+  "item.cobblemon.hopo_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.iapapa_berry": "Iapapa Berry",
+  "item.cobblemon.iapapa_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -Def Nature",
+  "item.cobblemon.jaboca_berry": "Jaboca Berry",
+  "item.cobblemon.jaboca_berry.tooltip": "If holder is hit by a physical move, attacker loses 1/8 of its max HP",
+  "item.cobblemon.kasib_berry": "Kasib Berry",
+  "item.cobblemon.kasib_berry.tooltip": "Halves damage taken from a supereffective Ghost-type attack",
+  "item.cobblemon.kebia_berry": "Kebia Berry",
+  "item.cobblemon.kebia_berry.tooltip": "Halves damage taken from a supereffective Poison-type attack",
+  "item.cobblemon.kee_berry": "Kee Berry",
+  "item.cobblemon.kee_berry.tooltip": "Raises holder's Defense by 1 stage after it is hit by a physical attack",
+  "item.cobblemon.kelpsy_berry": "Kelpsy Berry",
+  "item.cobblemon.kelpsy_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.lansat_berry": "Lansat Berry",
+  "item.cobblemon.lansat_berry.tooltip": "Holder gains the Focus Energy effect when at 1/4 max HP or less",
+  "item.cobblemon.leppa_berry": "Leppa Berry",
+  "item.cobblemon.leppa_berry.tooltip": "Restores 10 PP to the first of the holder's moves to reach 0 PP",
+  "item.cobblemon.liechi_berry": "Liechi Berry",
+  "item.cobblemon.liechi_berry.tooltip": "Raises holder's Attack by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.lum_berry": "Lum Berry",
+  "item.cobblemon.lum_berry.tooltip": "Holder cures itself if it has a non-volatile status or is confused",
+  "item.cobblemon.mago_berry": "Mago Berry",
+  "item.cobblemon.mago_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -Spe Nature",
+  "item.cobblemon.magost_berry": "Magost Berry",
+  "item.cobblemon.magost_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.maranga_berry": "Maranga Berry",
+  "item.cobblemon.maranga_berry.tooltip": "Raises holder's Sp. Def by 1 stage after it is hit by a special attack",
+  "item.cobblemon.micle_berry": "Micle Berry",
+  "item.cobblemon.micle_berry.tooltip": "Holder's next move has 1.2x accuracy when at 1/4 max HP or less",
+  "item.cobblemon.nanab_berry": "Nanab Berry",
+  "item.cobblemon.nanab_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.touga_berry": "Touga Berry",
+  "item.cobblemon.touga_berry.tooltip": "Holder is cured if it is confused",
+  "item.cobblemon.nomel_berry": "Nomel Berry",
+  "item.cobblemon.nomel_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.occa_berry": "Occa Berry",
+  "item.cobblemon.occa_berry.tooltip": "Halves damage taken from a supereffective Fire-type attack",
+  "item.cobblemon.oran_berry": "Oran Berry",
+  "item.cobblemon.oran_berry.tooltip": "Restores 10 HP when at 1/2 max HP or less",
+  "item.cobblemon.pamtre_berry": "Pamtre Berry",
+  "item.cobblemon.pamtre_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.passho_berry": "Passho Berry",
+  "item.cobblemon.passho_berry.tooltip": "Halves damage taken from a supereffective Water-type attack",
+  "item.cobblemon.payapa_berry": "Payapa Berry",
+  "item.cobblemon.payapa_berry.tooltip": "Halves damage taken from a supereffective Psychic-type attack",
+  "item.cobblemon.pecha_berry": "Pecha Berry",
+  "item.cobblemon.pecha_berry.tooltip": "Holder is cured if it is poisoned",
+  "item.cobblemon.persim_berry": "Persim Berry",
+  "item.cobblemon.persim_berry.tooltip": "Holder is cured if it is confused",
+  "item.cobblemon.petaya_berry": "Petaya Berry",
+  "item.cobblemon.petaya_berry.tooltip": "Raises holder's Sp. Atk by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.pinap_berry": "Pinap Berry",
+  "item.cobblemon.pinap_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.pomeg_berry": "Pomeg Berry",
+  "item.cobblemon.pomeg_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.qualot_berry": "Qualot Berry",
+  "item.cobblemon.qualot_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.rabuta_berry": "Rabuta Berry",
+  "item.cobblemon.rabuta_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.rawst_berry": "Rawst Berry",
+  "item.cobblemon.rawst_berry.tooltip": "Holder is cured if it is burned",
+  "item.cobblemon.razz_berry": "Razz Berry",
+  "item.cobblemon.razz_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.rindo_berry": "Rindo Berry",
+  "item.cobblemon.rindo_berry.tooltip": "Halves damage taken from a supereffective Grass-type attack",
+  "item.cobblemon.roseli_berry": "Roseli Berry",
+  "item.cobblemon.roseli_berry.tooltip": "Halves damage taken from a supereffective Fairy-type attack",
+  "item.cobblemon.rowap_berry": "Rowap Berry",
+  "item.cobblemon.rowap_berry.tooltip": "If holder is hit by a special move, attacker loses 1/8 of its max HP",
+  "item.cobblemon.salac_berry": "Salac Berry",
+  "item.cobblemon.salac_berry.tooltip": "Raises holder's Speed by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.shuca_berry": "Shuca Berry",
+  "item.cobblemon.shuca_berry.tooltip": "Halves damage taken from a supereffective Ground-type attack",
+  "item.cobblemon.sitrus_berry": "Sitrus Berry",
+  "item.cobblemon.sitrus_berry.tooltip": "Restores 1/4 max HP when at 1/2 max HP or less",
+  "item.cobblemon.spelon_berry": "Spelon Berry",
+  "item.cobblemon.spelon_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.starf_berry": "Starf Berry",
+  "item.cobblemon.starf_berry.tooltip": "Raises a random stat by 2 when at 1/4 max HP or less",
+  "item.cobblemon.tamato_berry": "Tamato Berry",
+  "item.cobblemon.tamato_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.tanga_berry": "Tanga Berry",
+  "item.cobblemon.tanga_berry.tooltip": "Halves damage taken from a supereffective Bug-type attack",
+  "item.cobblemon.wacan_berry": "Wacan Berry",
+  "item.cobblemon.wacan_berry.tooltip": "Halves damage taken from a supereffective Electric-type attack",
+  "item.cobblemon.watmel_berry": "Watmel Berry",
+  "item.cobblemon.watmel_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.wepear_berry": "Wepear Berry",
+  "item.cobblemon.wepear_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.wiki_berry": "Wiki Berry",
+  "item.cobblemon.wiki_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -SpA Nature",
+  "item.cobblemon.yache_berry": "Yache Berry",
+  "item.cobblemon.yache_berry.tooltip": "Halves damage taken from a supereffective Ice-type attack",
  "cobblemon.command.general.invalid-party-slot": "スロット%1$sにポケモンがいません",
  "cobblemon.command.givepokemon.give": "%2$sに %1$s を与えました",
  "cobblemon.command.pokemonedit": "%2$sの %1$s を編集しました",
@@ -305,10 +572,19 @@
  "cobblemon.command.spawnpokemon.nospecies": "ポケモンの名前か「random」を入力する必要があります",
  "cobblemon.command.held_item": "%1$sの %2$s に %3$s を持たせました",
  "cobblemon.command.pokeheal.in_battle": "戦闘中に回復はできません",
+  "cobblemon.command.spawnpokemonfrompool": "%1$s をこのエリアにスポーンさせました",
+  "cobblemon.command.spawnpokemonfrompool.unable_to_spawn": "ポケモンをスポーンできません",
+  "cobblemon.command.pokebox.box_does_not_exist": "そのプレイヤーはボックス%1$sを持ってません",
+  "cobblemon.command.pokebox.box_is_full": "そのプレイヤーのボックス%1$sがいっぱいです",
+  "cobblemon.command.pokebox.storage_is_full": "そのプレイヤーのパソコンがいっぱいです",
+  "cobblemon.command.pokebox.last_pokemon": "そのプレイヤーの最後のポケモンをパソコンに送ることはできません",
+  "cobblemon.command.pokemonrestart": "%1$sのてもちとPCを消去しました",
  "advancements.cobblemon.root": "Cobblemonの世界へ ようこそ！",
+  "advancements.cobblemon.root.description": "最初の一匹を選び、新たな旅にでる",
  "advancements.cobblemon.obtain_leftovers": "リデュース、リユース、リサイクル!",
  "advancements.cobblemon.obtain_leftovers.description": "リンゴを食べてたべのこしを出す",
-  "advancements.cobblemon.root.description": "最初の一匹を選び、新たな旅にでる",
+  "advancements.cobblemon.any_plant": "Mother Nature's Bounty",
+  "advancements.cobblemon.any_plant.description": "Hope you've got a green thumb!",
  "advancements.cobblemon.harvest_apricorn": "木に実るもの",
  "advancements.cobblemon.harvest_apricorn.description": "ぼんぐりを収穫する",
  "advancements.cobblemon.harvest_apricorn_seed": "新たなる命",
@@ -328,7 +604,7 @@
  "advancements.cobblemon.first_catch": "ぼっち卒業",
  "advancements.cobblemon.first_catch.description": "モンスターボールを投げて、ポケモンを捕まえる",
  "advancements.cobblemon.full_party": "フルハウス",
-  "advancements.cobblemon.full_party.description": "てもちをいっぱいにする",
+  "advancements.cobblemon.full_party.description": "Catch more Pokémon and make a full party of 6",
  "advancements.cobblemon.first_evolution": "てれ てれん",
  "advancements.cobblemon.first_evolution.description": "進化条件を満たし、ポケモンを進化させる",
  "advancements.cobblemon.first_battle_victory": "勝利は目の前？",
@@ -337,6 +613,55 @@
  "advancements.cobblemon.first_shiny_catch.description": "色違いのポケモンを捕まえる",
  "advancements.cobblemon.healing_machine": "回復は最大の攻撃",
  "advancements.cobblemon.healing_machine.description": "かいふく装置をチャージして、てもちを回復してあげる",
+  "advancements.cobblemon.obtain_leek": "There's a Leek in the Boat!",
+  "advancements.cobblemon.obtain_leek.description": "Obtain a Medicinal Leek, a wild crop that grows in freshwater",
+  "advancements.cobblemon.medicinal_brew": "Local Apothecary",
+  "advancements.cobblemon.medicinal_brew.description": "Brew a Medicinal Leek to create the basis for your healing needs",
+  "advancements.cobblemon.brew_potion": "You cannot handle my Potions",
+  "advancements.cobblemon.brew_potion.description": "Brew an Oran Berry into Medicinal Brew to create a Potion",
+  "advancements.cobblemon.brew_full_restore": "Champion's Choice",
+  "advancements.cobblemon.brew_full_restore.description": "Follow the brewing tree and create a Full Restore with a Lum Berry and Max Potion",
+  "advancements.cobblemon.brew_all": "Double Double Toil & Trouble",
+  "advancements.cobblemon.brew_all.description": "Brew every possible item using Medicinal Brew",
+  "advancements.cobblemon.obtain_mint": "Minty Fresh",
+  "advancements.cobblemon.obtain_mint.description": "Obtain a Nature Mint, a wild crop that grows high in the mountains",
+  "advancements.cobblemon.obtain_all_mints": "A Big Commit-mint",
+  "advancements.cobblemon.obtain_all_mints.description": "Obtain all 6 colors of Nature Mint and gain access to a full array of natures",
+  "advancements.cobblemon.obtain_revival_herb": "Herb your Enthusiasm",
+  "advancements.cobblemon.obtain_revival_herb.description": "Obtain a Revival Herb, a wild crop that grows in lush caves",
+  "advancements.cobblemon.use_revive": "Live to fight another day!",
+  "advancements.cobblemon.use_revive.description": "Use a Revive, Max Revive, or Revival Herb to revive a fainted Pokémon",
+  "advancements.cobblemon.obtain_big_root": "The Root of Basic Healing",
+  "advancements.cobblemon.obtain_big_root.description": "Obtain a Big Root, a wild crop that grows in dirt caves close to the surface",
+  "advancements.cobblemon.craft_remedy": "Basic Healing",
+  "advancements.cobblemon.craft_remedy.description": "Craft a Remedy, an early-game healing item that can be crafted into stronger forms",
+  "advancements.cobblemon.obtain_vivichoke": "Oki-Doki Vivichokey",
+  "advancements.cobblemon.obtain_vivichoke.description": "Obtain a Vivichoke, grown from strangely scarce Vivichoke Seeds",
+  "advancements.cobblemon.obtain_berry": "Very Berry",
+  "advancements.cobblemon.obtain_berry.description": "Obtain any Berry, wild crops that grow on the surface and have many uses",
+  "advancements.cobblemon.obtain_mutated_berry": "An Unexpected Result",
+  "advancements.cobblemon.obtain_mutated_berry.description": "Plant Berry Trees of different types next to each other and witness Mutation in action",
+  "advancements.cobblemon.obtain_all_berries": "Oops, all Berries!",
+  "advancements.cobblemon.obtain_all_berries.description": "Obtain one of every Berry in Cobblemon",
+  "advancements.cobblemon.use_pasture": "Free Roam: Enabled",
+  "advancements.cobblemon.use_pasture.description": "Craft a Pasture Block and allow your friends to wander",
+  "advancements.cobblemon.catch_all_vivillon": "Patterned Wings",
+  "advancements.cobblemon.catch_all_vivillon.description": "Obtain all patterns of Vivillon",
+  "advancements.cobblemon.evolve_veevees": "Valued Veevees",
+  "advancements.cobblemon.evolve_veevees.description": "Evolve Eevee into 8 different forms",
+  "advancements.cobblemon.evolve_shedinja": "Ghost in the Shell",
+  "advancements.cobblemon.evolve_shedinja.description": "Have an extra Poké Ball in your inventory and obtain a Shedinja",
+  "advancements.cobblemon.trade_pokemon": "Take Good Care!",
+  "advancements.cobblemon.trade_pokemon.description": "Trade a Pokémon with another Trainer",
+  "advancements.cobblemon.trade_shelmet_karrablast": "I'd like to report a theft!",
+  "advancements.cobblemon.trade_shelmet_karrablast.description": "Trade a Shelmet and Karrablast",
+  "advancements.cobblemon.max_level_baby": "Darwin? Who's That?",
+  "advancements.cobblemon.max_level_baby.description": "Take a first-stage Pokémon capable of evolution up to level 100",
+  "advancements.cobblemon.use_candy": "Sweet Tooth",
+  "advancements.cobblemon.use_candy.description": "Use any XP Candy on a Pokémon",
+  "advancements.cobblemon.own_zangoose_seviper": "Begrudging Partners",
+  "advancements.cobblemon.own_zangoose_seviper.description": "Have a Zangoose and Seviper in your party at the same time",
+  "cobblemon.battle.crash": "戦闘エラーが発生しました。シングルプレイの場合、Modチームに報告してください。そうでない場合はサーバー管理者に報告してください。",
  "cobblemon.battle.damage_dealt": "%1$sは %2$sダメージ 受けた！",
  "cobblemon.battle.used_move": "%1$sの %2$s！",
  "cobblemon.battle.used_move_on": "%1$sの %3$sへの %2$s！",
@@ -356,14 +681,19 @@
  "cobblemon.battle.crit": "急所に 当たった！",
  "cobblemon.battle.nothing": "しかし なにもおこらない！",
  "cobblemon.battle.clearallboost": "全ての ステータスが 元に 戻った!",
+  "cobblemon.battle.clearallnegativeboost": "%1$s's negative stat changes were removed!",
+  "cobblemon.battle.clearallnegativeboost.zeffect": "%1$s's returned its decreased stats to normal using its Z-Power!",
  "cobblemon.battle.unboost.slight": "%1$sの %2$sが 下がった！",
  "cobblemon.battle.unboost.sharp": "%1$sの %2$sが がくっと下がった！",
  "cobblemon.battle.unboost.severe": "%1$sの %2$sが がくーんと下がった！",
  "cobblemon.battle.unboost.cap.single": "%1$sの %2$sは もう 下がらない！",
  "cobblemon.battle.unboost.cap.multiple": "%1$sの 能力は もう 下がらない！",
  "cobblemon.battle.boost.slight": "%1$sの %2$sが 上がった！",
+  "cobblemon.battle.boost.slight.zeffect": "%1$s boosted its %2$s using its Z-Power!",
  "cobblemon.battle.boost.sharp": "%1$sの %2$sが ぐーんと上がった！",
+  "cobblemon.battle.boost.sharp.zeffect": "%1$s boosted its %2$s sharply using its Z-Power!",
  "cobblemon.battle.boost.severe": "%1$sの %2$sが ぐぐーんと上がった！",
+  "cobblemon.battle.boost.severe.zeffect": "%1$s boosted its %2$s drastically using its Z-Power!",
  "cobblemon.battle.boost.cap.single": "%1$sの %2$sは もう 上がらない！",
  "cobblemon.battle.boost.cap.multiple": "%1$sの 能力は もう 上がらない！",
  "cobblemon.battle.setboost.bellydrum": "%1$sは 体力を削って パワー全開!",
@@ -381,162 +711,247 @@
  "cobblemon.capture.not_single": "だめだ! 1匹じゃないと ねらいが 定まらない……!",
  "cobblemon.you_in_battle": "勝負の 最中に それはできない!",
  "cobblemon.battle.turn": "ターン%1$s",
-  "cobblemon.battle.rain_dance": "雨が 降り始めた!",
-  "cobblemon.battle.rain_dance_upkeep": "雨が 降っている",
-  "cobblemon.battle.sandstorm": "砂あらしが 吹き始めた!",
-  "cobblemon.battle.sandstorm_buffeted": "砂あらしが %1$sを 襲う!",
-  "cobblemon.battle.sandstorm_upkeep": "砂あらしが 吹き荒れる",
-  "cobblemon.battle.sunny_day": "日差しが 強くなった!",
-  "cobblemon.battle.sunny_day_upkeep": "日差しが 強い!",
-  "cobblemon.battle.hail": "あられが 降り始めた!",
-  "cobblemon.battle.hail_upkeep": "あられが 降っている",
-  "cobblemon.battle.hail_buffeted": "あられが %1$sを 襲う!",
-  "cobblemon.battle.no_weather": "天気が 元に戻った!",
-  "cobblemon.battle.confusion_start": "%1$sは 混乱した!",
-  "cobblemon.battle.confusion_activate": "わけも わからず 自分を 攻撃した!",
-  "cobblemon.battle.confusion_snapped": "%1$sの 混乱が 治った!",
-  "cobblemon.battle.protect_start": "%1$sは 守りの 体勢に 入った!",
-  "cobblemon.battle.protect_activate": "%1$sは 攻撃から 身を守った!",
-  "cobblemon.battle.magnitude_level": "マグニチュード%1$s!",
-  "cobblemon.battle.bide_start": "%1$sは がまんした!",
-  "cobblemon.battle.bide_activate": "%1$sは がまんしている",
-  "cobblemon.battle.bide_end": "%1$sの がまんが解かれた!",
-  "cobblemon.battle.field_start.electric_terrain": "足下に 電気が かけめぐる!",
-  "cobblemon.battle.field_start.grassy_terrain": "足下に 草がおいしげった!",
-  "cobblemon.battle.field_start.gravity": "じゅうりょくが 強くなった!",
-  "cobblemon.battle.field_start.magic_room": "持たせた 道具の 効果が なくなる 空間を 作りだした!",
-  "cobblemon.battle.field_start.misty_terrain": "足下に 霧が立ち込めた!",
-  "cobblemon.battle.field_start.mud_sport": "電気の 威力が 弱まった!",
-  "cobblemon.battle.field_start.psychic_terrain": "足元が 不思議な感じに なった!",
-  "cobblemon.battle.field_start.trick_room": "%1$sは 時空を ゆがめた!",
-  "cobblemon.battle.field_start.water_sport": "炎の 威力が 弱まった!",
-  "cobblemon.battle.field_start.wonder_room": "防御と 特防が 入れ替わる 空間を 作りだした!",
-  "cobblemon.battle.field_end.electric_terrain": "足下の 電気が 消え去った!",
-  "cobblemon.battle.field_end.grassy_terrain": "足下の 草が消え去った!",
-  "cobblemon.battle.field_end.gravity": "じゅうりょくが 元に戻った!",
-  "cobblemon.battle.field_end.magic_room": "マジックルームが 解除され 道具の 効果が 元に戻った!",
-  "cobblemon.battle.field_end.misty_terrain": "足下の 霧が消え去った!",
-  "cobblemon.battle.field_end.mud_sport": "どろあそびの 効果が なくなった!",
-  "cobblemon.battle.field_end.psychic_terrain": "足下の 不思議感が 消え去った!",
-  "cobblemon.battle.field_end.trick_room": "ゆがんだ 時空が 元に戻った!",
-  "cobblemon.battle.field_end.water_sport": "みずあそびの 効果が なくなった!",
-  "cobblemon.battle.field_end.wonder_room": "ワンダールームが 解除され 防御と 特防が 元に戻った!",
-  "cobblemon.battle.cant.generic_block": "%1$sは %2$sを 使えない!",
+  "cobblemon.battle.side_subject.ally": "味方",
+  "cobblemon.battle.side_subject.opponent": "相手",
+  "cobblemon.battle.weather.raindance.start": "雨が 降り始めた！",
+  "cobblemon.battle.weather.raindance.upkeep": "雨が 降っている",
+  "cobblemon.battle.weather.raindance.end": "The rain stopped.",
+  "cobblemon.battle.weather.sandstorm.start": "砂あらしが 吹き始めた！",
+  "cobblemon.battle.weather.sandstorm.upkeep": "砂あらしが 吹き荒れる",
+  "cobblemon.battle.weather.sandstorm.end": "The sandstorm subsided.",
+  "cobblemon.battle.weather.sunnyday.start": "日差しが 強くなった！",
+  "cobblemon.battle.weather.sunnyday.upkeep": "日差しが 強い！",
+  "cobblemon.battle.weather.sunnyday.end": "The sunlight faded.",
+  "cobblemon.battle.weather.hail.start": "あられが 降り始めた！",
+  "cobblemon.battle.weather.hail.upkeep": "あられが 降っている",
+  "cobblemon.battle.weather.hail.end": "The hail stopped.",
+  "cobblemon.battle.start.bide": "%1$sは がまんした！",
+  "cobblemon.battle.start.yawn": "%1$sの 眠気を 誘った！",
+  "cobblemon.battle.start.perish": "%1$sの 滅びのカウントが %2$sになった！",
+  "cobblemon.battle.start.leechseed": "%1$sに 種を 植えつけた！",
+  "cobblemon.battle.start.aquaring": "%1$sは 水のリングを まとった！",
+  "cobblemon.battle.start.charge": "%1$sは 充電を 始めた！",
+  "cobblemon.battle.start.taunt": "%1$sは 挑発に 乗ってしまった！",
+  "cobblemon.battle.start.autotomize": "%1$sは 身軽になった！",
+  "cobblemon.battle.start.attract": "%1$sは メロメロに なった！",
+  "cobblemon.battle.start.focusenergy": "%1$s is getting pumped!",
+  "cobblemon.battle.start.uproar": "%1$s caused an uproar!",
+  "cobblemon.battle.start.curse": "%1$s cut its own HP and put a curse on %2$s!",
+  "cobblemon.battle.start.miracleeye": "%1$s was identified!",
+  "cobblemon.battle.start.dynamax": "%1$s Dynamaxed!",
+  "cobblemon.battle.start.gmax": "%1$s Gigantamaxed!",
+  "cobblemon.battle.fieldstart.electricterrain": "足下に 電気が かけめぐる！",
+  "cobblemon.battle.fieldstart.grassyterrain": "足下に 草がおいしげった！",
+  "cobblemon.battle.fieldstart.gravity": "じゅうりょくが 強くなった！",
+  "cobblemon.battle.fieldstart.magicroom": "持たせた 道具の 効果が なくなる 空間を 作りだした！",
+  "cobblemon.battle.fieldstart.mistyterrain": "足下に 霧が立ち込めた！",
+  "cobblemon.battle.fieldstart.mudsport": "電気の 威力が 弱まった！",
+  "cobblemon.battle.fieldstart.psychicterrain": "足元が 不思議な感じに なった！",
+  "cobblemon.battle.fieldstart.trickroom": "%1$sは 時空を ゆがめた！",
+  "cobblemon.battle.fieldstart.watersport": "炎の 威力が 弱まった！",
+  "cobblemon.battle.fieldstart.wonderroom": "防御と 特防が 入れ替わる 空間を 作りだした！",
+  "cobblemon.battle.fieldend.electricterrain": "足下の 電気が 消え去った！",
+  "cobblemon.battle.fieldend.grassyterrain": "足下の 草が消え去った！",
+  "cobblemon.battle.fieldend.gravity": "じゅうりょくが 元に戻った！",
+  "cobblemon.battle.fieldend.magicroom": "マジックルームが 解除され 道具の 効果が 元に戻った！",
+  "cobblemon.battle.fieldend.mistyterrain": "足下の 霧が消え去った！",
+  "cobblemon.battle.fieldend.mudsport": "どろあそびの 効果が なくなった！",
+  "cobblemon.battle.fieldend.psychicterrain": "足下の 不思議感が 消え去った！",
+  "cobblemon.battle.fieldend.trickroom": "ゆがんだ 時空が 元に戻った！",
+  "cobblemon.battle.fieldend.watersport": "みずあそびの 効果が なくなった！",
+  "cobblemon.battle.fieldend.wonderroom": "ワンダールームが 解除され 防御と 特防が 元に戻った！",
+  "cobblemon.battle.fieldactivate.perishsong": "ほろびのうたを 聴いたポケモンは 3ターン後に 滅びてしまう！",
+  "cobblemon.battle.sidestart.stealthrock": "%1$sの 周りに とがった岩が ただよい始めた！",
+  "cobblemon.battle.sidestart.spikes": "%1$sの 足下に まきびしが 散らばった！",
+  "cobblemon.battle.sidestart.toxicspikes": "%1$sの 足下に どくびしが 散らばった！",
+  "cobblemon.battle.sidestart.stickyweb": "%1$sの 足下に ねばねばネットが 広がった！",
+  "cobblemon.battle.sidestart.reflect": "%1$sは リフレクターで 物理に 強くなった！",
+  "cobblemon.battle.sidestart.lightscreen": "%1$sは ひかりのかべで 特殊に 強くなった！",
+  "cobblemon.battle.sidestart.auroraveil": "%1$sは オーロラベールで 物理と 特殊に 強くなった！",
+  "cobblemon.battle.sidestart.tailwind": "%1$sに 追い風が 吹き始めた！",
+  "cobblemon.battle.sidestart.safeguard": "%1$s's team cloaked itself in a mystical veil!",
+  "cobblemon.battle.sideend.stealthrock": "%1$sの 周りの ステルスロックが 消え去った！",
+  "cobblemon.battle.sideend.spikes": "%1$sの 足下の まきびしが 消え去った！",
+  "cobblemon.battle.sideend.toxicspikes": "%1$sの 足下の どくびしが 消え去った！",
+  "cobblemon.battle.sideend.stickyweb": "%1$sの 足下の ねばねばネットが 消え去った！",
+  "cobblemon.battle.sideend.reflect": "%1$sの リフレクターが なくなった！",
+  "cobblemon.battle.sideend.lightscreen": "%1$sの ひかりのかべが なくなった！",
+  "cobblemon.battle.sideend.auroraveil": "%1$sの オーロラベールが なくなった！",
+  "cobblemon.battle.sideend.tailwind": "%1$sの 追い風が 止んだ！",
+  "cobblemon.battle.sideend.safeguard": "%1$s's team is no longer protected by Safeguard!",
+  "cobblemon.battle.cant.generic": "%1$sは %2$sを 使えない！",
  "cobblemon.battle.cant.truant": "%1$sは なまけている!",
-  "cobblemon.battle.cant.flinched": "%1$sは ひるんで 技が だせない!",
+  "cobblemon.battle.cant.flinch": "%1$sは ひるんで 技が だせない！",
  "cobblemon.battle.cant.recharge": "%1$sは 攻撃の 反動で 動けない!",
  "cobblemon.battle.cant.attract": "%1$sは メロメロで 技が だせなかった!",
  "cobblemon.battle.cant.disable": "%1$sは かなしばりで %2$sが だせない!",
-  "cobblemon.battle.cant.focus_punch": "%1$sは 集中が 途切れて 技が だせない!",
-  "cobblemon.battle.cant.heal_block": "%1$sは かいふくふうじで %2$sが だせない!",
+  "cobblemon.battle.cant.focuspunch": "%1$sは 集中が 途切れて 技が だせない！",
+  "cobblemon.battle.cant.healblock": "%1$sは かいふくふうじで %2$sが だせない！",
  "cobblemon.battle.cant.imprison": "%1$sは ふういんで %2$sが だせない!",
  "cobblemon.battle.cant.gravity": "%1$sは じゅうりょくが 強くて %2$sが だせない!",
-  "cobblemon.battle.cant.shell_trap": "%1$sの トラップシェルは 不発に 終わった!",
+  "cobblemon.battle.cant.shelltrap": "%1$sの トラップシェルは 不発に 終わった！",
  "cobblemon.battle.cant.taunt": "%1$sは ちょうはつされて %2$sが だせない!",
-  "cobblemon.battle.cant.throat_chop": "%1$sは じごくづきの 効果で 技が だせない!",
-  "cobblemon.battle.cant.no_pp": "%1$sの %2$s! しかし 技の 残りポイントが なかった!",
+  "cobblemon.battle.cant.throatchop": "%1$sは じごくづきの 効果で 技が だせない！",
+  "cobblemon.battle.activate.confusion": "%1$sは 混乱した！",
  "cobblemon.battle.activate.gravity": "%1$sは じゅうりょくの 影響で 空中に いられなくなった!",
-  "cobblemon.battle.activate.misty_terrain": "%1$sは ミストフィールドに 守られている!",
-  "cobblemon.battle.activate.psychic_terrain": "%1$sは サイコフィールドに 守られている!",
-  "cobblemon.battle.activate.heal_bell": "鈴の音が 響きわたった!",
+  "cobblemon.battle.activate.mistyterrain": "%1$sは ミストフィールドに 守られている！",
+  "cobblemon.battle.activate.psychicterrain": "%1$sは サイコフィールドに 守られている！",
+  "cobblemon.battle.activate.healbell": "鈴の音が 響きわたった！",
  "cobblemon.battle.activate.aromatherapy": "心地よい 香りが 広がった!",
  "cobblemon.battle.activate.trapped": "%1$sは もう 逃げられない!",
  "cobblemon.battle.activate.bind": "%2$sが %1$sを しめあげる!",
-  "cobblemon.battle.activate.court_change": "%1$sは おたがいの 場の 効果を 入れ替えた!",
-  "cobblemon.battle.activate.guard_split": "%1$sは おたがいのガードを シェアした!",
+  "cobblemon.battle.activate.wrap": "%1$sは %2$sに 巻きつかれた！",
+  "cobblemon.battle.activate.struggle": "%1$sは だすことの できる技が ない！",
+  "cobblemon.battle.activate.courtchange": "%1$sは おたがいの 場の 効果を 入れ替えた！",
+  "cobblemon.battle.activate.guardsplit": "%1$sは おたがいのガードを シェアした！",
  "cobblemon.battle.activate.spite": "%1$sの %2$sを %3$s削った!",
+  "cobblemon.battle.activate.lockon": "%1$sは %2$sに ねらいを さだめた！",
+  "cobblemon.battle.activate.protosynthesis": "%1$sは にほんばれで こだいかっせいを 発動した！",
+  "cobblemon.battle.activate.bide": "%1$sは がまんしている",
+  "cobblemon.battle.activate.protect": "%1$sは 身を 守っている！",
+  "cobblemon.battle.activate.magnitude": "マグニチュード%1$s！",
+  "cobblemon.battle.activate.destinybond": "%1$sは 相手を 道連れに しようとしている！",
+  "cobblemon.battle.activate.synchronize": "[%1$sの シンクロ]",
+  "cobblemon.battle.activate.endure": "%1$sは 攻撃を こらえた！",
+  "cobblemon.battle.activate.attract": "%1$sは %2$sに メロメロだ！",
+  "cobblemon.battle.activate.firespin": "%1$sは 炎の渦に 閉じこめられた！",
+  "cobblemon.battle.activate.trick": "%1$sは おたがいの 道具を入れ替えた!",
+  "cobblemon.battle.activate.quickclaw": "%1$sは せんせいのツメで 行動が はやくなった！",
+  "cobblemon.battle.activate.focusband": "%1$sは %2$sで もちこたえた！",
+  "cobblemon.battle.activate.forewarn": "%1$s's %2$s was revealed!",
+  "cobblemon.battle.activate.disguise": "It's disguise served it as a decoy!",
+  "cobblemon.battle.activate.liquidooze": "%1$s sucked up the liquid ooze!",
+  "cobblemon.battle.activate.whirlpool": "%1$s became trapped in the vortex!",
+  "cobblemon.battle.activate.clamp": "%2$s clamped down on %1$s!",
  "cobblemon.battle.prepare.bounce": "%1$sは 高く 飛び跳ねた!",
  "cobblemon.battle.prepare.dig": "%1$sは 地面に 潜った!",
  "cobblemon.battle.prepare.dive": "%1$sは 水中に 身を潜めた!",
  "cobblemon.battle.prepare.fly": "%1$sは 空高く 飛びあがった!",
-  "cobblemon.battle.prepare.freeze_shock": "%1$sは 冷たい光に 包まれた!",
+  "cobblemon.battle.prepare.freezeshock": "%1$sは 冷たい光に 包まれた！",
  "cobblemon.battle.prepare.geomancy": "%1$sは パワーを ためこんでいる!",
-  "cobblemon.battle.prepare.ice_burn": "%1$sは 凍える空気に 包まれた!",
-  "cobblemon.battle.prepare.meteor_beam": "%1$sに 宇宙の 力が あふれだす!",
-  "cobblemon.battle.prepare.phantom_force": "%1$sの姿が 一瞬にして 消えた!",
-  "cobblemon.battle.prepare.razor_wind": "%1$sの 周りで 空気が 渦を巻く!",
-  "cobblemon.battle.prepare.skull_bash": "%1$sは 首を 引っこめた!",
-  "cobblemon.battle.prepare.sky_attack": "%1$sを 激しい光が 包む!",
-  "cobblemon.battle.prepare.sky_drop": "%1$sは 相手を 上空に 連れ去った!",
-  "cobblemon.battle.prepare.solar_beam": "%1$sは 光を 吸収した!",
+  "cobblemon.battle.prepare.iceburn": "%1$sは 凍える空気に 包まれた！",
+  "cobblemon.battle.prepare.meteorbeam": "%1$sに 宇宙の 力が あふれだす！",
+  "cobblemon.battle.prepare.phantomforce": "%1$sの姿が 一瞬にして 消えた！",
+  "cobblemon.battle.prepare.razorwind": "%1$sの 周りで 空気が 渦を巻く！",
+  "cobblemon.battle.prepare.skullbash": "%1$sは 首を 引っこめた！",
+  "cobblemon.battle.prepare.skyattack": "%1$sを 激しい光が 包む！",
+  "cobblemon.battle.prepare.skydrop": "%1$sは 相手を 上空に 連れ去った！",
+  "cobblemon.battle.prepare.solarbeam": "%1$sは 光を 吸収した！",
  "cobblemon.battle.swapboost.generic": "%1$sは %2$sと自分の 能力変化を 入れ替えた!",
  "cobblemon.battle.singleturn.protect": "%1$sは 攻撃から 身を守った!",
  "cobblemon.battle.singleturn.endure": "%1$sは 攻撃を こらえた!",
-  "cobblemon.battle.singleturn.crafty_shield": "%1$sのチームは トリックガードで 守られた!",
+  "cobblemon.battle.singleturn.craftyshield": "%1$sのチームは トリックガードで 守られた！",
  "cobblemon.battle.singleturn.powder": "%1$sに ふんじんを あびせた!",
-  "cobblemon.battle.singleturn.follow_me": "%1$sは 注目の的に なった!",
+  "cobblemon.battle.singleturn.followme": "%1$sは 注目の的に なった！",
  "cobblemon.battle.singleturn.snatch": "%1$sは 相手の でかたを うかがっている!",
-  "cobblemon.battle.singleturn.quick_guard": "%1$sのチームは ファストガードで 守られた!",
-  "cobblemon.battle.singleturn.wide_guard": "%1$sのチームは ワイドガードで 守られた!",
+  "cobblemon.battle.singleturn.quickguard": "%1$sのチームは ファストガードで 守られた！",
+  "cobblemon.battle.singleturn.wideguard": "%1$sのチームは ワイドガードで 守られた！",
  "cobblemon.battle.singleturn.roost": "（%1$sは このターンだけ ひこうタイプが 消える。）",
-  "cobblemon.battle.singleturn.mat_block": "%1$sは たたみがえしを ねらっている!",
-  "cobblemon.battle.singleturn.max_guard": "%1$sは 身を 守っている!",
+  "cobblemon.battle.singleturn.matblock": "%1$sは たたみがえしを ねらっている！",
+  "cobblemon.battle.singleturn.maxguard": "%1$sは 身を 守っている！",
  "cobblemon.battle.singleturn.instruct": "%1$sは %2$sの 指示で 技を 繰り出した!",
-  "cobblemon.battle.singleturn.focus_punch": "%1$sは 集中力を 高めている!",
+  "cobblemon.battle.singleturn.focuspunch": "%1$sは 集中力を 高めている！",
  "cobblemon.battle.singleturn.electrify": "%1$sは そうでんで 技が でんきタイプになった!",
-  "cobblemon.battle.singleturn.beak_blast": "%1$sは クチバシを 加熱し始めた!",
-  "cobblemon.battle.singleturn.helping_hand": "%2$sは %1$sを 手助けする 体勢に入った!",
-  "cobblemon.battle.singleturn.magic_coat": "%1$sは マジックコートに 包まれた!",
-  "cobblemon.battle.singleturn.rage_powder": "%1$sは 注目の的に なった!",
-  "cobblemon.battle.singleturn.shell_trap": "%1$sは トラップシェルを 仕掛けた!",
+  "cobblemon.battle.singleturn.beakblast": "%1$sは クチバシを 加熱し始めた！",
+  "cobblemon.battle.singleturn.helpinghand": "%2$sは %1$sを 手助けする 体勢に入った！",
+  "cobblemon.battle.singleturn.magiccoat": "%1$sは マジックコートに 包まれた！",
+  "cobblemon.battle.singleturn.ragepowder": "%1$sは 注目の的に なった！",
+  "cobblemon.battle.singleturn.shelltrap": "%1$sは トラップシェルを 仕掛けた！",
  "cobblemon.battle.singleturn.spotlight": "%1$sは 注目の的に なった!",
-  "cobblemon.battle.singlemove.destiny_bond": "%1$sは 相手を 道連れに しようとしている!",
-  "cobblemon.battle.singlemove.glaive_rush": "%1$sの 体を投げ出す 無謀な突撃!",
+  "cobblemon.battle.singlemove.destinybond": "%1$sは 相手を 道連れに しようとしている！",
+  "cobblemon.battle.singlemove.glaiverush": "%1$sの 体を投げ出す 無謀な突撃！",
  "cobblemon.battle.singlemove.grudge": "%1$sは 相手に おんねんを かけようとしている!",
  "cobblemon.battle.singlemove.rage": "%1$sの 怒りのボルテージが 上がっていく!",
+  "cobblemon.battle.damage.wrap": "%1$sは まきつくの ダメージを 受けている",
+  "cobblemon.battle.damage.confusion": "%1$sは わけも わからず 自分を 攻撃した！",
+  "cobblemon.battle.damage.leechseed": "やどりぎが %1$sの 体力を奪う！",
+  "cobblemon.battle.damage.sandstorm": "砂あらしが %1$sを 襲う！",
+  "cobblemon.battle.damage.hail": "あられが %1$sを 襲う！",
+  "cobblemon.battle.damage.stealthrock": "Pointed stones dug into %1$s!",
+  "cobblemon.battle.damage.spikes": "%1$s was hurt by the spikes!",
+  "cobblemon.battle.damage.recoil": "%1$s was damaged by the recoil!",
+  "cobblemon.battle.damage.item": "%1$s was hurt by its %2$s!",
+  "cobblemon.battle.damage.lifeorb": "%1$s lost some of its HP!",
+  "cobblemon.battle.damage.rockyhelmet": "%1$s was hurt by %2$s's Rocky Helmet!",
+  "cobblemon.battle.damage.generic": "%1$s was hurt!",
+  "cobblemon.battle.damage.pokemonmimikyubusted": "%1$s's disguise was busted!",
+  "cobblemon.battle.damage.whirlpool": "%1$s was hurt by Whirlpool!",
+  "cobblemon.battle.damage.clamp": "%1$s was hurt by Clamp!",
+  "cobblemon.battle.damage.curse": "%1$s was afflicted by the curse!",
  "cobblemon.battle.end.bind": "%1$sは 解放された!",
-  "cobblemon.battle.set_hp.pain_split": "おたがいの体力を 分かちあった!",
+  "cobblemon.battle.end.wrap": "%1$sは まきつくから 解放された！",
+  "cobblemon.battle.end.disable": "%1$sの かなしばりが 解けた！",
+  "cobblemon.battle.end.protosynthesis": "%1$sは こだいかっせいの 効果が 切れた！",
+  "cobblemon.battle.end.taunt": "%1$sは 挑発の効果が 解けた！",
+  "cobblemon.battle.end.firespin": "%1$sは ほのおのうずから 解放された！",
+  "cobblemon.battle.end.bide": "%1$sの がまんが解かれた！",
+  "cobblemon.battle.end.confusion": "%1$sの 混乱が 治った！",
+  "cobblemon.battle.end.whirlpool": "%1$s was freed from the vortex!",
+  "cobblemon.battle.end.clamp": "%1$s was freed from Clamp!",
+  "cobblemon.battle.end.dynamax": "%1$s returned to normal!",
+  "cobblemon.battle.sethp.painsplit": "おたがいの体力を 分かちあった！",
  "cobblemon.battle.ability.sturdy": "%1$sは 攻撃を こらえた!",
-  "cobblemon.battle.ability.speed_boost": "%1$sは かそく している!",
-  "cobblemon.battle.ability.intimidate": "%1$sは いかく している!",
  "cobblemon.battle.ability.unnerve": "%1$sの きんちょうかんで 相手は きのみが 食べられなくなった!",
  "cobblemon.battle.ability.anticipation": "%1$sは みぶるいした!",
-  "cobblemon.battle.ability.air_lock": "天候の影響が なくなった!",
+  "cobblemon.battle.ability.airlock": "天候の影響が なくなった！",
  "cobblemon.battle.ability.generic": "%1$sの %2$s!",
+  "cobblemon.battle.ability.magicbounce": "%1$s bounced the %2$s back!",
  "cobblemon.battle.errors.busy": "%1$sは それどころじゃない!",
  "cobblemon.battle.error.in_battle": "%1$sは 勝負の 最中だ!",
  "cobblemon.battle.error.in_battle.personal": "今は 勝負の 最中だ!",
  "cobblemon.battle.error.no_pokemon": "使えるポケモンが いない!",
+  "cobblemon.battle.error.no_pokemon_opponent": "Your opponent doesn't have any usable Pokémon!",
  "cobblemon.battle.error.insufficient_pokemon": "%1$sは 使えるポケモンが %3体 必要なのに %2体しか 持っていない!",
  "cobblemon.battle.error.insufficient_pokemon.personal": "使えるポケモンが %2体 必要なのに %1体しか 持っていない!",
+  "cobblemon.battle.error.pokemon_is_trapped": "[無効な選択] 閉じこめられているので ポケモンを 戻すことが できない！",
  "cobblemon.battle.immune": "%1$sには 効果が ないようだ……",
  "cobblemon.battle.missed": "しかし 攻撃は はずれた!",
  "cobblemon.battle.hit_count": "%1$s回 当たった!",
  "cobblemon.battle.hit_count_singular": "1回 当たった!",
-  "cobblemon.battle.item.air_balloon.start": "%1$sは ふうせんで 浮いている!",
-  "cobblemon.battle.item.recycle_or_pickup.start": "%1$sは %2$sを 拾ってきた!",
-  "cobblemon.battle.item.frisk.start": "%1$sは %2$sの %3$sを お見通しだ!",
-  "cobblemon.battle.item.take_item.start": "%1$sは %2$sから %3$sを 奪い取った!",
-  "cobblemon.battle.item.harvest.start": "%1$sは %2$sを 収穫した!",
-  "cobblemon.battle.item.bestow.start": "%1$sは %3$sから %2$sを 受け取った!",
-  "cobblemon.battle.item.tricked.start": "%1$sは おたがいの 道具を入れ替えた!",
-  "cobblemon.battle.item.eat.end": "%1$sは %2$sを 食べた!",
-  "cobblemon.battle.item.fling.end": "%1$sは %2$sを 投げつけた!",
-  "cobblemon.battle.item.knock_off.end": "%1$sは %2$sの %3$sを はたき落とした!",
-  "cobblemon.battle.item.gem.end": "%1$sは %2$sの 威力を 強めた!",
-  "cobblemon.battle.item.incinerate.end": "%1$sの %2$sは 焼けてなくなった!",
-  "cobblemon.battle.item.air_balloon.end": "%1$sの ふうせんが 割れた!",
-  "cobblemon.battle.item.hung_on.end": "%1$sは %2$sで もちこたえた!",
-  "cobblemon.battle.item.red_card.end": "%1$sは レッドカードを %2$sに たたきつけた!",
-  "cobblemon.battle.item.steal_eat.end": "%1$sは %2$sの %3$sを 奪って 食べた!",
-  "cobblemon.battle.item.berry_juice.end": "%1$sは ジュースを 飲んだ!",
-  "cobblemon.battle.item.used_its.end": "%1$sは %2$sを 使った!",
-  "cobblemon.battle.item.mental_herb.end": "%1$sは メンタルハーブで ステータスを 元に戻した!",
-  "cobblemon.battle.item.power_herb.end": "%1$sは パワフルハーブで 力が みなぎった!",
-  "cobblemon.battle.item.mirror_herb.end": "%1$sは ものまねハーブを 使って 相手の 能力変化を まねした!",
-  "cobblemon.battle.item.white_herb.end": "%1$sは しろいハーブで ステータスを 元に戻した!",
-  "cobblemon.battle.item.quick_claw.end": "%1$sは せんせいのツメで 行動が はやくなった!",
-  "cobblemon.battle.heal.z_effect": "%1$sは Zパワーで 体力が 回復した!",
+  "cobblemon.battle.item.airballoon": "%1$sは %2$sで 浮いている！",
+  "cobblemon.battle.item.recycle": "%1$sは %2$sを 拾ってきた！",
+  "cobblemon.battle.item.frisk": "%3$sは %1$sの %2$sを お見通しだ！",
+  "cobblemon.battle.item.thief": "%1$sは %3$sから %2$sを 奪い取った！",
+  "cobblemon.battle.item.harvest": "%1$sは %2$sを 収穫した！",
+  "cobblemon.battle.item.bestow": "%1$sは %3$sから %2$sを 受け取った！",
+  "cobblemon.battle.item.trick": "%1$s obtained one %2$s.",
+  "cobblemon.battle.item.eat": "%1$s ate its %2$s.",
+  "cobblemon.battle.enditem.eat": "%1$sは %2$sを 食べた！",
+  "cobblemon.battle.enditem.fling": "%1$sは %2$sを 投げつけた！",
+  "cobblemon.battle.enditem.knockoff": "%3$sは %1$sの %2$sを はたき落とした！",
+  "cobblemon.battle.enditem.gem": "%2$sは %1$sの 威力を 強めた！",
+  "cobblemon.battle.enditem.incinerate": "%1$sの %2$sは 焼けてなくなった！",
+  "cobblemon.battle.enditem.airballoon": "%1$sの ふうせんが 割れた！",
+  "cobblemon.battle.enditem.redcard": "%1$sは レッドカードを %3$sに たたきつけた！",
+  "cobblemon.battle.enditem.pluck": "%3$sは %1$sの %2$sを 奪って 食べた！",
+  "cobblemon.battle.enditem.berryjuice": "%1$sは ジュースを 飲んだ！",
+  "cobblemon.battle.enditem.generic": "%1$sは %2$sを 使った！",
+  "cobblemon.battle.enditem.mentalherb": "%1$sは メンタルハーブで ステータスを 元に戻した！",
+  "cobblemon.battle.enditem.powerherb": "%1$sは パワフルハーブで 力が みなぎった！",
+  "cobblemon.battle.enditem.mirrorherb": "%1$sは ものまねハーブを 使って 相手の 能力変化を まねした！",
+  "cobblemon.battle.enditem.whiteherb": "%1$sは しろいハーブで ステータスを 元に戻した！",
+  "cobblemon.battle.heal.zeffect": "%1$sは Zパワーで 体力が 回復した！",
  "cobblemon.battle.heal.wish": "%1$sの ねがいごとが かなった!",
  "cobblemon.battle.heal.drain": "%1$sは 体力を 吸い取られた!",
-  "cobblemon.battle.heal.healing_wish": "%1$sの いやしのねがいが かなった!",
-  "cobblemon.battle.heal.revival_blessing": "%1$sは 復活して 戦えるようになった!",
-  "cobblemon.battle.heal.aqua_ring": "%1$sは 水のリングで 体力を回復!",
+  "cobblemon.battle.heal.healingwish": "%1$sの いやしのねがいが かなった！",
+  "cobblemon.battle.heal.revivalblessing": "%1$sは 復活して 戦えるようになった！",
+  "cobblemon.battle.heal.aquaring": "%1$sは 水のリングで 体力を回復！",
  "cobblemon.battle.heal.ingrain": "%1$sは 根から 養分を 吸い取った!",
-  "cobblemon.battle.heal.grassy_terrain": "%1$sの 体力が 回復した",
-  "cobblemon.battle.heal.leftovers": "%1$sは たべのこしで 少し 回復",
-  "cobblemon.battle.heal.rain_dish": "%1$s あめうけざらで 少し 回復",
+  "cobblemon.battle.heal.grassyterrain": "%1$sの 体力が 回復した",
+  "cobblemon.battle.heal.leftovers": "%1$sは %2$sで 少し 回復",
+  "cobblemon.battle.heal.item": "%1$sは %2$sを 使って HPを 回復した！",
+  "cobblemon.battle.heal.raindish": "%1$s あめうけざらで 少し 回復",
  "cobblemon.battle.heal.generic": "%1$sの 体力が 回復した",
+  "cobblemon.battle.heal.bagitempotion": "It restored %1$s's HP",
+  "cobblemon.battle.curestatus.naturalcure": "%1$sは しぜんかいふくで 状態異常が 治った！",
+  "cobblemon.battle.bagitem.use": "%1$s used a %2$s on %3$s!",
+  "cobblemon.battle.bagitem.cannot": "You cannot use items right now.",
+  "cobblemon.battle.bagitem.invalid": "This item would not work.",
+  "cobblemon.battle.zpower": "%1$s surrounded itself with its Z-Power!",
+  "cobblemon.battle.zbroken": "%1$s couldn't fully protect itself and got hurt!",
+  "cobblemon.battle.terastallize": "%1$s has Terastallized into the %2$s-type!",
+  "cobblemon.battle.detailschange.mega": "%1$s is reacting to the Key Stone!",
+  "cobblemon.battle.mega": "%1$s has Mega Evolved!",
  "cobblemon.experience.gained": "%1$sは 経験値を %2$s もらった！",
  "cobblemon.experience.level_up": "%1$sは レベル%2$s に あがった！",
  "cobblemon.experience.learned_move": "%1$sは 新しく %2$sを 覚えた！",
@@ -609,16 +1024,19 @@
  "cobblemon.move.category.status": "へんか",
  "cobblemon.status.sleep.apply": "%1$sは 眠ってしまった!",
  "cobblemon.status.sleep.is": "%1$sは ぐうぐう 眠っている",
-  "cobblemon.status.sleep.woke": "%1$sは 目を 覚ました!",
+  "cobblemon.status.sleep.cure": "%1$sは 目を 覚ました！",
  "cobblemon.status.paralysis.apply": "%1$sは 麻痺して 技が 出にくくなった!",
  "cobblemon.status.paralysis.is": "%1$sは 体が痺れて 動けない!",
+  "cobblemon.status.paralysis.cure": "%1$sの まひが 治った！",
  "cobblemon.status.poison.apply": "%1$sは 毒を あびた!",
+  "cobblemon.status.poison.cure": "%1$sの どくが 治った！",
  "cobblemon.status.poisonbadly.apply": "%1$sは 猛毒を あびた!",
-  "cobblemon.status.poison.hurt": "%1$sは 毒の ダメージを 受けている!",
+  "cobblemon.status.poison.hurt": "%1$sは 毒の ダメージを 受けている！",
  "cobblemon.status.burn.apply": "%1$sは やけどを 負った!",
  "cobblemon.status.burn.hurt": "%1$sは やけどの ダメージを 受けている!",
+  "cobblemon.status.burn.cure": "%1$sの やけどが 治った！",
  "cobblemon.status.frozen.apply": "%1$sは 凍りついた!",
-  "cobblemon.status.frozen.thawed": "%1$sの こおりが 溶けた!",
+  "cobblemon.status.frozen.cure": "%1$sの こおりが 溶けた！",
  "cobblemon.status.frozen.is": "%1$sは 凍ってしまって 動けない!",
  "block.cobblemon.dawn_stone_ore": "めざめ鉱石",
  "block.cobblemon.dusk_stone_ore": "やみの鉱石",
@@ -641,10 +1059,48 @@
  "block.cobblemon.deepslate_thunder_stone_ore": "深層かみなりの鉱石",
  "block.cobblemon.deepslate_water_stone_ore": "深層みずの鉱石",
  "block.cobblemon.dripstone_moon_stone_ore": "鍾乳つきの鉱石",
+  "block.cobblemon.pasture": "牧草ブロック",
  "gamerule.doPokemonSpawning": "ポケモンのスポーン",
+  "gamerule.doShinyStarters": "Starters will be shiny",
  "cobblemon.command.checkspawns.invalid-bucket": "スポーンバケツが 正しくありません",
  "cobblemon.command.checkspawns.spawns": "スポーン",
  "cobblemon.command.checkspawns.nothing": "ここでは 何も スポーンできません",
+  "cobblemon.interaction.ev.add": "%1$s' %2$s EVs increased by %3$s!",
+  "cobblemon.interaction.ev.deduct": "%1$s' %2$s EVs decreased by %3$s!",
+  "cobblemon.interaction.pp.restore": "You restore the PP of %1$s.",
+  "cobblemon.interaction.friendsip.add": "%1$s grows closer to you!",
+  "cobblemon.interaction.status.cure": "%1$s is cured of its status condition!",
+  "cobblemon.interaction.hp.heal": "%1$s restored its HP a bit!",
+  "tag.item.cobblemon.apricorn_logs": "Apricorn Logs",
+  "tag.item.cobblemon.apricorn_sprouts": "Apricorn Sprouts",
+  "tag.item.cobblemon.apricorns": "Apricorns",
+  "tag.item.cobblemon.azalea_tree": "Azalea Trees",
+  "tag.item.cobblemon.berries": "Berries",
+  "tag.item.cobblemon.cobblemon_seeds": "Seeds",
+  "tag.item.cobblemon.evolution_items": "Evolution Items",
+  "tag.item.cobblemon.evolution_stones": "Evolution Stones",
+  "tag.item.cobblemon.experience_candies": "Experience Candies",
+  "tag.item.cobblemon.held.destiny_knot": "Destiny Knots",
+  "tag.item.cobblemon.held.everstone": "Everstones",
+  "tag.item.cobblemon.held.experience_share": "Experience Shares",
+  "tag.item.cobblemon.held.is_held_item": "Held Items",
+  "tag.item.cobblemon.held.lucky_egg": "Lucky Eggs",
+  "tag.item.cobblemon.held.power_anklet": "Power Anklets",
+  "tag.item.cobblemon.held.power_band": "Power Bands",
+  "tag.item.cobblemon.held.power_belt": "Power Belts",
+  "tag.item.cobblemon.held.power_bracer": "Power Bracers",
+  "tag.item.cobblemon.held.power_lens": "Power Lenses",
+  "tag.item.cobblemon.held.power_weight": "Power Weights",
+  "tag.item.cobblemon.herbs": "Herbs",
+  "tag.item.cobblemon.mint_leaf": "Mint Leaves",
+  "tag.item.cobblemon.mints": "Mints",
+  "tag.item.cobblemon.mutated_berries": "Mutation Berries",
+  "tag.item.cobblemon.plants": "Plants",
+  "tag.item.cobblemon.poke_balls": "Poké Balls",
+  "tag.item.cobblemon.protein_ingredients": "Protein Ingredients",
+  "tag.item.cobblemon.zinc_ingredients": "Zinc Ingredients",
+  "tag.item.cobblemon.seeds": "Seeds",
+
  "cobblemon.move.absorb": "すいとる",
  "cobblemon.move.absorb.desc": "養分を 吸い取り 攻撃する。 相手に 与えた ダメージの 半分の HPを 回復できる。",
  "cobblemon.move.accelerock": "アクセルロック",
@@ -1,5 +1,4 @@
 {
-  "itemGroup.cobblemon.pokeball": "몬스터볼",
  "item.cobblemon.poke_ball": "몬스터볼",
  "item.cobblemon.slate_ball": "블랙볼",
  "item.cobblemon.azure_ball": "블루볼",
@@ -32,7 +31,22 @@
  "item.cobblemon.park_ball": "파크볼",
  "item.cobblemon.dream_ball": "드림볼",
  "item.cobblemon.beast_ball": "울트라볼",
-  "itemGroup.cobblemon.evolution_item": "진화 아이템",
+  "item.cobblemon.black_apricorn_seed": "Black Apricorn Sprout",
+  "item.cobblemon.blue_apricorn_seed": "Blue Apricorn Sprout",
+  "item.cobblemon.green_apricorn_seed": "Green Apricorn Sprout",
+  "item.cobblemon.pink_apricorn_seed": "Pink Apricorn Sprout",
+  "item.cobblemon.red_apricorn_seed": "Red Apricorn Sprout",
+  "item.cobblemon.white_apricorn_seed": "White Apricorn Sprout",
+  "item.cobblemon.yellow_apricorn_seed": "Yellow Apricorn Sprout",
+  "item.cobblemon.black_apricorn": "검은 규토리",
+  "item.cobblemon.blue_apricorn": "파란 규토리",
+  "item.cobblemon.green_apricorn": "초록 규토리",
+  "item.cobblemon.pink_apricorn": "분홍 규토리",
+  "item.cobblemon.red_apricorn": "빨간 규토리",
+  "item.cobblemon.white_apricorn": "하얀 규토리",
+  "item.cobblemon.yellow_apricorn": "노랑 규토리",
+  "item.cobblemon.vivichoke_seeds": "Vivichoke Seeds",
+  "item.cobblemon.vivichoke": "Vivichoke",
  "item.cobblemon.link_cable": "연결의끈",
  "item.cobblemon.dragon_scale": "용의비늘",
  "item.cobblemon.kings_rock": "왕의징표석",
@@ -74,7 +88,6 @@
  "item.cobblemon.sun_stone": "태양의돌",
  "item.cobblemon.thunder_stone": "천둥의돌",
  "item.cobblemon.water_stone": "물의돌",
-  "itemGroup.cobblemon.medicine": "회복 아이템",
  "item.cobblemon.rare_candy": "이상한사탕",
  "item.cobblemon.exp_candy_xs": "경험사탕XS",
  "item.cobblemon.exp_candy_s": "경험사탕S",
@@ -87,10 +100,47 @@
  "item.cobblemon.iron": "사포닌",
  "item.cobblemon.protein": "타우린",
  "item.cobblemon.zinc": "키토산",
-  "itemGroup.cobblemon.held_item": "소지품",
+  "item.cobblemon.potion": "Potion",
+  "item.cobblemon.super_potion": "Super Potion",
+  "item.cobblemon.hyper_potion": "Hyper Potion",
+  "item.cobblemon.max_potion": "Max Potion",
+  "item.cobblemon.full_restore": "Full Restore",
+  "item.cobblemon.red_mint_leaf": "Red Mint Leaf",
+  "item.cobblemon.red_mint_leaf.tooltip": "Capable of influencing a Pokémon's attack stat",
+  "item.cobblemon.blue_mint_leaf": "Blue Mint Leaf",
+  "item.cobblemon.blue_mint_leaf.tooltip": "Capable of influencing a Pokémon's defense stat",
+  "item.cobblemon.cyan_mint_leaf": "Cyan Mint Leaf",
+  "item.cobblemon.cyan_mint_leaf.tooltip": "Capable of influencing a Pokémon's special attack stat",
+  "item.cobblemon.pink_mint_leaf": "Pink Mint Leaf",
+  "item.cobblemon.pink_mint_leaf.tooltip": "Capable of influencing a Pokémon's special defense stat",
+  "item.cobblemon.green_mint_leaf": "Green Mint Leaf",
+  "item.cobblemon.green_mint_leaf.tooltip": "Capable of influencing a Pokémon's speed stat",
+  "item.cobblemon.white_mint_leaf": "White Mint Leaf",
+  "item.cobblemon.white_mint_leaf.tooltip": "Capable of neutralizing a Pokémon's nature",
+  "item.cobblemon.lonely_mint": "Lonely Mint",
+  "item.cobblemon.adamant_mint": "Adamant Mint",
+  "item.cobblemon.naughty_mint": "Naughty Mint",
+  "item.cobblemon.brave_mint": "Brave Mint",
+  "item.cobblemon.bold_mint": "Bold Mint",
+  "item.cobblemon.impish_mint": "Impish Mint",
+  "item.cobblemon.lax_mint": "Lax Mint",
+  "item.cobblemon.relaxed_mint": "Relaxed Mint",
+  "item.cobblemon.modest_mint": "Modest Mint",
+  "item.cobblemon.mild_mint": "Mild Mint",
+  "item.cobblemon.rash_mint": "Rash Mint",
+  "item.cobblemon.quiet_mint": "Quiet Mint",
+  "item.cobblemon.calm_mint": "Calm Mint",
+  "item.cobblemon.gentle_mint": "Gentle Mint",
+  "item.cobblemon.careful_mint": "Careful Mint",
+  "item.cobblemon.sassy_mint": "Sassy Mint",
+  "item.cobblemon.timid_mint": "Timid Mint",
+  "item.cobblemon.hasty_mint": "Hasty Mint",
+  "item.cobblemon.jolly_mint": "Jolly Mint",
+  "item.cobblemon.naive_mint": "Naive Mint",
+  "item.cobblemon.serious_mint": "Serious Mint",
  "item.cobblemon.assault_vest": "돌격조끼",
  "item.cobblemon.auspicious_armor": "축복받은갑옷",
-  "item.cobblemon.big_root": "큰뿌리",
+  "item.cobblemon.malicious_armor": "Malicious Armor",
  "item.cobblemon.black_belt": "검은띠",
  "item.cobblemon.black_glasses": "검은안경",
  "item.cobblemon.black_sludge": "검은진흙",
@@ -124,6 +174,21 @@
  "item.cobblemon.spell_tag": "저주의부적",
  "item.cobblemon.twisted_spoon": "휘어진스푼",
  "item.cobblemon.wise_glasses": "박식안경",
+  "item.cobblemon.mental_herb": "Mental Herb",
+  "item.cobblemon.mirror_herb": "Mirror Herb",
+  "item.cobblemon.power_herb": "Power Herb",
+  "item.cobblemon.white_herb": "White Herb",
+  "item.cobblemon.bright_powder": "Bright Powder",
+  "item.cobblemon.metal_powder": "Metal Powder",
+  "item.cobblemon.quick_powder": "Quick Powder",
+  "item.cobblemon.destiny_knot": "Destiny Knot",
+  "item.cobblemon.everstone": "Everstone",
+  "item.cobblemon.power_anklet": "Power Anklet",
+  "item.cobblemon.power_band": "Power Band",
+  "item.cobblemon.power_belt": "Power Belt",
+  "item.cobblemon.power_bracer": "Power Bracer",
+  "item.cobblemon.power_lens": "Power Lens",
+  "item.cobblemon.power_weight": "Power Weight",
  "item.cobblemon.poke_ball.tooltip": "1× 포획률",
  "item.cobblemon.slate_ball.tooltip": "1× 포획률",
  "item.cobblemon.azure_ball.tooltip": "1× 포획률",
@@ -156,6 +221,56 @@
  "item.cobblemon.park_ball.tooltip": "숲 및 평지 바이옴에 2.5× 포획률",
  "item.cobblemon.dream_ball.tooltip": "잠듦 상태의 포켓몬에 4× 포획률",
  "item.cobblemon.beast_ball.tooltip": "울트라비스트에 5× 포획률, 그 외 포켓몬은 0.1× 적용",
+  "item.cobblemon.mulch_base": "Mulch",
+  "item.cobblemon.coarse_mulch": "Coarse Mulch",
+  "item.cobblemon.growth_mulch": "Growth Mulch",
+  "item.cobblemon.humid_mulch": "Humid Mulch",
+  "item.cobblemon.loamy_mulch": "Loamy Mulch",
+  "item.cobblemon.peat_mulch": "Peat Mulch",
+  "item.cobblemon.rich_mulch": "Rich Mulch",
+  "item.cobblemon.sandy_mulch": "Sandy Mulch",
+  "item.cobblemon.surprise_mulch": "Surprise Mulch",
+  "item.cobblemon.medicinal_leek": "Medicinal Leek",
+  "item.cobblemon.energy_root": "Energy Root",
+  "item.cobblemon.revival_herb": "Revival Herb",
+  "item.cobblemon.roasted_leek": "Roasted Leek",
+  "item.cobblemon.leek_and_potato_stew": "Leek and Potato Stew",
+  "item.cobblemon.braised_vivichoke": "Braised Vivichoke",
+  "item.cobblemon.vivichoke_dip": "Vivichoke Dip",
+  "item.cobblemon.berry_juice": "Berry Juice",
+  "item.cobblemon.remedy": "Remedy",
+  "item.cobblemon.fine_remedy": "Fine Remedy",
+  "item.cobblemon.superb_remedy": "Superb Remedy",
+  "item.cobblemon.heal_powder": "Heal Powder",
+  "item.cobblemon.medicinal_brew": "Medicinal Brew",
+  "item.cobblemon.revive": "Revive",
+  "item.cobblemon.max_revive": "Max Revive",
+  "item.cobblemon.pp_up": "PP Up",
+  "item.cobblemon.pp_max": "PP Max",
+  "item.cobblemon.x_attack": "X Attack",
+  "item.cobblemon.x_defence": "X Defense",
+  "item.cobblemon.x_accuracy": "X Accuracy",
+  "item.cobblemon.x_speed": "X Speed",
+  "item.cobblemon.x_special_defence": "X Special Defense",
+  "item.cobblemon.x_special_attack": "X Special Attack",
+  "item.cobblemon.dire_hit": "Dire Hit",
+  "item.cobblemon.guard_spec": "Guard Spec",
+  "item.cobblemon.full_heal": "Full Heal",
+  "item.cobblemon.antidote": "Antidote",
+  "item.cobblemon.awakening": "Awakening",
+  "item.cobblemon.burn_heal": "Burn Heal",
+  "item.cobblemon.ice_heal": "Ice Heal",
+  "item.cobblemon.paralyze_heal": "Paralyze Heal",
+  "item.cobblemon.ether": "Ether",
+  "item.cobblemon.max_ether": "Max Ether",
+  "item.cobblemon.elixir": "Elixir",
+  "item.cobblemon.max_elixir": "Max Elixir",
+  "itemGroup.cobblemon.blocks": "Blocks",
+  "itemGroup.cobblemon.pokeball": "몬스터볼",
+  "itemGroup.cobblemon.agriculture": "Agriculture",
+  "itemGroup.cobblemon.consumables": "Consumables",
+  "itemGroup.cobblemon.held_item": "소지품",
+  "itemGroup.cobblemon.evolution_item": "진화 아이템",
  "block.cobblemon.apricorn_log": "규토리 원목",
  "block.cobblemon.stripped_apricorn_log": "껍질 벗긴 규토리 원목",
  "block.cobblemon.apricorn_wood": "규토리 나무",
@@ -169,6 +284,7 @@
  "block.cobblemon.apricorn_button": "규토리나무 버튼",
  "block.cobblemon.apricorn_slab": "규토리나무 반 블록",
  "block.cobblemon.apricorn_fence_gate": "규토리나무 울타리 문",
+  "block.cobblemon.big_root": "Big Root",
  "block.cobblemon.black_apricorn_sapling": "검정 규토리 열매",
  "block.cobblemon.blue_apricorn_sapling": "파랑 규토리 열매",
  "block.cobblemon.green_apricorn_sapling": "초록 규토리 열매",
@@ -182,12 +298,39 @@
  "block.cobblemon.healing_machine.tooltip1": "Must be charged after placing.",
  "block.cobblemon.healing_machine.tooltip2": "Charges over time.",
  "block.cobblemon.pc": "PC",
-  "cobblemon.experience.gained": "%1$s(은)는 경험치 %2$s를 획득하였다.",
-  "cobblemon.experience.level_up": "%1$s(은)는 레벨 %2$s로 올랐다!",
-  "cobblemon.experience.learned_move": "%1$s(은)는 %2$s(을)를 배웠다.",
-  "cobblemon.party.faintRecover": "%1$s(은)는 정신을 차렸다.",
+  "block.cobblemon.red_mint": "Red Mint Seeds",
+  "block.cobblemon.blue_mint": "Blue Mint Seeds",
+  "block.cobblemon.cyan_mint": "Cyan Mint Seeds",
+  "block.cobblemon.pink_mint": "Pink Mint Seeds",
+  "block.cobblemon.green_mint": "Green Mint Seeds",
+  "block.cobblemon.white_mint": "White Mint Seeds",
+  "block.cobblemon.vivichoke_seeds": "Vivichoke Seeds",
+  "block.cobblemon.pep_up_flower": "Pep-Up Flower",
+  "block.cobblemon.potted_pep_up_flower": "Potted Pep-Up Flower",
+  "cobblemon.overflow_no_pc": "파티가 꽉 찼고 PC도 없습니다!",
+  "cobblemon.overflow_no_space": "파티와 %1$s가 꽉 찼습니다!",
+  "cobblemon.overflow_to_pc": "파티가 꽉 찼습니다! %1$s은(는) %2$s로 들어갔습니다",
+  "cobblemon.your_pc": "내 PC",
+  "cobblemon.command.pokespawn.invalid-pokemon": "Invalid Pokémon name",
+  "cobblemon.command.pokespawn.invalid-move": "잘못된 이동 위치입니다",
+  "cobblemon.command.clearparty.nonethere": "There are no Pokémon in %1$s's party.",
+  "cobblemon.command.clearparty.cleared": "Cleared %1$s's party.",
+  "cobblemon.command.clearpc.cleared": "Cleared %1$s's PC.",
  "cobblemon.ui.generic.yes": "예",
  "cobblemon.ui.generic.no": "아니오",
+  "cobblemon.ui.pokenav.title": "포켓내비",
+  "cobblemon.ui.summary.title": "정보",
+  "cobblemon.ui.starter.title": "스타팅 포켓몬 선택",
+  "cobblemon.ui.starter.choosebutton": "너로 정했다!",
+  "cobblemon.ui.starter.alreadyselected": "이미 스타팅을 선택하셨습니다!",
+  "cobblemon.ui.starter.cannotchoose": "지금은 스타팅 포켓몬을 선택하실 수 없습니다.",
+  "cobblemon.ui.starter.hasalreadychosen": "%1$s는 이미 스타팅 포켓몬을 선택하였습니다.",
+  "cobblemon.ui.starter.choose_starter_title": "Choose your starter!",
+  "cobblemon.ui.starter.choose_starter_description": "Press the \"%1$s\" key",
+  "cobblemon.ui.starter.chooseyourstarter": "%1$s 키를 눌러 포켓몬을 선택하고 모험을 시작하세요!",
+  "cobblemon.ui.moves": "기술",
+  "cobblemon.ui.moves.switch": "기술 교체",
+  "cobblemon.ui.moves.pp": "%1$sPP",
  "cobblemon.ui.stats": "상태",
  "cobblemon.ui.stats.stat": "능력치",
  "cobblemon.ui.stats.base": "종족겂",
@@ -201,17 +344,6 @@
  "cobblemon.ui.stats.sp_atk": "특수공격",
  "cobblemon.ui.stats.sp_def": "특수방어",
  "cobblemon.ui.stats.speed": "스피드",
-  "cobblemon.ui.pokenav.title": "포켓내비",
-  "cobblemon.ui.summary.title": "정보",
-  "cobblemon.ui.starter.title": "스타팅 포켓몬 선택",
-  "cobblemon.ui.starter.choosebutton": "너로 정했다!",
-  "cobblemon.ui.starter.alreadyselected": "이미 스타팅을 선택하셨습니다!",
-  "cobblemon.ui.starter.cannotchoose": "지금은 스타팅 포켓몬을 선택하실 수 없습니다.",
-  "cobblemon.ui.starter.hasalreadychosen": "%1$s는 이미 스타팅 포켓몬을 선택하였습니다.",
-  "cobblemon.ui.starter.chooseyourstarter": "%1$s 키를 눌러 포켓몬을 선택하고 모험을 시작하세요!",
-  "cobblemon.ui.moves": "기술",
-  "cobblemon.ui.moves.switch": "기술 교체",
-  "cobblemon.ui.moves.pp": "%1$sPP",
  "cobblemon.ui.info": "정보",
  "cobblemon.ui.info.pokedex_number": "도감번호",
  "cobblemon.ui.info.species": "포켓몬",
@@ -221,6 +353,12 @@
  "cobblemon.ui.info.ability": "특성",
  "cobblemon.ui.info.experience_points": "경험치 포인트",
  "cobblemon.ui.info.to_next_level": "다음 레벨까지",
+  "cobblemon.ui.trade": "Trade",
+  "cobblemon.trade.occupied": "%1$s is busy.",
+  "cobblemon.trade.request_expired": "The request to trade with %1$s has timed out.",
+  "cobblemon.trade.request_already_expired": "Their trade request already timed out.",
+  "cobblemon.trade.request_sent": "Offered to trade with %1$s",
+  "cobblemon.trade.offer": "%1$s offered to trade Pokémon with you.",
  "cobblemon.ui.party": "Party",
  "cobblemon.ui.power": "Power",
  "cobblemon.ui.accuracy": "Accuracy",
@@ -229,6 +367,10 @@
  "cobblemon.ui.exit": "나가기",
  "cobblemon.ui.pc.box.title": "박스 %1$s",
  "cobblemon.ui.pc.release": "놓아주기",
+  "cobblemon.ui.pasture": "Pasture",
+  "cobblemon.ui.pasture.recall_all": "Recall All",
+  "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)",
+  "cobblemon.pasture.too_many_nearby": "There are too many Pokémon nearby.",
  "key.cobblemon.upshiftparty": "Party Shift Up",
  "key.cobblemon.downshiftparty": "Party Shift Down",
  "key.cobblemon.hideparty": "파티 오버레이 숨기기",
@@ -237,6 +379,14 @@
  "key.cobblemon.summary": "상태창 열기",
  "key.cobblemon.categories.cobblemon": "Cobblemon",
  "cobblemon.subtitle.capture_succeeded": "포켓몬을 잡았다!",
+  "cobblemon.healingmachine.alreadyinuse": "이 회복 머신은 현재 사용 중입니다!",
+  "cobblemon.healingmachine.nopokemon": "회복 받을 수 있는 포켓몬이 하나도 없습니다!",
+  "cobblemon.healingmachine.alreadyhealed": "이미 회복된 상태입니다!",
+  "cobblemon.healingmachine.healing": "당신의 포켓몬이 회복 중 입니다!",
+  "cobblemon.healingmachine.healed": "회복이 완료됐습니다!",
+  "cobblemon.healingmachine.notenoughcharge": "포켓몬을 회복하려면 %s만큼 충전이 필요합니다!",
+  "cobblemon.healingmachine.inbattle": "배틀 중에는 회복 머신을 사용할 수 없습니다!",
+  "cobblemon.healingmachine.alreadyhealing": "당신의 포켓몬은 이미 다른 회복 머신에서 회복하고 있습니다!",
  "cobblemon.pc.inbattle": "배틀 중에는 PC를 사용할 수 없습니다!",
  "cobblemon.held_item": "지닌 물건",
  "cobblemon.held_item.give": "%1$s was given %2$s to hold.",
@@ -264,10 +414,177 @@
  "cobblemon.ui.evolution": "진화",
  "cobblemon.ui.evolve.hint": "%1$s(은)는 진화할 준비가 된 거 같다!",
  "cobblemon.ui.evolve.into": "%1$s(은)는 %2$s(으)로 진화하였습니다!",
+  "cobblemon.label.lv": "Lv. %1$s",
+  "cobblemon.challenge_label": "%1$s을(를) 눌러 배틀.",
+  "cobblemon.challenge.sender": "%1$s에게 배틀을 신청했습니다!",
+  "cobblemon.challenge.receiver": "%1$s has challenged you to battle!",
+  "cobblemon.drop.item.inventory": "%2$s(%1$sx)을(를) 받았습니다.",
+  "cobblemon.drop.item.full": "인벤토리가 가득 차서 %1$s이(가) 바닥에 떨어졌습니다",
+  "cobblemon.mint.interact": "%1$s's stats have changed!",
+  "cobblemon.mint.same_nature": "%1$s's stats seem unaffected by the %2$s.",
+  "itemGroup.cobblemon.plants": "Plants",
+  "item.cobblemon.aguav_berry": "Aguav Berry",
+  "item.cobblemon.aguav_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -SpD Nature",
+  "item.cobblemon.apicot_berry": "Apicot Berry",
+  "item.cobblemon.apicot_berry.tooltip": "Raises holder's Sp. Def by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.aspear_berry": "Aspear Berry",
+  "item.cobblemon.aspear_berry.tooltip": "Holder is cured if it is frozen",
+  "item.cobblemon.babiri_berry": "Babiri Berry",
+  "item.cobblemon.babiri_berry.tooltip": "Halves damage taken from a supereffective Steel-type attack",
+  "item.cobblemon.belue_berry": "Belue Berry",
+  "item.cobblemon.belue_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.bluk_berry": "Bluk Berry",
+  "item.cobblemon.bluk_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.charti_berry": "Charti Berry",
+  "item.cobblemon.charti_berry.tooltip": "Halves damage taken from a supereffective Rock-type attack",
+  "item.cobblemon.cheri_berry": "Cheri Berry",
+  "item.cobblemon.cheri_berry.tooltip": "Holder cures itself if it is paralyzed",
+  "item.cobblemon.chesto_berry": "Chesto Berry",
+  "item.cobblemon.chesto_berry.tooltip": "Holder wakes up if it is asleep",
+  "item.cobblemon.chilan_berry": "Chilan Berry",
+  "item.cobblemon.chilan_berry.tooltip": "Halves damage taken from a Normal-type attack",
+  "item.cobblemon.chople_berry": "Chople Berry",
+  "item.cobblemon.chople_berry.tooltip": "Halves damage taken from a supereffective Fighting-type attack",
+  "item.cobblemon.coba_berry": "Coba Berry",
+  "item.cobblemon.coba_berry.tooltip": "Halves damage taken from a supereffective Flying-type attac",
+  "item.cobblemon.colbur_berry": "Colbur Berry",
+  "item.cobblemon.colbur_berry.tooltip": "Halves damage taken from a supereffective Dark-type attack",
+  "item.cobblemon.cornn_berry": "Cornn Berry",
+  "item.cobblemon.cornn_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.custap_berry": "Custap Berry",
+  "item.cobblemon.custap_berry.tooltip": "Holder moves first in its priority bracket when at 1/4 max HP or less",
+  "item.cobblemon.durin_berry": "Durin Berry",
+  "item.cobblemon.durin_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.enigma_berry": "Enigma Berry",
+  "item.cobblemon.enigma_berry.tooltip": "Restores 1/4 max HP after holder is hit by a supereffective move",
+  "item.cobblemon.figy_berry": "Figy Berry",
+  "item.cobblemon.figy_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -Atk Nature",
+  "item.cobblemon.ganlon_berry": "Ganlon Berry",
+  "item.cobblemon.ganlon_berry.tooltip": "Raises holder's Defense by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.grepa_berry": "Grepa Berry",
+  "item.cobblemon.grepa_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.haban_berry": "Haban Berry",
+  "item.cobblemon.haban_berry.tooltip": "Halves damage taken from a supereffective Dragon-type attack",
+  "item.cobblemon.hondew_berry": "Hondew Berry",
+  "item.cobblemon.hondew_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.hopo_berry": "Hopo Berry",
+  "item.cobblemon.hopo_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.iapapa_berry": "Iapapa Berry",
+  "item.cobblemon.iapapa_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -Def Nature",
+  "item.cobblemon.jaboca_berry": "Jaboca Berry",
+  "item.cobblemon.jaboca_berry.tooltip": "If holder is hit by a physical move, attacker loses 1/8 of its max HP",
+  "item.cobblemon.kasib_berry": "Kasib Berry",
+  "item.cobblemon.kasib_berry.tooltip": "Halves damage taken from a supereffective Ghost-type attack",
+  "item.cobblemon.kebia_berry": "Kebia Berry",
+  "item.cobblemon.kebia_berry.tooltip": "Halves damage taken from a supereffective Poison-type attack",
+  "item.cobblemon.kee_berry": "Kee Berry",
+  "item.cobblemon.kee_berry.tooltip": "Raises holder's Defense by 1 stage after it is hit by a physical attack",
+  "item.cobblemon.kelpsy_berry": "Kelpsy Berry",
+  "item.cobblemon.kelpsy_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.lansat_berry": "Lansat Berry",
+  "item.cobblemon.lansat_berry.tooltip": "Holder gains the Focus Energy effect when at 1/4 max HP or less",
+  "item.cobblemon.leppa_berry": "Leppa Berry",
+  "item.cobblemon.leppa_berry.tooltip": "Restores 10 PP to the first of the holder's moves to reach 0 PP",
+  "item.cobblemon.liechi_berry": "Liechi Berry",
+  "item.cobblemon.liechi_berry.tooltip": "Raises holder's Attack by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.lum_berry": "Lum Berry",
+  "item.cobblemon.lum_berry.tooltip": "Holder cures itself if it has a non-volatile status or is confused",
+  "item.cobblemon.mago_berry": "Mago Berry",
+  "item.cobblemon.mago_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -Spe Nature",
+  "item.cobblemon.magost_berry": "Magost Berry",
+  "item.cobblemon.magost_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.maranga_berry": "Maranga Berry",
+  "item.cobblemon.maranga_berry.tooltip": "Raises holder's Sp. Def by 1 stage after it is hit by a special attack",
+  "item.cobblemon.micle_berry": "Micle Berry",
+  "item.cobblemon.micle_berry.tooltip": "Holder's next move has 1.2x accuracy when at 1/4 max HP or less",
+  "item.cobblemon.nanab_berry": "Nanab Berry",
+  "item.cobblemon.nanab_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.touga_berry": "Touga Berry",
+  "item.cobblemon.touga_berry.tooltip": "Holder is cured if it is confused",
+  "item.cobblemon.nomel_berry": "Nomel Berry",
+  "item.cobblemon.nomel_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.occa_berry": "Occa Berry",
+  "item.cobblemon.occa_berry.tooltip": "Halves damage taken from a supereffective Fire-type attack",
+  "item.cobblemon.oran_berry": "Oran Berry",
+  "item.cobblemon.oran_berry.tooltip": "Restores 10 HP when at 1/2 max HP or less",
+  "item.cobblemon.pamtre_berry": "Pamtre Berry",
+  "item.cobblemon.pamtre_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.passho_berry": "Passho Berry",
+  "item.cobblemon.passho_berry.tooltip": "Halves damage taken from a supereffective Water-type attack",
+  "item.cobblemon.payapa_berry": "Payapa Berry",
+  "item.cobblemon.payapa_berry.tooltip": "Halves damage taken from a supereffective Psychic-type attack",
+  "item.cobblemon.pecha_berry": "Pecha Berry",
+  "item.cobblemon.pecha_berry.tooltip": "Holder is cured if it is poisoned",
+  "item.cobblemon.persim_berry": "Persim Berry",
+  "item.cobblemon.persim_berry.tooltip": "Holder is cured if it is confused",
+  "item.cobblemon.petaya_berry": "Petaya Berry",
+  "item.cobblemon.petaya_berry.tooltip": "Raises holder's Sp. Atk by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.pinap_berry": "Pinap Berry",
+  "item.cobblemon.pinap_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.pomeg_berry": "Pomeg Berry",
+  "item.cobblemon.pomeg_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.qualot_berry": "Qualot Berry",
+  "item.cobblemon.qualot_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.rabuta_berry": "Rabuta Berry",
+  "item.cobblemon.rabuta_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.rawst_berry": "Rawst Berry",
+  "item.cobblemon.rawst_berry.tooltip": "Holder is cured if it is burned",
+  "item.cobblemon.razz_berry": "Razz Berry",
+  "item.cobblemon.razz_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.rindo_berry": "Rindo Berry",
+  "item.cobblemon.rindo_berry.tooltip": "Halves damage taken from a supereffective Grass-type attack",
+  "item.cobblemon.roseli_berry": "Roseli Berry",
+  "item.cobblemon.roseli_berry.tooltip": "Halves damage taken from a supereffective Fairy-type attack",
+  "item.cobblemon.rowap_berry": "Rowap Berry",
+  "item.cobblemon.rowap_berry.tooltip": "If holder is hit by a special move, attacker loses 1/8 of its max HP",
+  "item.cobblemon.salac_berry": "Salac Berry",
+  "item.cobblemon.salac_berry.tooltip": "Raises holder's Speed by 1 stage when at 1/4 max HP or less",
+  "item.cobblemon.shuca_berry": "Shuca Berry",
+  "item.cobblemon.shuca_berry.tooltip": "Halves damage taken from a supereffective Ground-type attack",
+  "item.cobblemon.sitrus_berry": "Sitrus Berry",
+  "item.cobblemon.sitrus_berry.tooltip": "Restores 1/4 max HP when at 1/2 max HP or less",
+  "item.cobblemon.spelon_berry": "Spelon Berry",
+  "item.cobblemon.spelon_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.starf_berry": "Starf Berry",
+  "item.cobblemon.starf_berry.tooltip": "Raises a random stat by 2 when at 1/4 max HP or less",
+  "item.cobblemon.tamato_berry": "Tamato Berry",
+  "item.cobblemon.tamato_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.tanga_berry": "Tanga Berry",
+  "item.cobblemon.tanga_berry.tooltip": "Halves damage taken from a supereffective Bug-type attack",
+  "item.cobblemon.wacan_berry": "Wacan Berry",
+  "item.cobblemon.wacan_berry.tooltip": "Halves damage taken from a supereffective Electric-type attack",
+  "item.cobblemon.watmel_berry": "Watmel Berry",
+  "item.cobblemon.watmel_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.wepear_berry": "Wepear Berry",
+  "item.cobblemon.wepear_berry.tooltip": "Cannot be eaten by the holder",
+  "item.cobblemon.wiki_berry": "Wiki Berry",
+  "item.cobblemon.wiki_berry.tooltip": "Restores 1/3 max HP at 1/4 max HP or less; confuses if -SpA Nature",
+  "item.cobblemon.yache_berry": "Yache Berry",
+  "item.cobblemon.yache_berry.tooltip": "Halves damage taken from a supereffective Ice-type attack",
+  "cobblemon.command.general.invalid-party-slot": "%1$s번 칸에 포켓몬이 없습니다!",
+  "cobblemon.command.givepokemon.give": "%2$s에게 %1$s을(를) 보냈습니다",
+  "cobblemon.command.pokemonedit": "%2$s이(가) 가진 %1$s을(를) 수정했습니다",
+  "cobblemon.command.teach": "%2$s이(가) 가진 %1$s에게 %3$s을(를) 배우게 했습니다",
+  "cobblemon.command.teach.already_knows": "%1$s은(는) 이미 %2$s을(를) 배웠습니다!",
+  "cobblemon.command.healpokemon.heal": "%1$s의 파티를 회복시켰습니다",
+  "cobblemon.command.friendship": "%1$s은(는) %2$s만큼 친밀감을 느끼고 있습니다",
+  "cobblemon.command.givepokemon.nospecies": "오류: 포켓몬 이름이나 'random'을 입력해야 합니다",
+  "cobblemon.command.spawnpokemon.nospecies": "오류: 포켓몬 이름이나 'random'을 입력해야 합니다",
+  "cobblemon.command.held_item": "%1$s의 %2$s에게 %3$s을(를) 줬습니다",
+  "cobblemon.command.pokeheal.in_battle": "배틀 중에는 회복할 수 없습니다!",
+  "cobblemon.command.spawnpokemonfrompool": "A %1$s has spawned in the area.",
+  "cobblemon.command.spawnpokemonfrompool.unable_to_spawn": "Unable to spawn a Pokémon.",
+  "cobblemon.command.pokebox.box_does_not_exist": "That Player does not have a box %1$s.",
+  "cobblemon.command.pokebox.box_is_full": "That Player's box %1$s is full.",
+  "cobblemon.command.pokebox.storage_is_full": "That Player's storage is full.",
+  "cobblemon.command.pokebox.last_pokemon": "Did not send that Player's last Pokémon to the PC.",
+  "cobblemon.command.pokemonrestart": "Cleared %1$s's party and PC.",
  "advancements.cobblemon.root": "Cobblemon의 세계에 잘 왔다!",
+  "advancements.cobblemon.root.description": "스타팅 포켓몬을 골라서 새로운 모험을 시작합시다",
  "advancements.cobblemon.obtain_leftovers": "재활용을 생활화합시다!",
  "advancements.cobblemon.obtain_leftovers.description": "사과를 먹고 먹다남은음식을 남기십시오.",
-  "advancements.cobblemon.root.description": "스타팅 포켓몬을 골라서 새로운 모험을 시작합시다",
+  "advancements.cobblemon.any_plant": "Mother Nature's Bounty",
+  "advancements.cobblemon.any_plant.description": "Hope you've got a green thumb!",
  "advancements.cobblemon.harvest_apricorn": "과일이야? 견과류야?",
  "advancements.cobblemon.harvest_apricorn.description": "우클릭하여 다 자란 규토리를 수확하세요",
  "advancements.cobblemon.harvest_apricorn_seed": "Doing my Part",
@@ -287,7 +604,7 @@
  "advancements.cobblemon.first_catch": "새로운 동료!",
  "advancements.cobblemon.first_catch.description": "몬스터볼로 첫 포켓몬을 잡으세요",
  "advancements.cobblemon.full_party": "Full House",
-  "advancements.cobblemon.full_party.description": "Catch 5 more Pokémon and make a full party",
+  "advancements.cobblemon.full_party.description": "Catch more Pokémon and make a full party of 6",
  "advancements.cobblemon.first_evolution": "노력의 결실",
  "advancements.cobblemon.first_evolution.description": "포켓몬의 진화 조건을 달성한 후 파티 메뉴에서 포켓몬을 진화시키세요",
  "advancements.cobblemon.first_battle_victory": "승리의 음악은 어디에?",
@@ -296,6 +613,55 @@
  "advancements.cobblemon.first_shiny_catch.description": "특별한 색 포켓몬을 잡으세요",
  "advancements.cobblemon.healing_machine": "치료의 힘",
  "advancements.cobblemon.healing_machine.description": "치료 머신이 충전될 때까지 기다린 후 당신의 포켓몬들을 치료하세요",
+  "advancements.cobblemon.obtain_leek": "There's a Leek in the Boat!",
+  "advancements.cobblemon.obtain_leek.description": "Obtain a Medicinal Leek, a wild crop that grows in freshwater",
+  "advancements.cobblemon.medicinal_brew": "Local Apothecary",
+  "advancements.cobblemon.medicinal_brew.description": "Brew a Medicinal Leek to create the basis for your healing needs",
+  "advancements.cobblemon.brew_potion": "You cannot handle my Potions",
+  "advancements.cobblemon.brew_potion.description": "Brew an Oran Berry into Medicinal Brew to create a Potion",
+  "advancements.cobblemon.brew_full_restore": "Champion's Choice",
+  "advancements.cobblemon.brew_full_restore.description": "Follow the brewing tree and create a Full Restore with a Lum Berry and Max Potion",
+  "advancements.cobblemon.brew_all": "Double Double Toil & Trouble",
+  "advancements.cobblemon.brew_all.description": "Brew every possible item using Medicinal Brew",
+  "advancements.cobblemon.obtain_mint": "Minty Fresh",
+  "advancements.cobblemon.obtain_mint.description": "Obtain a Nature Mint, a wild crop that grows high in the mountains",
+  "advancements.cobblemon.obtain_all_mints": "A Big Commit-mint",
+  "advancements.cobblemon.obtain_all_mints.description": "Obtain all 6 colors of Nature Mint and gain access to a full array of natures",
+  "advancements.cobblemon.obtain_revival_herb": "Herb your Enthusiasm",
+  "advancements.cobblemon.obtain_revival_herb.description": "Obtain a Revival Herb, a wild crop that grows in lush caves",
+  "advancements.cobblemon.use_revive": "Live to fight another day!",
+  "advancements.cobblemon.use_revive.description": "Use a Revive, Max Revive, or Revival Herb to revive a fainted Pokémon",
+  "advancements.cobblemon.obtain_big_root": "The Root of Basic Healing",
+  "advancements.cobblemon.obtain_big_root.description": "Obtain a Big Root, a wild crop that grows in dirt caves close to the surface",
+  "advancements.cobblemon.craft_remedy": "Basic Healing",
+  "advancements.cobblemon.craft_remedy.description": "Craft a Remedy, an early-game healing item that can be crafted into stronger forms",
+  "advancements.cobblemon.obtain_vivichoke": "Oki-Doki Vivichokey",
+  "advancements.cobblemon.obtain_vivichoke.description": "Obtain a Vivichoke, grown from strangely scarce Vivichoke Seeds",
+  "advancements.cobblemon.obtain_berry": "Very Berry",
+  "advancements.cobblemon.obtain_berry.description": "Obtain any Berry, wild crops that grow on the surface and have many uses",
+  "advancements.cobblemon.obtain_mutated_berry": "An Unexpected Result",
+  "advancements.cobblemon.obtain_mutated_berry.description": "Plant Berry Trees of different types next to each other and witness Mutation in action",
+  "advancements.cobblemon.obtain_all_berries": "Oops, all Berries!",
+  "advancements.cobblemon.obtain_all_berries.description": "Obtain one of every Berry in Cobblemon",
+  "advancements.cobblemon.use_pasture": "Free Roam: Enabled",
+  "advancements.cobblemon.use_pasture.description": "Craft a Pasture Block and allow your friends to wander",
+  "advancements.cobblemon.catch_all_vivillon": "Patterned Wings",
+  "advancements.cobblemon.catch_all_vivillon.description": "Obtain all patterns of Vivillon",
+  "advancements.cobblemon.evolve_veevees": "Valued Veevees",
+  "advancements.cobblemon.evolve_veevees.description": "Evolve Eevee into 8 different forms",
+  "advancements.cobblemon.evolve_shedinja": "Ghost in the Shell",
+  "advancements.cobblemon.evolve_shedinja.description": "Have an extra Poké Ball in your inventory and obtain a Shedinja",
+  "advancements.cobblemon.trade_pokemon": "Take Good Care!",
+  "advancements.cobblemon.trade_pokemon.description": "Trade a Pokémon with another Trainer",
+  "advancements.cobblemon.trade_shelmet_karrablast": "I'd like to report a theft!",
+  "advancements.cobblemon.trade_shelmet_karrablast.description": "Trade a Shelmet and Karrablast",
+  "advancements.cobblemon.max_level_baby": "Darwin? Who's That?",
+  "advancements.cobblemon.max_level_baby.description": "Take a first-stage Pokémon capable of evolution up to level 100",
+  "advancements.cobblemon.use_candy": "Sweet Tooth",
+  "advancements.cobblemon.use_candy.description": "Use any XP Candy on a Pokémon",
+  "advancements.cobblemon.own_zangoose_seviper": "Begrudging Partners",
+  "advancements.cobblemon.own_zangoose_seviper.description": "Have a Zangoose and Seviper in your party at the same time",
+  "cobblemon.battle.crash": "A battle error has occurred. If playing single-player, report this to the mod team. Otherwise, report this to the servers administrator.",
  "cobblemon.battle.damage_dealt": "%1$s(은)는 %2$s 데미지를 입었다!",
  "cobblemon.battle.used_move": "%1$s의 %2$s!",
  "cobblemon.battle.used_move_on": "%1$s used %2$s on %3$s!",
@@ -315,14 +681,19 @@
  "cobblemon.battle.crit": "급소에 맞았다!",
  "cobblemon.battle.nothing": "그러나 아무 일도 일어나지 않았다!",
  "cobblemon.battle.clearallboost": "능력치가 원래대로 되돌아왔다!",
+  "cobblemon.battle.clearallnegativeboost": "%1$s's negative stat changes were removed!",
+  "cobblemon.battle.clearallnegativeboost.zeffect": "%1$s's returned its decreased stats to normal using its Z-Power!",
  "cobblemon.battle.unboost.slight": "%1$s의 %2$s(이)가 떨어졌다!",
  "cobblemon.battle.unboost.sharp": "%1$s의 %2$s(이)가 크게 떨어졌다!",
  "cobblemon.battle.unboost.severe": "%1$s의 %2$s(이)가 아주 크게 떨어졌다!",
  "cobblemon.battle.unboost.cap.single": "%1$s의 %2$s(은)는 더 이상 떨어지지 않는다!",
  "cobblemon.battle.unboost.cap.multiple": "%1$s의 능력치는 더 이상 떨어지지 않는다!",
  "cobblemon.battle.boost.slight": "%1$s의 %2$s(이)가 올랐다!",
+  "cobblemon.battle.boost.slight.zeffect": "%1$s boosted its %2$s using its Z-Power!",
  "cobblemon.battle.boost.sharp": "%1$s의 %2$s(이)가 크게 올랐다!",
+  "cobblemon.battle.boost.sharp.zeffect": "%1$s boosted its %2$s sharply using its Z-Power!",
  "cobblemon.battle.boost.severe": "%1$s의 %2$s(이)가 아주 크게 올랐다!",
+  "cobblemon.battle.boost.severe.zeffect": "%1$s boosted its %2$s drastically using its Z-Power!",
  "cobblemon.battle.boost.cap.single": "%1$s의 %2$s(은)는 더 이상 올라가지 않는다!",
  "cobblemon.battle.boost.cap.multiple": "%1$s의 능력치는 더 이상 올라가지 않는다!",
  "cobblemon.battle.setboost.bellydrum": "%1$s(은)는 체력을 깎아서 풀 파워로 만들었다!",
@@ -340,6 +711,251 @@
  "cobblemon.capture.not_single": "You can only capture wild Pokémon in a 1v1 battle.",
  "cobblemon.you_in_battle": "You can't do that while in a battle!",
  "cobblemon.battle.turn": "%1$s턴 째",
+  "cobblemon.battle.side_subject.ally": "your",
+  "cobblemon.battle.side_subject.opponent": "the opposing",
+  "cobblemon.battle.weather.raindance.start": "It started to rain!",
+  "cobblemon.battle.weather.raindance.upkeep": "Rain continues to fall.",
+  "cobblemon.battle.weather.raindance.end": "The rain stopped.",
+  "cobblemon.battle.weather.sandstorm.start": "A sandstorm kicked up!",
+  "cobblemon.battle.weather.sandstorm.upkeep": "The sandstorm rages.",
+  "cobblemon.battle.weather.sandstorm.end": "The sandstorm subsided.",
+  "cobblemon.battle.weather.sunnyday.start": "The sunlight turned harsh!",
+  "cobblemon.battle.weather.sunnyday.upkeep": "The sunlight is strong.",
+  "cobblemon.battle.weather.sunnyday.end": "The sunlight faded.",
+  "cobblemon.battle.weather.hail.start": "It started to hail!",
+  "cobblemon.battle.weather.hail.upkeep": "The hail is crashing down.",
+  "cobblemon.battle.weather.hail.end": "The hail stopped.",
+  "cobblemon.battle.start.bide": "%1$s begins storing energy!",
+  "cobblemon.battle.start.yawn": "%1$s grew drowsy!",
+  "cobblemon.battle.start.perish": "%1$s's perish count fell to %2$s.",
+  "cobblemon.battle.start.leechseed": "%1$s was seeded!",
+  "cobblemon.battle.start.aquaring": "%1$s surrounded itself with a veil of water!",
+  "cobblemon.battle.start.charge": "%1$s began charging power!",
+  "cobblemon.battle.start.taunt": "%1$s fell for the taunt!",
+  "cobblemon.battle.start.autotomize": "%1$s became nimble!",
+  "cobblemon.battle.start.attract": "%1$s fell in love!",
+  "cobblemon.battle.start.focusenergy": "%1$s is getting pumped!",
+  "cobblemon.battle.start.uproar": "%1$s caused an uproar!",
+  "cobblemon.battle.start.curse": "%1$s cut its own HP and put a curse on %2$s!",
+  "cobblemon.battle.start.miracleeye": "%1$s was identified!",
+  "cobblemon.battle.start.dynamax": "%1$s Dynamaxed!",
+  "cobblemon.battle.start.gmax": "%1$s Gigantamaxed!",
+  "cobblemon.battle.fieldstart.electricterrain": "An electric current ran across the battlefield!",
+  "cobblemon.battle.fieldstart.grassyterrain": "Grass grew to cover the battlefield!",
+  "cobblemon.battle.fieldstart.gravity": "Gravity intensified!",
+  "cobblemon.battle.fieldstart.magicroom": "A bizarre area where held items lose their effects was created!",
+  "cobblemon.battle.fieldstart.mistyterrain": "Mist swirls around the battlefield!",
+  "cobblemon.battle.fieldstart.mudsport": "Electricity's power was weakened!",
+  "cobblemon.battle.fieldstart.psychicterrain": "The battlefield got weird!",
+  "cobblemon.battle.fieldstart.trickroom": "%1$s twisted the dimensions!",
+  "cobblemon.battle.fieldstart.watersport": "Fire's power was weakened!",
+  "cobblemon.battle.fieldstart.wonderroom": "It created a bizarre area in which Defense and Sp. Def stats are swapped!",
+  "cobblemon.battle.fieldend.electricterrain": "The electricity disappeared from the battlefield.",
+  "cobblemon.battle.fieldend.grassyterrain": "The grass disappeared from the battlefield.",
+  "cobblemon.battle.fieldend.gravity": "Gravity returned to normal!",
+  "cobblemon.battle.fieldend.magicroom": "Magic Room wore off, and held items' effects returned to normal!",
+  "cobblemon.battle.fieldend.mistyterrain": "The mist disappeared from the battlefield.",
+  "cobblemon.battle.fieldend.mudsport": "The effects of Mud Sport have faded.",
+  "cobblemon.battle.fieldend.psychicterrain": "The weirdness disappeared from the battlefield!",
+  "cobblemon.battle.fieldend.trickroom": "The twisted dimensions returned to normal!",
+  "cobblemon.battle.fieldend.watersport": "The effects of Water Sport have faded.",
+  "cobblemon.battle.fieldend.wonderroom": "Wonder Room wore off, and Defense and Sp. Def stats returned to normal!",
+  "cobblemon.battle.fieldactivate.perishsong": "All Pokémon that heard the song will faint in three turns!",
+  "cobblemon.battle.sidestart.stealthrock": "Polished stones float in the air around %1$s team!",
+  "cobblemon.battle.sidestart.spikes": "Spikes were scattered on the ground all around %1$s team!",
+  "cobblemon.battle.sidestart.toxicspikes": "Poison spikes were scattered on the ground all around %1$s team!",
+  "cobblemon.battle.sidestart.stickyweb": "A sticky web has been laid on the ground around %1$s team!",
+  "cobblemon.battle.sidestart.reflect": "Reflect made %1$s team stronger against physical moves!",
+  "cobblemon.battle.sidestart.lightscreen": "Light Screen made %1$s team stronger against special moves!",
+  "cobblemon.battle.sidestart.auroraveil": "Aurora Veil made %1$s team stronger against physical and special moves!",
+  "cobblemon.battle.sidestart.tailwind": "The Tailwind blew from behind %1$s team!",
+  "cobblemon.battle.sidestart.safeguard": "%1$s's team cloaked itself in a mystical veil!",
+  "cobblemon.battle.sideend.stealthrock": "The pointed stones disappeared from around %1$s team!",
+  "cobblemon.battle.sideend.spikes": "The spikes disappeared from the ground around %1$s team!",
+  "cobblemon.battle.sideend.toxicspikes": "The poison spikes disappeared from the ground around %1$s team!",
+  "cobblemon.battle.sideend.stickyweb": "The sticky web has disappeared from the ground around %1$s team",
+  "cobblemon.battle.sideend.reflect": "%1$s team's Reflect wore off!",
+  "cobblemon.battle.sideend.lightscreen": "%1$s team's Light Screen wore off!",
+  "cobblemon.battle.sideend.auroraveil": "%1$s team's Aurora Veil wore off!",
+  "cobblemon.battle.sideend.tailwind": "%1$s team's Tailwind petered out!",
+  "cobblemon.battle.sideend.safeguard": "%1$s's team is no longer protected by Safeguard!",
+  "cobblemon.battle.cant.generic": "%1$s can't use %2$s!",
+  "cobblemon.battle.cant.truant": "%1$s is loafing around!",
+  "cobblemon.battle.cant.flinch": "%1$s flinched and couldn't move!",
+  "cobblemon.battle.cant.recharge": "%1$s must recharge!",
+  "cobblemon.battle.cant.attract": "%1$s is immobilized by love!",
+  "cobblemon.battle.cant.disable": "%1$s' %2$s is disabled!",
+  "cobblemon.battle.cant.focuspunch": "%1$s lost its focus and couldn't move!",
+  "cobblemon.battle.cant.healblock": "%1$s can't use %2$s because of Heal Block!",
+  "cobblemon.battle.cant.imprison": "%1$s can't use its sealed %2$s!",
+  "cobblemon.battle.cant.gravity": "%1$s can't use %2$s because of gravity!",
+  "cobblemon.battle.cant.shelltrap": "%1$s's shell trap didn't work!",
+  "cobblemon.battle.cant.taunt": "%1$s can't use %2$s after the taunt!",
+  "cobblemon.battle.cant.throatchop": "The effects of Throat Chop prevent %1$s from using certain moves!",
+  "cobblemon.battle.activate.confusion": "%1$s is confused!",
+  "cobblemon.battle.activate.gravity": "%1$s couldn't stay airborne because of gravity!",
+  "cobblemon.battle.activate.mistyterrain": "%1$s surrounds itself with a protective mist!",
+  "cobblemon.battle.activate.psychicterrain": "%1$s surrounds itself with psychic terrain!",
+  "cobblemon.battle.activate.healbell": "A bell chimed!",
+  "cobblemon.battle.activate.aromatherapy": "A soothing aroma wafted through the area!",
+  "cobblemon.battle.activate.trapped": "%1$s can no longer escape!",
+  "cobblemon.battle.activate.bind": "%1$s was squeezed by %2$s!",
+  "cobblemon.battle.activate.wrap": "%1$s was wrapped by %2$s!",
+  "cobblemon.battle.activate.struggle": "%1$s has no moves left!",
+  "cobblemon.battle.activate.courtchange": "%1$s swapped the battle effects affecting each side of the field!",
+  "cobblemon.battle.activate.guardsplit": "%1$s shared its guard with the target!",
+  "cobblemon.battle.activate.spite": "It reduced the PP of %1$s's %2$s by %3$s!",
+  "cobblemon.battle.activate.lockon": "%1$s took aim at %2$s!",
+  "cobblemon.battle.activate.protosynthesis": "The harsh sunlight activated %1$s's Protosynthesis!",
+  "cobblemon.battle.activate.bide": "%1$s is storing energy!",
+  "cobblemon.battle.activate.protect": "%1$s protected itself!",
+  "cobblemon.battle.activate.magnitude": "Magnitude %1$s!",
+  "cobblemon.battle.activate.destinybond": "%1$s took its attacker down with it!",
+  "cobblemon.battle.activate.synchronize": "[%1$s's Synchronize]",
+  "cobblemon.battle.activate.endure": "%1$s endured the hit!",
+  "cobblemon.battle.activate.attract": "%1$s is in love with %2$s!",
+  "cobblemon.battle.activate.firespin": "%1$s became trapped in the fiery vortex!",
+  "cobblemon.battle.activate.trick": "%1$s switched items with its target!",
+  "cobblemon.battle.activate.quickclaw": "%1$s can act faster than normal, thanks to its Quick Claw!",
+  "cobblemon.battle.activate.focusband": "%1$s hung on using its %2$s!",
+  "cobblemon.battle.activate.forewarn": "%1$s's %2$s was revealed!",
+  "cobblemon.battle.activate.disguise": "It's disguise served it as a decoy!",
+  "cobblemon.battle.activate.liquidooze": "%1$s sucked up the liquid ooze!",
+  "cobblemon.battle.activate.whirlpool": "%1$s became trapped in the vortex!",
+  "cobblemon.battle.activate.clamp": "%2$s clamped down on %1$s!",
+  "cobblemon.battle.prepare.bounce": "%1$s sprang up!",
+  "cobblemon.battle.prepare.dig": "%1$s burrowed its way under the ground!",
+  "cobblemon.battle.prepare.dive": "%1$s hid underwater!",
+  "cobblemon.battle.prepare.fly": "%1$s flew up high!",
+  "cobblemon.battle.prepare.freezeshock": "%1$s became cloaked in a freezing light!",
+  "cobblemon.battle.prepare.geomancy": "%1$s is absorbing power!",
+  "cobblemon.battle.prepare.iceburn": "%1$s became cloaked in freezing air!",
+  "cobblemon.battle.prepare.meteorbeam": "%1$s is overflowing with space power!",
+  "cobblemon.battle.prepare.phantomforce": "%1$s vanished instantly!",
+  "cobblemon.battle.prepare.razorwind": "%1$s whipped up a whirlwind!",
+  "cobblemon.battle.prepare.skullbash": "%1$s tucked in its head!",
+  "cobblemon.battle.prepare.skyattack": "%1$s became cloaked in a harsh light!",
+  "cobblemon.battle.prepare.skydrop": "%1$s took its target into the sky!",
+  "cobblemon.battle.prepare.solarbeam": "%1$s absorbed light!",
+  "cobblemon.battle.swapboost.generic": "%1$s swapped stat boosts with %2$s!",
+  "cobblemon.battle.singleturn.protect": "%1$s protected itself!",
+  "cobblemon.battle.singleturn.endure": "%1$s braced itself!",
+  "cobblemon.battle.singleturn.craftyshield": "Crafty Shield protected %1$s's team!",
+  "cobblemon.battle.singleturn.powder": "%1$s is covered in powder!",
+  "cobblemon.battle.singleturn.followme": "%1$s became the center of attention!",
+  "cobblemon.battle.singleturn.snatch": "%1$s is waiting for a target to make a move!",
+  "cobblemon.battle.singleturn.quickguard": "Quick Guard protected %1$s's team!",
+  "cobblemon.battle.singleturn.wideguard": "Wide Guard protected %1$s's team!",
+  "cobblemon.battle.singleturn.roost": "(%1$s loses Flying type this turn.)",
+  "cobblemon.battle.singleturn.matblock": "%1$s intends to flip up a mat and block incoming attacks!",
+  "cobblemon.battle.singleturn.maxguard": "%1$s protected itself!",
+  "cobblemon.battle.singleturn.instruct": "%1$s followed %2$s's instructions!",
+  "cobblemon.battle.singleturn.focuspunch": "%1$s is tightening its focus!",
+  "cobblemon.battle.singleturn.electrify": "%1$s's moves have been electrified!",
+  "cobblemon.battle.singleturn.beakblast": "%1$s started heating up its beak!",
+  "cobblemon.battle.singleturn.helpinghand": "%2$s is ready to help %1$s!",
+  "cobblemon.battle.singleturn.magiccoat": "%1$s shrouded itself with Magic Coat!",
+  "cobblemon.battle.singleturn.ragepowder": "%1$s became the center of attention!",
+  "cobblemon.battle.singleturn.shelltrap": "%1$s set a shell trap!",
+  "cobblemon.battle.singleturn.spotlight": "%1$s became the center of attention!",
+  "cobblemon.battle.singlemove.destinybond": "%1$s is hoping to take its attacker down with it!",
+  "cobblemon.battle.singlemove.glaiverush": "%1$s throws itself into a reckless charge!",
+  "cobblemon.battle.singlemove.grudge": "%1$s wants its target to bear a grudge!",
+  "cobblemon.battle.singlemove.rage": "%1$s goes into a rage!",
+  "cobblemon.battle.damage.wrap": "%1$s was hurt by wrap!",
+  "cobblemon.battle.damage.confusion": "%1$s hurt itself in confusion!",
+  "cobblemon.battle.damage.leechseed": "%1$s's health is sapped by Leech Seed!",
+  "cobblemon.battle.damage.sandstorm": "%1$s was buffeted by the sandstorm.",
+  "cobblemon.battle.damage.hail": "%1$s was buffeted by hail.",
+  "cobblemon.battle.damage.stealthrock": "Pointed stones dug into %1$s!",
+  "cobblemon.battle.damage.spikes": "%1$s was hurt by the spikes!",
+  "cobblemon.battle.damage.recoil": "%1$s was damaged by the recoil!",
+  "cobblemon.battle.damage.item": "%1$s was hurt by its %2$s!",
+  "cobblemon.battle.damage.lifeorb": "%1$s lost some of its HP!",
+  "cobblemon.battle.damage.rockyhelmet": "%1$s was hurt by %2$s's Rocky Helmet!",
+  "cobblemon.battle.damage.generic": "%1$s was hurt!",
+  "cobblemon.battle.damage.pokemonmimikyubusted": "%1$s's disguise was busted!",
+  "cobblemon.battle.damage.whirlpool": "%1$s was hurt by Whirlpool!",
+  "cobblemon.battle.damage.clamp": "%1$s was hurt by Clamp!",
+  "cobblemon.battle.damage.curse": "%1$s was afflicted by the curse!",
+  "cobblemon.battle.end.bind": "%1$s is no longer being squeezed!",
+  "cobblemon.battle.end.wrap": "%1$s was freed from wrap!",
+  "cobblemon.battle.end.disable": "%1$s's move is no longer disabled!",
+  "cobblemon.battle.end.protosynthesis": "The effects of %1$s's Protosynthesis wore off!",
+  "cobblemon.battle.end.taunt": "%1$s shook off the taunt!",
+  "cobblemon.battle.end.firespin": "%1$s was freed from Fire Spin!",
+  "cobblemon.battle.end.bide": "%1$s unleashed its energy!",
+  "cobblemon.battle.end.confusion": "%1$s snapped out of its confusion!",
+  "cobblemon.battle.end.whirlpool": "%1$s was freed from the vortex!",
+  "cobblemon.battle.end.clamp": "%1$s was freed from Clamp!",
+  "cobblemon.battle.end.dynamax": "%1$s returned to normal!",
+  "cobblemon.battle.sethp.painsplit": "The battlers shared their pain!",
+  "cobblemon.battle.ability.sturdy": "%1$s endured the hit!",
+  "cobblemon.battle.ability.unnerve": "%1$s made the opponent too nervous to eat berries!",
+  "cobblemon.battle.ability.anticipation": "%1$s shuddered in anticipation!",
+  "cobblemon.battle.ability.airlock": "The effects of the weather disappeared.",
+  "cobblemon.battle.ability.generic": "%1$s's %2$s activated!",
+  "cobblemon.battle.ability.magicbounce": "%1$s bounced the %2$s back!",
+  "cobblemon.battle.errors.busy": "%1$s is busy!",
+  "cobblemon.battle.error.in_battle": "%1$s is already in a battle.",
+  "cobblemon.battle.error.in_battle.personal": "You are already in a battle!",
+  "cobblemon.battle.error.no_pokemon": "You don't have any usable Pokémon!",
+  "cobblemon.battle.error.no_pokemon_opponent": "Your opponent doesn't have any usable Pokémon!",
+  "cobblemon.battle.error.insufficient_pokemon": "%1$s has %2 Pokémon when %3 are required.",
+  "cobblemon.battle.error.insufficient_pokemon.personal": "You have %1 usable Pokémon but you need %2.",
+  "cobblemon.battle.error.pokemon_is_trapped": "[Unavailable choice] Can't switch: The active Pokémon is trapped",
+  "cobblemon.battle.immune": "But %1$s is immune!",
+  "cobblemon.battle.missed": "But it missed.",
+  "cobblemon.battle.hit_count": "Hit %1$s times!",
+  "cobblemon.battle.hit_count_singular": "Hit 1 time!",
+  "cobblemon.battle.item.airballoon": "%1$s floats in the air with its %2$s!",
+  "cobblemon.battle.item.recycle": "%1$s found one %2$s!",
+  "cobblemon.battle.item.frisk": "%3$s frisked %1$s and found its %2$s!",
+  "cobblemon.battle.item.thief": "%1$s stole %3$s's %2$s!",
+  "cobblemon.battle.item.harvest": "%1$s harvested one %2$s!",
+  "cobblemon.battle.item.bestow": "%1$s received %2$s from %3$s!",
+  "cobblemon.battle.item.trick": "%1$s obtained one %2$s.",
+  "cobblemon.battle.item.eat": "%1$s ate its %2$s.",
+  "cobblemon.battle.enditem.eat": "%1$s ate its %2$s!",
+  "cobblemon.battle.enditem.fling": "%1$s flung its %2$s!",
+  "cobblemon.battle.enditem.knockoff": "%3$s knocked off %1$s's %2$s!",
+  "cobblemon.battle.enditem.gem": "The %2$s strengthened %1$s's power!",
+  "cobblemon.battle.enditem.incinerate": "%1$s's %2$s was burned up!",
+  "cobblemon.battle.enditem.airballoon": "%1$s's Air Balloon popped!",
+  "cobblemon.battle.enditem.redcard": "%1$s held up its Red Card against %3$s!",
+  "cobblemon.battle.enditem.pluck": "%3$s stole and ate %1$s's %2$s!",
+  "cobblemon.battle.enditem.berryjuice": "%1$s's Berry Juice activated!",
+  "cobblemon.battle.enditem.generic": "%1$s used its %2$s!",
+  "cobblemon.battle.enditem.mentalherb": "%1$s shook off mental effects due to its Mental Herb!",
+  "cobblemon.battle.enditem.powerherb": "%1$s became fully charged due to its Power Herb!",
+  "cobblemon.battle.enditem.mirrorherb": "%1$s copied stat changes with its Mirror Herb!",
+  "cobblemon.battle.enditem.whiteherb": "%1$s returned its status to normal using its White Herb!",
+  "cobblemon.battle.heal.zeffect": "%1$s's HP was restored by the Z-Power!",
+  "cobblemon.battle.heal.wish": "%1$s's wish came true!",
+  "cobblemon.battle.heal.drain": "%1$s had its HP drained!",
+  "cobblemon.battle.heal.healingwish": "The healing wish came true for %1$s!",
+  "cobblemon.battle.heal.revivalblessing": "%1$s was revived and is ready to fight again!",
+  "cobblemon.battle.heal.aquaring": "A veil of water restored %1$s's HP!",
+  "cobblemon.battle.heal.ingrain": "%1$s absorbed nutrients with its roots!",
+  "cobblemon.battle.heal.grassyterrain": "%1$s's HP was restored.",
+  "cobblemon.battle.heal.leftovers": "%1$s restored a little HP using its %2$s!",
+  "cobblemon.battle.heal.item": "%1$s restored HP using its %2$s!",
+  "cobblemon.battle.heal.raindish": "%1$s restored HP from Rain Dish!",
+  "cobblemon.battle.heal.generic": "%1$s restored its HP.",
+  "cobblemon.battle.heal.bagitempotion": "It restored %1$s's HP",
+  "cobblemon.battle.curestatus.naturalcure": "%1$s is cured by its Natural Cure!",
+  "cobblemon.battle.bagitem.use": "%1$s used a %2$s on %3$s!",
+  "cobblemon.battle.bagitem.cannot": "You cannot use items right now.",
+  "cobblemon.battle.bagitem.invalid": "This item would not work.",
+  "cobblemon.battle.zpower": "%1$s surrounded itself with its Z-Power!",
+  "cobblemon.battle.zbroken": "%1$s couldn't fully protect itself and got hurt!",
+  "cobblemon.battle.terastallize": "%1$s has Terastallized into the %2$s-type!",
+  "cobblemon.battle.detailschange.mega": "%1$s is reacting to the Key Stone!",
+  "cobblemon.battle.mega": "%1$s has Mega Evolved!",
+  "cobblemon.experience.gained": "%1$s(은)는 경험치 %2$s를 획득하였다.",
+  "cobblemon.experience.level_up": "%1$s(은)는 레벨 %2$s로 올랐다!",
+  "cobblemon.experience.learned_move": "%1$s(은)는 %2$s(을)를 배웠다.",
+  "cobblemon.party.faintRecover": "%1$s(은)는 정신을 차렸다.",
  "cobblemon.type.fire": "불",
  "cobblemon.type.water": "물",
  "cobblemon.type.grass": "풀",
@@ -358,6 +974,34 @@
  "cobblemon.type.rock": "바위",
  "cobblemon.type.poison": "독",
  "cobblemon.type.dragon": "드래곤",
+  "cobblemon.nature.hardy": "노력",
+  "cobblemon.nature.lonely": "외로움",
+  "cobblemon.nature.brave": "용감",
+  "cobblemon.nature.adamant": "고집",
+  "cobblemon.nature.naughty": "개구쟁이",
+  "cobblemon.nature.docile": "온순",
+  "cobblemon.nature.relaxed": "무사태평",
+  "cobblemon.nature.impish": "장난꾸러기",
+  "cobblemon.nature.lax": "촐랑",
+  "cobblemon.nature.timid": "겁쟁이",
+  "cobblemon.nature.hasty": "성급",
+  "cobblemon.nature.serious": "성실",
+  "cobblemon.nature.jolly": "명랑",
+  "cobblemon.nature.naive": "천진난만",
+  "cobblemon.nature.modest": "조심",
+  "cobblemon.nature.mild": "의젓",
+  "cobblemon.nature.bashful": "수줍음",
+  "cobblemon.nature.rash": "덜렁",
+  "cobblemon.nature.calm": "차분",
+  "cobblemon.nature.gentle": "얌전",
+  "cobblemon.nature.sassy": "건방",
+  "cobblemon.nature.careful": "신중",
+  "cobblemon.nature.quirky": "변덕",
+  "cobblemon.nature.bold": "대담",
+  "cobblemon.nature.quiet": "냉정",
+  "cobblemon.species.random": "Random Pokémon",
+  "cobblemon.species.unknown": "Unknown Pokémon",
+  "cobblemon.a_pokemon": "A Pokémon",
  "cobblemon.starterselection.category.kanto": "관동지방",
  "cobblemon.starterselection.category.johto": "성도지방",
  "cobblemon.starterselection.category.hoenn": "호연지방",
@@ -367,22 +1011,96 @@
  "cobblemon.starterselection.category.alola": "알로라지방",
  "cobblemon.starterselection.category.galar": "가라르지방",
  "cobblemon.starterselection.category.paldea": "팔데아지방",
+  "cobblemon.stat.hp.name": "HP",
+  "cobblemon.stat.attack.name": "공격",
+  "cobblemon.stat.defence.name": "방어",
+  "cobblemon.stat.special_attack.name": "특수공격",
+  "cobblemon.stat.special_defence.name": "특수방어",
+  "cobblemon.stat.speed.name": "스피드",
+  "cobblemon.stat.accuracy.name": "명중",
+  "cobblemon.stat.evasion.name": "회피",
  "cobblemon.move.category.physical": "물리",
  "cobblemon.move.category.special": "특수",
  "cobblemon.move.category.status": "정보",
  "cobblemon.status.sleep.apply": "%1$s(은)는 잠들어버렸다!",
  "cobblemon.status.sleep.is": "%1$s(은)는 쿨쿨 잠들어 있다",
-  "cobblemon.status.sleep.woke": "%1$s(은)는 눈을 떴다!",
+  "cobblemon.status.sleep.cure": "%1$s woke up!",
  "cobblemon.status.paralysis.apply": "%1$s(은)는 마비되어 기술이 나오기 어려워졌다!",
  "cobblemon.status.paralysis.is": "%1$s(은)는 몸이 저려서 움직일 수 없다",
+  "cobblemon.status.paralysis.cure": "%1$s 의 마비가 치료되었다!",
  "cobblemon.status.poison.apply": "%1$s의 몸에 독이 퍼졌다!",
+  "cobblemon.status.poison.cure": "%1$s의 독이 치료되었다!",
  "cobblemon.status.poisonbadly.apply": "%1$s의 몸에 맹독이 퍼졌다!",
-  "cobblemon.status.poison.hurt": "%1$s(은)는 독에 의한 데미지를 입었다",
+  "cobblemon.status.poison.hurt": "%1$s was hurt by poison!",
  "cobblemon.status.burn.apply": "%1$s(은)는 화상을 입었다!",
  "cobblemon.status.burn.hurt": "%1$s(은)는 화상 데미지를 입었다!",
+  "cobblemon.status.burn.cure": "%1$s의 화상이 치료되었다!",
  "cobblemon.status.frozen.apply": "%1$s(은)는 얼어붙었다!",
-  "cobblemon.status.frozen.thawed": "%1$s(은)는 몸이 녹았다!",
+  "cobblemon.status.frozen.cure": "%1$s thawed out!",
  "cobblemon.status.frozen.is": "%1$s(은)는 얼어버려서 움직일 수 없다!",
+  "block.cobblemon.dawn_stone_ore": "각성의돌 광석",
+  "block.cobblemon.dusk_stone_ore": "어둠의돌 광석",
+  "block.cobblemon.fire_stone_ore": "불꽃의돌 광석",
+  "block.cobblemon.ice_stone_ore": "얼음의돌 광석",
+  "block.cobblemon.leaf_stone_ore": "리프의돌 광석",
+  "block.cobblemon.moon_stone_ore": "달의돌 광석",
+  "block.cobblemon.shiny_stone_ore": "빛의돌 광석",
+  "block.cobblemon.sun_stone_ore": "태양의돌 광석",
+  "block.cobblemon.thunder_stone_ore": "천둥의돌 광석",
+  "block.cobblemon.water_stone_ore": "물의돌 광석",
+  "block.cobblemon.deepslate_dawn_stone_ore": "심층암 각성의돌 광석",
+  "block.cobblemon.deepslate_dusk_stone_ore": "심층암 어둠의돌 광석",
+  "block.cobblemon.deepslate_fire_stone_ore": "심층암 불꽃의돌 광석",
+  "block.cobblemon.deepslate_ice_stone_ore": "심층암 얼음의돌 광석",
+  "block.cobblemon.deepslate_leaf_stone_ore": "심층암 리프의돌 광석",
+  "block.cobblemon.deepslate_moon_stone_ore": "심층암 달의돌 광석",
+  "block.cobblemon.deepslate_shiny_stone_ore": "심층암 빛의돌 광석",
+  "block.cobblemon.deepslate_sun_stone_ore": "심층암 태양의돌 광석",
+  "block.cobblemon.deepslate_thunder_stone_ore": "심층암 천둥의돌 광석",
+  "block.cobblemon.deepslate_water_stone_ore": "심층암 물의돌 광석",
+  "block.cobblemon.dripstone_moon_stone_ore": "심층암 달의돌 광석",
+  "block.cobblemon.pasture": "Pasture Block",
+  "gamerule.doPokemonSpawning": "Spawn Pokémon",
+  "gamerule.doShinyStarters": "Starters will be shiny",
+  "cobblemon.command.checkspawns.invalid-bucket": "Invalid Spawn Bucket",
+  "cobblemon.command.checkspawns.spawns": "Spawns",
+  "cobblemon.command.checkspawns.nothing": "Nothing can spawn here right now.",
+  "cobblemon.interaction.ev.add": "%1$s' %2$s EVs increased by %3$s!",
+  "cobblemon.interaction.ev.deduct": "%1$s' %2$s EVs decreased by %3$s!",
+  "cobblemon.interaction.pp.restore": "You restore the PP of %1$s.",
+  "cobblemon.interaction.friendsip.add": "%1$s grows closer to you!",
+  "cobblemon.interaction.status.cure": "%1$s is cured of its status condition!",
+  "cobblemon.interaction.hp.heal": "%1$s restored its HP a bit!",
+  "tag.item.cobblemon.apricorn_logs": "Apricorn Logs",
+  "tag.item.cobblemon.apricorn_sprouts": "Apricorn Sprouts",
+  "tag.item.cobblemon.apricorns": "Apricorns",
+  "tag.item.cobblemon.azalea_tree": "Azalea Trees",
+  "tag.item.cobblemon.berries": "Berries",
+  "tag.item.cobblemon.cobblemon_seeds": "Seeds",
+  "tag.item.cobblemon.evolution_items": "Evolution Items",
+  "tag.item.cobblemon.evolution_stones": "Evolution Stones",
+  "tag.item.cobblemon.experience_candies": "Experience Candies",
+  "tag.item.cobblemon.held.destiny_knot": "Destiny Knots",
+  "tag.item.cobblemon.held.everstone": "Everstones",
+  "tag.item.cobblemon.held.experience_share": "Experience Shares",
+  "tag.item.cobblemon.held.is_held_item": "Held Items",
+  "tag.item.cobblemon.held.lucky_egg": "Lucky Eggs",
+  "tag.item.cobblemon.held.power_anklet": "Power Anklets",
+  "tag.item.cobblemon.held.power_band": "Power Bands",
+  "tag.item.cobblemon.held.power_belt": "Power Belts",
+  "tag.item.cobblemon.held.power_bracer": "Power Bracers",
+  "tag.item.cobblemon.held.power_lens": "Power Lenses",
+  "tag.item.cobblemon.held.power_weight": "Power Weights",
+  "tag.item.cobblemon.herbs": "Herbs",
+  "tag.item.cobblemon.mint_leaf": "Mint Leaves",
+  "tag.item.cobblemon.mints": "Mints",
+  "tag.item.cobblemon.mutated_berries": "Mutation Berries",
+  "tag.item.cobblemon.plants": "Plants",
+  "tag.item.cobblemon.poke_balls": "Poké Balls",
+  "tag.item.cobblemon.protein_ingredients": "Protein Ingredients",
+  "tag.item.cobblemon.zinc_ingredients": "Zinc Ingredients",
+  "tag.item.cobblemon.seeds": "Seeds",
+
  "cobblemon.ability.adaptability": "적응력",
  "cobblemon.ability.adaptability.desc": "자신과 같은 타입의 기술 위력이 올라간다.",
  "cobblemon.ability.aerilate": "스카이스킨",
@@ -1,5 +1,4 @@
 {
-  "itemGroup.cobblemon.pokeball": "Poké Bolas",
  "item.cobblemon.poke_ball": "Poké Bola",
  "item.cobblemon.slate_ball": "Bola Ardósia",
  "item.cobblemon.azure_ball": "Bola Azura",
@@ -32,13 +31,13 @@
  "item.cobblemon.park_ball": "Bola Parque",
  "item.cobblemon.dream_ball": "Bola Sonho",
  "item.cobblemon.beast_ball": "Bola Criatura",
-  "item.cobblemon.black_apricorn_seed": "Broto de azinheira preta",
-  "item.cobblemon.blue_apricorn_seed": "Broto de azinheira azul",
-  "item.cobblemon.green_apricorn_seed": "Broto de azinheira verde",
-  "item.cobblemon.pink_apricorn_seed": "Broto de azinheira rosa",
-  "item.cobblemon.red_apricorn_seed": "Broto de azinheira vermelha",
-  "item.cobblemon.white_apricorn_seed": "Broto de azinheira branca",
-  "item.cobblemon.yellow_apricorn_seed": "Broto de azinheira amarela",
+  "item.cobblemon.black_apricorn_seed": "Muda de Bolota Preta",
+  "item.cobblemon.blue_apricorn_seed": "Muda de Bolota Azul",
+  "item.cobblemon.green_apricorn_seed": "Muda de Bolota Verde",
+  "item.cobblemon.pink_apricorn_seed": "Muda de Bolota Rosa",
+  "item.cobblemon.red_apricorn_seed": "Muda de Bolota Vermelha",
+  "item.cobblemon.white_apricorn_seed": "Muda de Bolota Branca",
+  "item.cobblemon.yellow_apricorn_seed": "Muda de Bolota Amarela",
  "item.cobblemon.black_apricorn": "Bolota preta",
  "item.cobblemon.blue_apricorn": "Bolota azul",
  "item.cobblemon.green_apricorn": "Bolota verde",
@@ -46,7 +45,8 @@
  "item.cobblemon.red_apricorn": "Bolota vermelha",
  "item.cobblemon.white_apricorn": "Bolota branca",
  "item.cobblemon.yellow_apricorn": "Bolota amarela",
-  "itemGroup.cobblemon.evolution_item": "Itens de evolução",
+  "item.cobblemon.vivichoke_seeds": "Sementes de Broto Vital",
+  "item.cobblemon.vivichoke": "Broto Vital",
  "item.cobblemon.link_cable": "Cabo conector",
  "item.cobblemon.dragon_scale": "Escama de dragão",
  "item.cobblemon.kings_rock": "Pedra do rei",
@@ -88,7 +88,6 @@
  "item.cobblemon.sun_stone": "Pedra solar",
  "item.cobblemon.thunder_stone": "Pedra trovão",
  "item.cobblemon.water_stone": "Pedra d'água",
-  "itemGroup.cobblemon.medicine": "Medicina",
  "item.cobblemon.rare_candy": "Doce Raro",
  "item.cobblemon.exp_candy_xs": "Doce de Exp. PP",
  "item.cobblemon.exp_candy_s": "Doce de Exp. P",
@@ -101,10 +100,47 @@
  "item.cobblemon.iron": "Ferro",
  "item.cobblemon.protein": "Proteína",
  "item.cobblemon.zinc": "Zinco",
-  "itemGroup.cobblemon.held_item": "Item carregado",
+  "item.cobblemon.potion": "Poção",
+  "item.cobblemon.super_potion": "Super Poção",
+  "item.cobblemon.hyper_potion": "Hiper Poção",
+  "item.cobblemon.max_potion": "Poção Máxima",
+  "item.cobblemon.full_restore": "Restauração Total",
+  "item.cobblemon.red_mint_leaf": "Folha de Menta Vermelha",
+  "item.cobblemon.red_mint_leaf.tooltip": "Capaz de influenciar o status de ataque de um Pokémon",
+  "item.cobblemon.blue_mint_leaf": "Folha de Menta Azul",
+  "item.cobblemon.blue_mint_leaf.tooltip": "Capaz de influenciar o status de defesa de um Pokémon",
+  "item.cobblemon.cyan_mint_leaf": "Folha de Menta Ciano",
+  "item.cobblemon.cyan_mint_leaf.tooltip": "Capaz de influenciar o status de ataque especial de um Pokémon",
+  "item.cobblemon.pink_mint_leaf": "Folha de Menta Rosa",
+  "item.cobblemon.pink_mint_leaf.tooltip": "Capaz de influenciar o status de defesa especial de um Pokémon",
+  "item.cobblemon.green_mint_leaf": "Folha de Menta Verde",
+  "item.cobblemon.green_mint_leaf.tooltip": "Capaz de influenciar o status de velocidade de um Pokémon",
+  "item.cobblemon.white_mint_leaf": "Folha de Menta Branca",
+  "item.cobblemon.white_mint_leaf.tooltip": "Capaz de tornar a natureza de um Pokémon neutra",
+  "item.cobblemon.lonely_mint": "Menta Solitária",
+  "item.cobblemon.adamant_mint": "Menta Determinada",
+  "item.cobblemon.naughty_mint": "Menta Travessa",
+  "item.cobblemon.brave_mint": "Menta Brava",
+  "item.cobblemon.bold_mint": "Menta Confiante",
+  "item.cobblemon.impish_mint": "Menta Perversa",
+  "item.cobblemon.lax_mint": "Menta Flexível",
+  "item.cobblemon.relaxed_mint": "Menta Relaxada",
+  "item.cobblemon.modest_mint": "Menta Modesta",
+  "item.cobblemon.mild_mint": "Menta Serena",
+  "item.cobblemon.rash_mint": "Menta Imprudente",
+  "item.cobblemon.quiet_mint": "Menta Quieta",
+  "item.cobblemon.calm_mint": "Menta Calma",
+  "item.cobblemon.gentle_mint": "Menta Gentil",
+  "item.cobblemon.careful_mint": "Menta Cuidadosa",
+  "item.cobblemon.sassy_mint": "Menta Vívida",
+  "item.cobblemon.timid_mint": "Menta Tímida",
+  "item.cobblemon.hasty_mint": "Menta Abrupta",
+  "item.cobblemon.jolly_mint": "Menta Alegre",
+  "item.cobblemon.naive_mint": "Menta Ingênua",
+  "item.cobblemon.serious_mint": "Menta Séria",
  "item.cobblemon.assault_vest": "Colete de ataque",
  "item.cobblemon.auspicious_armor": "Armadura Auspiciosa",
-  "item.cobblemon.big_root": "Raiz Grande",
+  "item.cobblemon.malicious_armor": "Armadura Maldita",
  "item.cobblemon.black_belt": "Faixa Preta",
  "item.cobblemon.black_glasses": "Óculos escuros",
  "item.cobblemon.black_sludge": "Lama Negra",
@@ -113,7 +149,7 @@
  "item.cobblemon.choice_scarf": "Cachecol da Escolha",
  "item.cobblemon.choice_specs": "Óculos da escolha",
  "item.cobblemon.dragon_fang": "Presa de Dragão",
-  "item.cobblemon.exp_share": "Compartilhamento de Exp",
+  "item.cobblemon.exp_share": "Compartilhador de Exp",
  "item.cobblemon.focus_band": "Faixa de foco",
  "item.cobblemon.hard_stone": "Pedra rígida",
  "item.cobblemon.heavy_duty_boots": "Botas pesadas",
@@ -138,6 +174,21 @@
  "item.cobblemon.spell_tag": "Talismã de Feitiço",
  "item.cobblemon.twisted_spoon": "Colher Retorcida",
  "item.cobblemon.wise_glasses": "Óculos sábios",
+  "item.cobblemon.mental_herb": "Erva Mental",
+  "item.cobblemon.mirror_herb": "Erva Espelho",
+  "item.cobblemon.power_herb": "Erva do Poder",
+  "item.cobblemon.white_herb": "Erva Branca",
+  "item.cobblemon.bright_powder": "Pó Brilhante",
+  "item.cobblemon.metal_powder": "Pó de Metal",
+  "item.cobblemon.quick_powder": "Pó Veloz",
+  "item.cobblemon.destiny_knot": "Nó do Destino",
+  "item.cobblemon.everstone": "Pedra Imutável",
+  "item.cobblemon.power_anklet": "Tornozeleira do Poder",
+  "item.cobblemon.power_band": "Faixa do Poder",
+  "item.cobblemon.power_belt": "Cinto do Poder",
+  "item.cobblemon.power_bracer": "Braçadeira do Poder",
+  "item.cobblemon.power_lens": "Lentes do Poder",
+  "item.cobblemon.power_weight": "Peso do Poder",
  "item.cobblemon.poke_ball.tooltip": "Taxa de captura 1×",
  "item.cobblemon.slate_ball.tooltip": "Taxa de captura 1×",
  "item.cobblemon.azure_ball.tooltip": "Taxa de captura 1×",
@@ -170,6 +221,56 @@
  "item.cobblemon.park_ball.tooltip": "2.5x em todos os biomas de Floresta ou Planícies",
  "item.cobblemon.dream_ball.tooltip": "4x em Pokémon adormecidos",
  "item.cobblemon.beast_ball.tooltip": "5x em Ultra criaturas, 0.1x caso contrário",
+  "item.cobblemon.mulch_base": "Adubo",
+  "item.cobblemon.coarse_mulch": "Adubo Grosso",
+  "item.cobblemon.growth_mulch": "Adubo Fértil",
+  "item.cobblemon.humid_mulch": "Adubo Úmido",
+  "item.cobblemon.loamy_mulch": "Adubo Argiloso",
+  "item.cobblemon.peat_mulch": "Adubo de Turfa",
+  "item.cobblemon.rich_mulch": "Adubo Rico",
+  "item.cobblemon.sandy_mulch": "Adubo Arenoso",
+  "item.cobblemon.surprise_mulch": "Adubo Surpresa",
+  "item.cobblemon.medicinal_leek": "Alho-poró Medicinal",
+  "item.cobblemon.energy_root": "Raiz Energética",
+  "item.cobblemon.revival_herb": "Erva Revitalizante",
+  "item.cobblemon.roasted_leek": "Alho-poró Assado",
+  "item.cobblemon.leek_and_potato_stew": "Ensopado de Batata com Alho-poró",
+  "item.cobblemon.braised_vivichoke": "Broto Vital Selado",
+  "item.cobblemon.vivichoke_dip": "Molho de Broto Vital",
+  "item.cobblemon.berry_juice": "Suco de Baga",
+  "item.cobblemon.remedy": "Remédio",
+  "item.cobblemon.fine_remedy": "Remédio Bom",
+  "item.cobblemon.superb_remedy": "Remédio Incrível",
+  "item.cobblemon.heal_powder": "Pó Curativo",
+  "item.cobblemon.medicinal_brew": "Bebida Medicinal",
+  "item.cobblemon.revive": "Reviver",
+  "item.cobblemon.max_revive": "Máximo Reviver",
+  "item.cobblemon.pp_up": "PP Up",
+  "item.cobblemon.pp_max": "PP Máximo",
+  "item.cobblemon.x_attack": "Ataque X",
+  "item.cobblemon.x_defence": "Defesa X",
+  "item.cobblemon.x_accuracy": "Precisão X",
+  "item.cobblemon.x_speed": "Velocidade X",
+  "item.cobblemon.x_special_defence": "Defesa Especial X",
+  "item.cobblemon.x_special_attack": "Ataque Especial X",
+  "item.cobblemon.dire_hit": "Golpe Atroz",
+  "item.cobblemon.guard_spec": "Guarda Status",
+  "item.cobblemon.full_heal": "Cura Total",
+  "item.cobblemon.antidote": "Antídoto",
+  "item.cobblemon.awakening": "Estimulante",
+  "item.cobblemon.burn_heal": "Cura para Queimadura",
+  "item.cobblemon.ice_heal": "Cura para Congelamento",
+  "item.cobblemon.paralyze_heal": "Cura para Paralisia",
+  "item.cobblemon.ether": "Éter",
+  "item.cobblemon.max_ether": "Éter Máximo",
+  "item.cobblemon.elixir": "Elixir",
+  "item.cobblemon.max_elixir": "Elixir Máximo",
+  "itemGroup.cobblemon.blocks": "Blocos",
+  "itemGroup.cobblemon.pokeball": "Poké Bolas",
+  "itemGroup.cobblemon.agriculture": "Agricultura",
+  "itemGroup.cobblemon.consumables": "Consumíveis",
+  "itemGroup.cobblemon.held_item": "Item carregado",
+  "itemGroup.cobblemon.evolution_item": "Itens de evolução",
  "block.cobblemon.apricorn_log": "Tronco de azinheira",
  "block.cobblemon.stripped_apricorn_log": "Tronco de azinheira descascado",
  "block.cobblemon.apricorn_wood": "Madeira de azinheira",
@@ -183,6 +284,7 @@
  "block.cobblemon.apricorn_button": "Botão de azinheira",
  "block.cobblemon.apricorn_slab": "Laje de azinheira",
  "block.cobblemon.apricorn_fence_gate": "Portão de azinheira",
+  "block.cobblemon.big_root": "Raiz Grande",
  "block.cobblemon.black_apricorn_sapling": "Muda de azinheira preta",
  "block.cobblemon.blue_apricorn_sapling": "Muda de azinheira azul",
  "block.cobblemon.green_apricorn_sapling": "Muda de azinheira verde",
@@ -196,12 +298,24 @@
  "block.cobblemon.healing_machine.tooltip1": "Deve ser carregado depois de posicionar.",
  "block.cobblemon.healing_machine.tooltip2": "Carrega ao longo do tempo.",
  "block.cobblemon.pc": "PC",
+  "block.cobblemon.red_mint": "Sementes de Menta Vermelha",
+  "block.cobblemon.blue_mint": "Sementes de Menta Azul",
+  "block.cobblemon.cyan_mint": "Sementes de Menta Ciano",
+  "block.cobblemon.pink_mint": "Sementes de Menta Rosa",
+  "block.cobblemon.green_mint": "Sementes de Menta Verde",
+  "block.cobblemon.white_mint": "Sementes de Menta Branca",
+  "block.cobblemon.vivichoke_seeds": "Sementes de Broto Vital",
+  "block.cobblemon.pep_up_flower": "Flor Revigorante",
+  "block.cobblemon.potted_pep_up_flower": "Flor Revigorante no Vaso",
  "cobblemon.overflow_no_pc": "Sua equipe está cheia e você não tem um PC!",
  "cobblemon.overflow_no_space": "Sua equipe está cheia então foi para o %1$s!",
  "cobblemon.overflow_to_pc": "Sua equipe está cheia! %1$s foi adicionado ao %2$s.",
  "cobblemon.your_pc": "Seu PC",
  "cobblemon.command.pokespawn.invalid-pokemon": "Nome de Pokémon inválido",
  "cobblemon.command.pokespawn.invalid-move": "Nome de movimento inválido",
+  "cobblemon.command.clearparty.nonethere": "Não há Pokémon na equipe do(a) %1$s.",
+  "cobblemon.command.clearparty.cleared": "A equipe do(a) %1$s foi esvaziada.",
+  "cobblemon.command.clearpc.cleared": "O PC do(a) %1$s foi esvaziado.",
  "cobblemon.ui.generic.yes": "Sim",
  "cobblemon.ui.generic.no": "Não",
  "cobblemon.ui.pokenav.title": "PokeNav",
@@ -211,6 +325,8 @@
  "cobblemon.ui.starter.alreadyselected": "Você já escolheu um iniciante!",
  "cobblemon.ui.starter.cannotchoose": "Você não pode escolher um iniciante agora.",
  "cobblemon.ui.starter.hasalreadychosen": "%1$s já escolheu um iniciante.",
+  "cobblemon.ui.starter.choose_starter_title": "Escolha o seu inicial!",
+  "cobblemon.ui.starter.choose_starter_description": "Pressiona a tecla \"%1$s\"",
  "cobblemon.ui.starter.chooseyourstarter": "Pressione %1$s para escolher seu Pokémon e começar sua jornada!",
  "cobblemon.ui.moves": "Movimentos",
  "cobblemon.ui.moves.switch": "Trocar Movimentos",
@@ -237,6 +353,12 @@
  "cobblemon.ui.info.ability": "Habilidade",
  "cobblemon.ui.info.experience_points": "Pontos de Exp.",
  "cobblemon.ui.info.to_next_level": "Para prox Niv.",
+  "cobblemon.ui.trade": "Troca",
+  "cobblemon.trade.occupied": "%1$s está ocupado(a).",
+  "cobblemon.trade.request_expired": "A requisição de troca com %1$s expirou.",
+  "cobblemon.trade.request_already_expired": "A solicitação de troca deles já expirou.",
+  "cobblemon.trade.request_sent": "Troca ofertada para %1$s",
+  "cobblemon.trade.offer": "%1$s quer trocar com você.",
  "cobblemon.ui.party": "Equipe",
  "cobblemon.ui.power": "Força",
  "cobblemon.ui.accuracy": "Precisão",
@@ -245,6 +367,10 @@
  "cobblemon.ui.exit": "Sair",
  "cobblemon.ui.pc.box.title": "Box %1$s",
  "cobblemon.ui.pc.release": "Soltar",
+  "cobblemon.ui.pasture": "Pasto",
+  "cobblemon.ui.pasture.recall_all": "Chamar Todos",
+  "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)",
+  "cobblemon.pasture.too_many_nearby": "Há muitos Pokémon nas proximidades.",
  "key.cobblemon.upshiftparty": "Mover Equipe Cima",
  "key.cobblemon.downshiftparty": "Mover Equipe Baixo",
  "key.cobblemon.hideparty": "Esconder Tela de Equipe",
@@ -291,9 +417,150 @@
  "cobblemon.label.lv": "Nv. %1$s",
  "cobblemon.challenge_label": "Pressione %1$s para batalhar.",
  "cobblemon.challenge.sender": "Você desafiou %1$s para uma batalha!",
-  "cobblemon.challenge.receiver": "%1$s te desafiou para batalha! Pressione %2$s enquanto olha o desafiante para batalhar.",
+  "cobblemon.challenge.receiver": "%1$s te desafiou para uma batalha!",
  "cobblemon.drop.item.inventory": "Você recebeu %2$s (%1$sx).",
  "cobblemon.drop.item.full": "Seu inventário estava cheio, então %1$s caiu no chão.",
+  "cobblemon.mint.interact": "Os atributos do(a) %1$s mudaram!",
+  "cobblemon.mint.same_nature": "Os status do(a) %1$s não parecem afetados pelo(a) %2$s.",
+  "itemGroup.cobblemon.plants": "Plantas",
+  "item.cobblemon.aguav_berry": "Baga de Agoiab",
+  "item.cobblemon.aguav_berry.tooltip": "Restaura 1/3 do PV máximo ao atingir 1/4 do PV máximo ou menos; causa confusão se Natureza -Def. Esp",
+  "item.cobblemon.apicot_berry": "Baga de Damsco",
+  "item.cobblemon.apicot_berry.tooltip": "Aumenta a Def. Esp do portador em 1 estágio quando atinge 1/4 de PV máximo ou menos",
+  "item.cobblemon.aspear_berry": "Baga de Peram",
+  "item.cobblemon.aspear_berry.tooltip": "O usuário é curado se for congelado",
+  "item.cobblemon.babiri_berry": "Baga de Barbiri",
+  "item.cobblemon.babiri_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Aço",
+  "item.cobblemon.belue_berry": "Baga de Mirilo",
+  "item.cobblemon.belue_berry.tooltip": "Não pode ser comida pelo usuário",
+  "item.cobblemon.bluk_berry": "Baga de Noka",
+  "item.cobblemon.bluk_berry.tooltip": "Não pode ser comida pelo usuário",
+  "item.cobblemon.charti_berry": "Baga de Chalca",
+  "item.cobblemon.charti_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Pedra",
+  "item.cobblemon.cheri_berry": "Baga de Chiri",
+  "item.cobblemon.cheri_berry.tooltip": "O usuário se cura se for paralisado",
+  "item.cobblemon.chesto_berry": "Baga de Casto",
+  "item.cobblemon.chesto_berry.tooltip": "O usuário acorda caso esteja dormindo",
+  "item.cobblemon.chilan_berry": "Baga de Chilan",
+  "item.cobblemon.chilan_berry.tooltip": "Reduz pela metade o dano recebido de um ataque do tipo Normal",
+  "item.cobblemon.chople_berry": "Baga de Chople",
+  "item.cobblemon.chople_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Lutador",
+  "item.cobblemon.coba_berry": "Baga de Coba",
+  "item.cobblemon.coba_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Voador",
+  "item.cobblemon.colbur_berry": "Baga de Calbur",
+  "item.cobblemon.colbur_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Sombrio",
+  "item.cobblemon.cornn_berry": "Baga de Milhoo",
+  "item.cobblemon.cornn_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.custap_berry": "Baga de Condata",
+  "item.cobblemon.custap_berry.tooltip": "O portador tem a prioridade dos ataques quando atingir 1/4 do PV máximo ou menos",
+  "item.cobblemon.durin_berry": "Baga de Durio",
+  "item.cobblemon.durin_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.enigma_berry": "Baga de Enigma",
+  "item.cobblemon.enigma_berry.tooltip": "Restaura 1/4 do PV máximo se o portador for atingido por um ataque super efetivo",
+  "item.cobblemon.figy_berry": "Baga de Figui",
+  "item.cobblemon.figy_berry.tooltip": "Restaura 1/3 do PV máximo ao atingir 1/4 do PV máximo ou menos; causa confusão se Natureza -Ataque",
+  "item.cobblemon.ganlon_berry": "Baga de Ganalon",
+  "item.cobblemon.ganlon_berry.tooltip": "Aumenta a Defesa do portador em 1 estágio quando atingir 1/4 do PV máximo ou menos",
+  "item.cobblemon.grepa_berry": "Baga de Iva",
+  "item.cobblemon.grepa_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.haban_berry": "Baga de Raçaro",
+  "item.cobblemon.haban_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Dragão",
+  "item.cobblemon.hondew_berry": "Baga de Hondew",
+  "item.cobblemon.hondew_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.hopo_berry": "Baga de Lopu",
+  "item.cobblemon.hopo_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.iapapa_berry": "Baga de Mãoma",
+  "item.cobblemon.iapapa_berry.tooltip": "Restaura 1/3 do PV máximo ao atingir 1/4 do PV máximo ou menos; causa confusão se Natureza -Def",
+  "item.cobblemon.jaboca_berry": "Baga de Jabuca",
+  "item.cobblemon.jaboca_berry.tooltip": "Se o portador for atingido por um golpe físico, o atacante perde 1/8 de seu PV máximo",
+  "item.cobblemon.kasib_berry": "Baga de Madoc",
+  "item.cobblemon.kasib_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Fantasma",
+  "item.cobblemon.kebia_berry": "Baga de Tredeco",
+  "item.cobblemon.kebia_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Veneno",
+  "item.cobblemon.kee_berry": "Baga de Kee",
+  "item.cobblemon.kee_berry.tooltip": "Aumenta a Defesa do portador em 1 estágio após ser atingido por um ataque físico",
+  "item.cobblemon.kelpsy_berry": "Baga de Algaz",
+  "item.cobblemon.kelpsy_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.lansat_berry": "Baga de Lanzes",
+  "item.cobblemon.lansat_berry.tooltip": "O portador ganha o efeito de Energia Focalizada quando atingir 1/4 do PV máximo ou menos",
+  "item.cobblemon.leppa_berry": "Baga de Açam",
+  "item.cobblemon.leppa_berry.tooltip": "Restaura 10 PP do primeiro ataque do portador que alcançar 0 PP",
+  "item.cobblemon.liechi_berry": "Baga de Liachi",
+  "item.cobblemon.liechi_berry.tooltip": "Aumenta o Ataque do portador em 1 estágio quando atingir 1/4 de PV máximo ou menos",
+  "item.cobblemon.lum_berry": "Baga de Meixa",
+  "item.cobblemon.lum_berry.tooltip": "O portador é curado caso esteja sob o efeito de um estado não volátil ou confuso",
+  "item.cobblemon.mago_berry": "Baga de Maga",
+  "item.cobblemon.mago_berry.tooltip": "Restaura 1/3 do PV máximo ao atingir 1/4 do PV máximo ou menos; causa confusão se Natureza -Spe",
+  "item.cobblemon.magost_berry": "Baga de Magost",
+  "item.cobblemon.magost_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.maranga_berry": "Baga de Malanga",
+  "item.cobblemon.maranga_berry.tooltip": "Aumenta a Def. Esp do portador em 1 estágio após ser atingido por um ataque especial",
+  "item.cobblemon.micle_berry": "Baga de Migre",
+  "item.cobblemon.micle_berry.tooltip": "O próximo ataque do portador tem 1.2x acurácia quando atingir 1/4 do PV máximo ou menos",
+  "item.cobblemon.nanab_berry": "Baga de Nanab",
+  "item.cobblemon.nanab_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.touga_berry": "Baga de Touga",
+  "item.cobblemon.touga_berry.tooltip": "O portador é curado se ficar confuso",
+  "item.cobblemon.nomel_berry": "Baga de Oamil",
+  "item.cobblemon.nomel_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.occa_berry": "Baga de Occa",
+  "item.cobblemon.occa_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Fogo",
+  "item.cobblemon.oran_berry": "Baga de Laran",
+  "item.cobblemon.oran_berry.tooltip": "Restaura 10 PV quando estiver com 1/2 de vida máxima ou menos",
+  "item.cobblemon.pamtre_berry": "Baga de Palira",
+  "item.cobblemon.pamtre_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.passho_berry": "Baga de Paixxo",
+  "item.cobblemon.passho_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Água",
+  "item.cobblemon.payapa_berry": "Baga de Paiapa",
+  "item.cobblemon.payapa_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Psíquico",
+  "item.cobblemon.pecha_berry": "Baga de Pesgo",
+  "item.cobblemon.pecha_berry.tooltip": "O portador é curado se for envenenado",
+  "item.cobblemon.persim_berry": "Baga de Caqu",
+  "item.cobblemon.persim_berry.tooltip": "O portador é curado se ficar confuso",
+  "item.cobblemon.petaya_berry": "Baga de Petaia",
+  "item.cobblemon.petaya_berry.tooltip": "Aumenta o Atq. Esp do usuário em 1 estágio quando atingir 1/4 do PV máximo ou menos",
+  "item.cobblemon.pinap_berry": "Baga de Abacix",
+  "item.cobblemon.pinap_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.pomeg_berry": "Baga de Romaze",
+  "item.cobblemon.pomeg_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.qualot_berry": "Baga de Reiranespe",
+  "item.cobblemon.qualot_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.rabuta_berry": "Baga de Rambuto",
+  "item.cobblemon.rabuta_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.rawst_berry": "Baga de Orango",
+  "item.cobblemon.rawst_berry.tooltip": "O portador é curado se for queimado",
+  "item.cobblemon.razz_berry": "Baga de Frambo",
+  "item.cobblemon.razz_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.rindo_berry": "Baga de Rindo",
+  "item.cobblemon.rindo_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Grama",
+  "item.cobblemon.roseli_berry": "Baga de Caroro",
+  "item.cobblemon.roseli_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Fada",
+  "item.cobblemon.rowap_berry": "Baga de Jamro",
+  "item.cobblemon.rowap_berry.tooltip": "Se o portador for atingido por um golpe especial, o atacante perde 1/8 do seu PV máximo",
+  "item.cobblemon.salac_berry": "Baga de Salac",
+  "item.cobblemon.salac_berry.tooltip": "Aumenta a Velocidade do usuário em 1 estágio quando atingir 1/4 do PV máximo ou menos",
+  "item.cobblemon.shuca_berry": "Baga de Juca",
+  "item.cobblemon.shuca_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Solo",
+  "item.cobblemon.sitrus_berry": "Baga de Sitrus",
+  "item.cobblemon.sitrus_berry.tooltip": "Restaura 1/4 do PV máximo quando atinge 1/4 do PV máximo ou menos",
+  "item.cobblemon.spelon_berry": "Baga de Afepino",
+  "item.cobblemon.spelon_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.starf_berry": "Baga de Caramb",
+  "item.cobblemon.starf_berry.tooltip": "Aumenta um atributo aleatório em 2 quando em 1/4 de PV máxima ou menos",
+  "item.cobblemon.tamato_berry": "Baga de Tamate",
+  "item.cobblemon.tamato_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.tanga_berry": "Baga de Tanga",
+  "item.cobblemon.tanga_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Inseto",
+  "item.cobblemon.wacan_berry": "Baga de Vedo",
+  "item.cobblemon.wacan_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Elétrico",
+  "item.cobblemon.watmel_berry": "Baga de Melcia",
+  "item.cobblemon.watmel_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.wepear_berry": "Baga de Peraoci",
+  "item.cobblemon.wepear_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.wiki_berry": "Baga de Wiki",
+  "item.cobblemon.wiki_berry.tooltip": "Restaura 1/3 do PV máximo ao atingir 1/4 do PV máximo ou menos; causa confusão se Natureza -Ataq. Esp",
+  "item.cobblemon.yache_berry": "Baga de Iachi",
+  "item.cobblemon.yache_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super efetivo do tipo Gelo",
  "cobblemon.command.general.invalid-party-slot": "Não há Pokémon no slot %1$s!",
  "cobblemon.command.givepokemon.give": "Deu %1$s para %2$s.",
  "cobblemon.command.pokemonedit": "Editou %2$s de %1$s.",
@@ -305,10 +572,19 @@
  "cobblemon.command.spawnpokemon.nospecies": "Erro: Você precisa incluir o nome de um Pokémon ou 'aleatório'",
  "cobblemon.command.held_item": "%2$s de %1$s foi dado para %3$s carregar.",
  "cobblemon.command.pokeheal.in_battle": "Você não pode curar sua equipe em batalha!",
+  "cobblemon.command.spawnpokemonfrompool": "Um %1$s apareceu na área.",
+  "cobblemon.command.spawnpokemonfrompool.unable_to_spawn": "Não foi possível gerar um Pokémon.",
+  "cobblemon.command.pokebox.box_does_not_exist": "Esse Jogador não tem uma caixa %1$s.",
+  "cobblemon.command.pokebox.box_is_full": "A caixa %1$s do jogador está cheia.",
+  "cobblemon.command.pokebox.storage_is_full": "O armazenamento desse jogador está cheio.",
+  "cobblemon.command.pokebox.last_pokemon": "Não enviou o último Pokémon daquele jogador para o PC.",
+  "cobblemon.command.pokemonrestart": "A equipe e o PC do(a) %1$s foram esvaziados.",
  "advancements.cobblemon.root": "Cobblemon",
+  "advancements.cobblemon.root.description": "Começou sua aventura escolhendo um Pokémon iniciante",
  "advancements.cobblemon.obtain_leftovers": "Reduzir, Reutilizar, Reciclar!",
  "advancements.cobblemon.obtain_leftovers.description": "Manter as sobras após comer uma maçã.",
-  "advancements.cobblemon.root.description": "Começou sua aventura escolhendo um Pokémon iniciante",
+  "advancements.cobblemon.any_plant": "Recompensa da Mãe Natureza",
+  "advancements.cobblemon.any_plant.description": "Espero que tenha dom para jardinagem!",
  "advancements.cobblemon.harvest_apricorn": "Sua primeira bolota",
  "advancements.cobblemon.harvest_apricorn.description": "Colha uma bolota apertando clique direito quando ela estiver madura",
  "advancements.cobblemon.harvest_apricorn_seed": "Bolotas, Pra viagem",
@@ -328,7 +604,7 @@
  "advancements.cobblemon.first_catch": "A primeira captura a gente nunca esquece...",
  "advancements.cobblemon.first_catch.description": "Pegue seu primeiro Pokémon",
  "advancements.cobblemon.full_party": "Casa cheia!",
-  "advancements.cobblemon.full_party.description": "Capture 5 Pokémon",
+  "advancements.cobblemon.full_party.description": "Capture Pokémon e feche uma equipe de 6",
  "advancements.cobblemon.first_evolution": "Treine muito!",
  "advancements.cobblemon.first_evolution.description": "Evolua seu primeiro Pokémon",
  "advancements.cobblemon.first_battle_victory": "Esse é meu jeito de viver",
@@ -337,6 +613,55 @@
  "advancements.cobblemon.first_shiny_catch.description": "Capture seu primeiro Pokémon brilhante",
  "advancements.cobblemon.healing_machine": "Poder de Cura",
  "advancements.cobblemon.healing_machine.description": "Espere tempo suficiente para que uma Máquina de Cura se recarregue, então cure sua equipe",
+  "advancements.cobblemon.obtain_leek": "Era para isso ser uma espada?",
+  "advancements.cobblemon.obtain_leek.description": "Obtenha um Alho-poró Medicinal, uma planta selvagem que cresce em água doce",
+  "advancements.cobblemon.medicinal_brew": "Boticária Local",
+  "advancements.cobblemon.medicinal_brew.description": "Produza um Alho-poró Medicinal para criar a base para suas necessidades curativas",
+  "advancements.cobblemon.brew_potion": "Minhas poções são demais para você",
+  "advancements.cobblemon.brew_potion.description": "Adicione uma Baga de Laran à Bebida Medicinal para criar uma Poção",
+  "advancements.cobblemon.brew_full_restore": "A Escolha de Um Campeão",
+  "advancements.cobblemon.brew_full_restore.description": "Progrida na árvore de poções e crie uma Restauração Total usando uma Baga de Meixa e uma Poção Máxima",
+  "advancements.cobblemon.brew_all": "Farmacêutico nato",
+  "advancements.cobblemon.brew_all.description": "Crie todos os itens possíveis que usem Bebida Medicinal",
+  "advancements.cobblemon.obtain_mint": "Diga adeus ao mau hálito",
+  "advancements.cobblemon.obtain_mint.description": "Obtenha uma menta natural, uma erva selvagem que cresce nas partes mais altas de montanhas",
+  "advancements.cobblemon.obtain_all_mints": "Um Grande Comprometi-menta",
+  "advancements.cobblemon.obtain_all_mints.description": "Obtenha todas as 6 cores de Menta e tenha as naturezas em suas mãos",
+  "advancements.cobblemon.obtain_revival_herb": "Se o gosto é ruim é porquê funciona",
+  "advancements.cobblemon.obtain_revival_herb.description": "Obtenha a Erva Revitalizante, uma erva selvagem oriunda de cavernas verdejantes",
+  "advancements.cobblemon.use_revive": "Viva para lutar outro dia!",
+  "advancements.cobblemon.use_revive.description": "Use um Reviver, Máximo Reviver ou uma Erva Revitalizante para reviver um Pokémon desmaiado",
+  "advancements.cobblemon.obtain_big_root": "A Raiz da Cura Básica",
+  "advancements.cobblemon.obtain_big_root.description": "Obtenha uma Raiz Grande, uma planta selvagem normalmente encontrada em cavernas de terra próximas à superfície",
+  "advancements.cobblemon.craft_remedy": "Cura Básica",
+  "advancements.cobblemon.craft_remedy.description": "Fabrique um Remédio, um medicamento básico que pode ser aprimorado",
+  "advancements.cobblemon.obtain_vivichoke": "Contrato de Broto Vitalício",
+  "advancements.cobblemon.obtain_vivichoke.description": "Obtenha um Broto Vital, nascidas das, estranhamente escassas, Sementes de Broto Vital",
+  "advancements.cobblemon.obtain_berry": "Essa baga não é nenhuma bagaceira",
+  "advancements.cobblemon.obtain_berry.description": "Obtenha uma baga, frutas selvagens que crescem na superfície e possuem diversos usos",
+  "advancements.cobblemon.obtain_mutated_berry": "Um resultado inesperado",
+  "advancements.cobblemon.obtain_mutated_berry.description": "Plante diferentes Árvores de Bagas próximas umas das outras e observe a Mutação em ação",
+  "advancements.cobblemon.obtain_all_berries": "É baga pra dar e vender!",
+  "advancements.cobblemon.obtain_all_berries.description": "Obtenha uma de cada espécie de Baga no Cobblemon",
+  "advancements.cobblemon.use_pasture": "Minha casa é sua casa",
+  "advancements.cobblemon.use_pasture.description": "Crie um Bloco de Pasto e permite que seus amigos vaguem sobre ele",
+  "advancements.cobblemon.catch_all_vivillon": "Asas Padronizadas",
+  "advancements.cobblemon.catch_all_vivillon.description": "Obtenha todos os padrões de Vivillon",
+  "advancements.cobblemon.evolve_veevees": "Acho que foram todas",
+  "advancements.cobblemon.evolve_veevees.description": "Evolua Eevee em 8 formas diferentes",
+  "advancements.cobblemon.evolve_shedinja": "A casca está viva!",
+  "advancements.cobblemon.evolve_shedinja.description": "Tenha uma Poké Bola em seu inventário e obtenha um Shedinja",
+  "advancements.cobblemon.trade_pokemon": "Cuide-se Bem!",
+  "advancements.cobblemon.trade_pokemon.description": "Troque um Pokémon com outro Treinador",
+  "advancements.cobblemon.trade_shelmet_karrablast": "Gostaria de denunciar um roubo!",
+  "advancements.cobblemon.trade_shelmet_karrablast.description": "Troque um Shelmet e um Karrablast",
+  "advancements.cobblemon.max_level_baby": "Darwin? Quem é esse?",
+  "advancements.cobblemon.max_level_baby.description": "Treine um Pokémon no primeiro estágio até o nível 100",
+  "advancements.cobblemon.use_candy": "Inimigo dos dentistas",
+  "advancements.cobblemon.use_candy.description": "Usa qualquer Doce de XP num Pokémon",
+  "advancements.cobblemon.own_zangoose_seviper": "Parceiros Relutantes",
+  "advancements.cobblemon.own_zangoose_seviper.description": "Tenha um Zangoose e Seviper na sua equipe ao mesmo tempo",
+  "cobblemon.battle.crash": "Houve um erro na batalha. Caso esteja jogando solo, reporte-o à equipe de moderação. Se não, reporte à administração do servidor.",
  "cobblemon.battle.damage_dealt": "%1$s recebeu %2$s de dano!",
  "cobblemon.battle.used_move": "%1$s usou %2$s!",
  "cobblemon.battle.used_move_on": "%1$s usou %2$s em %3$s!",
@@ -356,14 +681,19 @@
  "cobblemon.battle.crit": "Acerto crítico!",
  "cobblemon.battle.nothing": "Mas nada aconteceu.",
  "cobblemon.battle.clearallboost": "Alterações de status foram redefinidas.",
+  "cobblemon.battle.clearallnegativeboost": "Os status negativos do(a) %1$s foram removidos!",
+  "cobblemon.battle.clearallnegativeboost.zeffect": "%1$s usou seu Poder-Z para recuperar seus status perdidos!",
  "cobblemon.battle.unboost.slight": "%1$s de %2$s caiu.",
  "cobblemon.battle.unboost.sharp": "%1$s de %2$s caiu muito.",
  "cobblemon.battle.unboost.severe": "%1$s de %2$s caiu drásticamente.",
  "cobblemon.battle.unboost.cap.single": "%1$s de %2$s não pode descer mais.",
  "cobblemon.battle.unboost.cap.multiple": "os status de %1$s não podem descer mais.",
  "cobblemon.battle.boost.slight": "%1$s de %2$s aumentou.",
+  "cobblemon.battle.boost.slight.zeffect": "%1$s aumentou o(a) seu(sua) %2$s usando o seu Poder-Z!",
  "cobblemon.battle.boost.sharp": "%1$s de %2$s aumentou muito.",
+  "cobblemon.battle.boost.sharp.zeffect": "%1$s aumentou significativamente o(a) seu(sua) %2$s usando o seu Poder-Z!",
  "cobblemon.battle.boost.severe": "%1$s de %2$s aumentou drásticamente.",
+  "cobblemon.battle.boost.severe.zeffect": "%1$s aumentou drasticamente o(a) seu(sua) %2$s usando o seu Poder-Z!",
  "cobblemon.battle.boost.cap.single": "%1$s de %2$s não pode subir mais.",
  "cobblemon.battle.boost.cap.multiple": "os status de %1$s não podem subir mais.",
  "cobblemon.battle.setboost.bellydrum": "%1$s reduziu seu próprio PV e maximizou seu Ataque!",
@@ -381,162 +711,247 @@
  "cobblemon.capture.not_single": "Você só pode capturar Pokémon em batalha 1v1.",
  "cobblemon.you_in_battle": "Você não pode fazer isso em batalha!",
  "cobblemon.battle.turn": "Agora é a vez de %1$s",
-  "cobblemon.battle.rain_dance": "Começou a chover!",
-  "cobblemon.battle.rain_dance_upkeep": "A chuva continua.",
-  "cobblemon.battle.sandstorm": "Uma tempestade de areia subiu!",
-  "cobblemon.battle.sandstorm_buffeted": "%1$s foi esbofetado pela tempestade de areia.",
-  "cobblemon.battle.sandstorm_upkeep": "A tempestade de areia se enfurece.",
-  "cobblemon.battle.sunny_day": "A luz do sol se torna extrema!",
-  "cobblemon.battle.sunny_day_upkeep": "A luz do sol continua forte.",
-  "cobblemon.battle.hail": "Começou a cair granizo!",
-  "cobblemon.battle.hail_upkeep": "Ainda cai granizo.",
-  "cobblemon.battle.hail_buffeted": "%1$s foi atingido pelo granizo.",
-  "cobblemon.battle.no_weather": "O clima se abre.",
-  "cobblemon.battle.confusion_start": "%1$s ficou confuso(a)!",
-  "cobblemon.battle.confusion_activate": "Se feriu na confusão!",
-  "cobblemon.battle.confusion_snapped": "%1$s melhorou da confusão!",
-  "cobblemon.battle.protect_start": "%1$s começou a se proteger!",
-  "cobblemon.battle.protect_activate": "%1$s se protegeu!",
-  "cobblemon.battle.magnitude_level": "Magnitude %1$s!",
-  "cobblemon.battle.bide_start": "%1$s começa a armazenar energia!",
-  "cobblemon.battle.bide_activate": "%1$s está armazenando energia!",
-  "cobblemon.battle.bide_end": "%1$s liberou sua energia!",
-  "cobblemon.battle.field_start.electric_terrain": "Uma corrente elétrica correu pelo campo de batalha!",
-  "cobblemon.battle.field_start.grassy_terrain": "A grama cresceu para cobrir o campo de batalha!",
-  "cobblemon.battle.field_start.gravity": "Gravidade intensificada!",
-  "cobblemon.battle.field_start.magic_room": "Uma área bizarra onde itens carregados perdem seus efeitos foi criada!",
-  "cobblemon.battle.field_start.misty_terrain": "Um nevoeiro cobre o campo de batalha!",
-  "cobblemon.battle.field_start.mud_sport": "O poder elétrico foi enfraquecido!",
-  "cobblemon.battle.field_start.psychic_terrain": "O campo de batalha ficou estranho!",
-  "cobblemon.battle.field_start.trick_room": "%1$s distorceu as dimensões!",
-  "cobblemon.battle.field_start.water_sport": "O poder do fogo foi enfraquecido!",
-  "cobblemon.battle.field_start.wonder_room": "Criou uma área bizarra na qual as estatísticas de Defesa e Def. Esp são trocadas!",
-  "cobblemon.battle.field_end.electric_terrain": "A eletricidade desapareceu do campo de batalha.",
-  "cobblemon.battle.field_end.grassy_terrain": "A grama desapareceu do campo de batalha.",
-  "cobblemon.battle.field_end.gravity": "A Gravidade voltou ao normal!",
-  "cobblemon.battle.field_end.magic_room": "A Sala Mágica cessou, e os efeitos dos itens carregados voltaram ao normal!",
-  "cobblemon.battle.field_end.misty_terrain": "O nevoeiro desapareceu do campo de batalha.",
-  "cobblemon.battle.field_end.mud_sport": "Os efeitos do Campo de Lama desvaneceram.",
-  "cobblemon.battle.field_end.psychic_terrain": "A esquisitice desapareceu do campo de batalha!",
-  "cobblemon.battle.field_end.trick_room": "As dimensões distorcidas retornaram ao normal!",
-  "cobblemon.battle.field_end.water_sport": "Os efeitos do Esporte Aquático desvaneceram.",
-  "cobblemon.battle.field_end.wonder_room": "Truque Defensivo cessou, e os status de Defesa e Def. Esp retornaram ao normal!",
-  "cobblemon.battle.cant.generic_block": "%1$s não pode usar %2$s!",
+  "cobblemon.battle.side_subject.ally": "seu",
+  "cobblemon.battle.side_subject.opponent": "o oposto",
+  "cobblemon.battle.weather.raindance.start": "Começou a chover!",
+  "cobblemon.battle.weather.raindance.upkeep": "A chuva continua a cair.",
+  "cobblemon.battle.weather.raindance.end": "A chuva parou.",
+  "cobblemon.battle.weather.sandstorm.start": "Uma tempestade de areia surgiu!",
+  "cobblemon.battle.weather.sandstorm.upkeep": "A tempestade de areia continua.",
+  "cobblemon.battle.weather.sandstorm.end": "A tempestade de areia acabou.",
+  "cobblemon.battle.weather.sunnyday.start": "A luz do sol ficou forte!",
+  "cobblemon.battle.weather.sunnyday.upkeep": "A luz do sol está forte.",
+  "cobblemon.battle.weather.sunnyday.end": "A luz do sol desapareceu.",
+  "cobblemon.battle.weather.hail.start": "Começou a chover granizo!",
+  "cobblemon.battle.weather.hail.upkeep": "O granizo está caindo.",
+  "cobblemon.battle.weather.hail.end": "O granizo parou.",
+  "cobblemon.battle.start.bide": "%1$s começa a armazenar energia!",
+  "cobblemon.battle.start.yawn": "%1$s ficou sonolento!",
+  "cobblemon.battle.start.perish": "O tempo de %1$s está passando. %2$s turnos para desmaiar.",
+  "cobblemon.battle.start.leechseed": "%1$s foi semeado(a)!",
+  "cobblemon.battle.start.aquaring": "%1$s se cobriu num véu de água!",
+  "cobblemon.battle.start.charge": "%1$s começou a carregar energia!",
+  "cobblemon.battle.start.taunt": "%1$s caiu na provocação!",
+  "cobblemon.battle.start.autotomize": "%1$s se tornou ágil!",
+  "cobblemon.battle.start.attract": "%1$s se apaixonou!",
+  "cobblemon.battle.start.focusenergy": "%1$s está se concentrando!",
+  "cobblemon.battle.start.uproar": "%1$s causou um alvoroço!",
+  "cobblemon.battle.start.curse": "%1$s perde PV para amaldiçoar o(a) %2$s!",
+  "cobblemon.battle.start.miracleeye": "%1$s foi identificado(a)!",
+  "cobblemon.battle.start.dynamax": "%1$s Dinamaxizou!",
+  "cobblemon.battle.start.gmax": "%1$s Gigantamaxizou!",
+  "cobblemon.battle.fieldstart.electricterrain": "Uma corrente elétrica atravessou o campo de batalha!",
+  "cobblemon.battle.fieldstart.grassyterrain": "A grama cresceu para cobrir o campo de batalha!",
+  "cobblemon.battle.fieldstart.gravity": "A gravidade intensificou!",
+  "cobblemon.battle.fieldstart.magicroom": "Uma área bizarra onde itens carregados não têm efeitos foi criada!",
+  "cobblemon.battle.fieldstart.mistyterrain": "Uma névoa cobre o campo de batalha!",
+  "cobblemon.battle.fieldstart.mudsport": "Poderes elétricos foram enfraquecidos!",
+  "cobblemon.battle.fieldstart.psychicterrain": "O campo de batalha ficou estranho!",
+  "cobblemon.battle.fieldstart.trickroom": "%1$s distorceu as dimensões!",
+  "cobblemon.battle.fieldstart.watersport": "Poderes de fogo foram enfraquecidos!",
+  "cobblemon.battle.fieldstart.wonderroom": "Criou uma área bizarra na qual os status de Defesa e Def. Esp são trocadas!",
+  "cobblemon.battle.fieldend.electricterrain": "A eletricidade dissipou do campo de batalha.",
+  "cobblemon.battle.fieldend.grassyterrain": "A grama desapareceu do campo de batalha.",
+  "cobblemon.battle.fieldend.gravity": "A gravidade voltou ao normal!",
+  "cobblemon.battle.fieldend.magicroom": "Sala Mágica acabou, os efeitos dos itens carregados voltaram ao normal!",
+  "cobblemon.battle.fieldend.mistyterrain": "A névoa desapareceu do campo de batalha.",
+  "cobblemon.battle.fieldend.mudsport": "Os efeitos do Campo de Lama cessaram.",
+  "cobblemon.battle.fieldend.psychicterrain": "A estranheza desapareceu do campo de batalha!",
+  "cobblemon.battle.fieldend.trickroom": "As dimensões distorcidas retornaram ao normal!",
+  "cobblemon.battle.fieldend.watersport": "Os efeitos de Irrigar cessaram.",
+  "cobblemon.battle.fieldend.wonderroom": "Zona Estranha cessou, os status de Defesa e Def. Esp voltaram ao normal!",
+  "cobblemon.battle.fieldactivate.perishsong": "Todos os Pokémon que ouviram a música irão desmaiar em três turnos!",
+  "cobblemon.battle.sidestart.stealthrock": "Pedras afiadas flutuam no ar ao redor da equipe do(a) %1$s!",
+  "cobblemon.battle.sidestart.spikes": "Espinhos foram espalhados pelo chão ao redor da equipe do(a) %1$s!",
+  "cobblemon.battle.sidestart.toxicspikes": "Espinhos envenenados foram espalhados pelo chão ao redor da equipe do(a) %1$s!",
+  "cobblemon.battle.sidestart.stickyweb": "Uma teia pegajosa foi lançada no chão ao redor da equipe do(a) %1$s!",
+  "cobblemon.battle.sidestart.reflect": "Refletir tornou a equipe do(a) %1$s mais resistente contra ataques físicos!",
+  "cobblemon.battle.sidestart.lightscreen": "A Tela de Luz tornou a equipe do(a) %1$s mais resistente contra ataques especiais!",
+  "cobblemon.battle.sidestart.auroraveil": "Véu de Aurora tornou a equipe do(a) %1$s mais resistente contra ataques físicos e especiais!",
+  "cobblemon.battle.sidestart.tailwind": "O Vento de Cauda sopra por trás da equipe do(a) %1$s!",
+  "cobblemon.battle.sidestart.safeguard": "%1$s se cobriu em um véu místico!",
+  "cobblemon.battle.sideend.stealthrock": "As pedras pontudas desapareceram do chão ao redor da equipe do(a) %1$s!",
+  "cobblemon.battle.sideend.spikes": "Os espinhos desapareceram do chão ao redor da equipe do(a) %1$s!",
+  "cobblemon.battle.sideend.toxicspikes": "Os espinhos envenenados desapareceram do chão ao redor da equipe do(a) %1$s!",
+  "cobblemon.battle.sideend.stickyweb": "A teia pegajosa desapareceu do chão ao redor da equipe do(a) %1$s",
+  "cobblemon.battle.sideend.reflect": "O Refletir da equipe do(a) %1$s acabou!",
+  "cobblemon.battle.sideend.lightscreen": "A Tela de Luz da equipe do(a) %1$s acabou!",
+  "cobblemon.battle.sideend.auroraveil": "O Véu de Aurora da equipe do(a) %1$s acabou!",
+  "cobblemon.battle.sideend.tailwind": "O Vento de Cauda da equipe do(a) %1$s acabou!",
+  "cobblemon.battle.sideend.safeguard": "A equipe do(a) %1$s não está mais protegida pela Salvaguarda!",
+  "cobblemon.battle.cant.generic": "%1$s não pode usar %2$s!",
  "cobblemon.battle.cant.truant": "%1$s está vagando por aí!",
-  "cobblemon.battle.cant.flinched": "%1$s hesitou e não pôde se mover!",
+  "cobblemon.battle.cant.flinch": "%1$s hesitou e não pôde se mover!",
  "cobblemon.battle.cant.recharge": "%1$s precisa recarregar!",
  "cobblemon.battle.cant.attract": "%1$s está imobilizado pelo amor!",
  "cobblemon.battle.cant.disable": "%2$s de %1$s está desativado!",
-  "cobblemon.battle.cant.focus_punch": "%1$s perdeu o foco e não pôde se mover!",
-  "cobblemon.battle.cant.heal_block": "%1$s não pode usar %2$s por causa do Bloco de cura!",
+  "cobblemon.battle.cant.focuspunch": "%1$s perdeu o foco e não pôde se mover!",
+  "cobblemon.battle.cant.healblock": "%1$s não pode usar %2$s por causa do Bloqueio de Cura!",
  "cobblemon.battle.cant.imprison": "%1$s não pode usar seu %2$s selado!",
  "cobblemon.battle.cant.gravity": "%1$s não pode usar %2$s por causa da gravidade!",
-  "cobblemon.battle.cant.shell_trap": "Casco-armadilha de %1$s não funcionou!",
+  "cobblemon.battle.cant.shelltrap": "Armadilha de Carapaça do(a) %1$s não funcionou!",
  "cobblemon.battle.cant.taunt": "%1$s não pode usar %2$s após a provocação!",
-  "cobblemon.battle.cant.throat_chop": "Os efeitos de Golpe na Garganta previne %1$s de usar certos movimentos!",
-  "cobblemon.battle.cant.no_pp": "%1$s tentou usar %2$s mas não tem PP restante!",
+  "cobblemon.battle.cant.throatchop": "Os efeitos de Golpe na Garganta previnem %1$s de usar certos ataques!",
+  "cobblemon.battle.activate.confusion": "%1$s ficou confuso(a)!",
  "cobblemon.battle.activate.gravity": "%1$s não pôde ficar no ar por causa da gravidade!",
-  "cobblemon.battle.activate.misty_terrain": "%1$s se cerca com uma névoa protetora!",
-  "cobblemon.battle.activate.psychic_terrain": "%1$s se cerca com um terreno psíquico!",
-  "cobblemon.battle.activate.heal_bell": "Um sino tocou!",
+  "cobblemon.battle.activate.mistyterrain": "%1$s se envolve em uma névoa protetora!",
+  "cobblemon.battle.activate.psychicterrain": "%1$s se cerca de terreno psíquico!",
+  "cobblemon.battle.activate.healbell": "Um sino tocou!",
  "cobblemon.battle.activate.aromatherapy": "Um aroma calmante se alastrou pela área!",
  "cobblemon.battle.activate.trapped": "%1$s não pode mais escapar!",
  "cobblemon.battle.activate.bind": "%1$s foi amassado por %2$s!",
-  "cobblemon.battle.activate.court_change": "%1$s mudou os efeitos de batalha que afetam cada lado do campo!",
-  "cobblemon.battle.activate.guard_split": "%1$s compartilhou sua guarda com o alvo!",
+  "cobblemon.battle.activate.wrap": "%1$s foi constringido por %2$s!",
+  "cobblemon.battle.activate.struggle": "%1$s não possui mais movimentos disponíveis!",
+  "cobblemon.battle.activate.courtchange": "%1$s trocou os efeitos de batalha que afetam cada lado do campo!",
+  "cobblemon.battle.activate.guardsplit": "%1$s compartilhou suas defesas com o alvo!",
  "cobblemon.battle.activate.spite": "Reduziu o PP de %1$s's %2$s por %3$s!",
+  "cobblemon.battle.activate.lockon": "%2$s está na mira do(a) %1$s!",
+  "cobblemon.battle.activate.protosynthesis": "A forte luz do sol ativou a Protossíntese do(a) %1$s!",
+  "cobblemon.battle.activate.bide": "%1$s está armazenando energia!",
+  "cobblemon.battle.activate.protect": "%1$s se protegeu!",
+  "cobblemon.battle.activate.magnitude": "Magnitude %1$s!",
+  "cobblemon.battle.activate.destinybond": "%1$s levou seu atacante com ele(a)!",
+  "cobblemon.battle.activate.synchronize": "[Sincronizar do %1$s]",
+  "cobblemon.battle.activate.endure": "%1$s suportou o golpe!",
+  "cobblemon.battle.activate.attract": "%1$s está apaixonado(a) por %2$s!",
+  "cobblemon.battle.activate.firespin": "%1$s ficou preso(a) no vórtice de fogo!",
+  "cobblemon.battle.activate.trick": "%1$s trocou itens com seu alvo!",
+  "cobblemon.battle.activate.quickclaw": "%1$s pode agir mais rápido que o normal, graças a sua Garra Rápida!",
+  "cobblemon.battle.activate.focusband": "%1$s aguentou ao usar a sua %2$s!",
+  "cobblemon.battle.activate.forewarn": "%2$s do(a) %1$s foi revelado(a)!",
+  "cobblemon.battle.activate.disguise": "Seu disfarce serviu de isca!",
+  "cobblemon.battle.activate.liquidooze": "%1$s sugou o líquido viscoso!",
+  "cobblemon.battle.activate.whirlpool": "%1$s ficou preso(a) no vórtice!",
+  "cobblemon.battle.activate.clamp": "%2$s espalmou o(a) %1$s!",
  "cobblemon.battle.prepare.bounce": "%1$s brotou!",
  "cobblemon.battle.prepare.dig": "%1$s escavou seu caminho sob o solo!",
  "cobblemon.battle.prepare.dive": "%1$s se escondeu em baixo d'água!",
  "cobblemon.battle.prepare.fly": "%1$s voou!",
-  "cobblemon.battle.prepare.freeze_shock": "%1$s se camuflou em uma luz congelante!",
+  "cobblemon.battle.prepare.freezeshock": "Uma luz fria cobriu o(a) %1$s!",
  "cobblemon.battle.prepare.geomancy": "%1$s está absorvendo poder!",
-  "cobblemon.battle.prepare.ice_burn": "%1$s se camuflou em ventos congelante!",
-  "cobblemon.battle.prepare.meteor_beam": "%1$s está transbordando com poder cósmico!",
-  "cobblemon.battle.prepare.phantom_force": "%1$s desapareceu instantaneamente!",
-  "cobblemon.battle.prepare.razor_wind": "%1$s criou um redemoinho!",
-  "cobblemon.battle.prepare.skull_bash": "%1$s abaixou sua cabeça!",
-  "cobblemon.battle.prepare.sky_attack": "%1$s se camuflou em uma luz forte!",
-  "cobblemon.battle.prepare.sky_drop": "%1$s levou seu alvo para o céu!",
-  "cobblemon.battle.prepare.solar_beam": "%1$s absorveu luz!",
+  "cobblemon.battle.prepare.iceburn": "Um ar gelado emanou do(a) %1$s!",
+  "cobblemon.battle.prepare.meteorbeam": "%1$s está transbordando de poder espacial!",
+  "cobblemon.battle.prepare.phantomforce": "%1$s desapareceu instantaneamente!",
+  "cobblemon.battle.prepare.razorwind": "%1$s provocou um redemoinho!",
+  "cobblemon.battle.prepare.skullbash": "%1$s preparou a sua cabeça!",
+  "cobblemon.battle.prepare.skyattack": "%1$s ficou envolto(a) em uma luz forte!",
+  "cobblemon.battle.prepare.skydrop": "%1$s levou o seu alvo até o céu!",
+  "cobblemon.battle.prepare.solarbeam": "%1$s absorveu luz!",
  "cobblemon.battle.swapboost.generic": "%1$s trocou seus status aumentados com %2$s!",
  "cobblemon.battle.singleturn.protect": "%1$s se protegeu!",
  "cobblemon.battle.singleturn.endure": "%1$s se protegeu!",
-  "cobblemon.battle.singleturn.crafty_shield": "Guarda Astuta protegeu a equipe de %1$s!",
+  "cobblemon.battle.singleturn.craftyshield": "Escudo Astuto protegeu a equipe do(a) %1$s!",
  "cobblemon.battle.singleturn.powder": "%1$s está coberto de poeira!",
-  "cobblemon.battle.singleturn.follow_me": "%1$s se tornou o centro da atenção!",
+  "cobblemon.battle.singleturn.followme": "%1$s se tornou o centro das atenções!",
  "cobblemon.battle.singleturn.snatch": "%1$s está esperando um alvo para fazer uma jogada!",
-  "cobblemon.battle.singleturn.quick_guard": "Guarda Rápida protegeu a equipe de %1$s!",
-  "cobblemon.battle.singleturn.wide_guard": "Vasta Proteção protegeu a equipe de %1$s!",
+  "cobblemon.battle.singleturn.quickguard": "Guarda Rápida protegeu a equipe do(a) %1$s!",
+  "cobblemon.battle.singleturn.wideguard": "Guarda Vasta protegeu a equipe do(a) %1$s!",
  "cobblemon.battle.singleturn.roost": "(%1$s perde o tipo Voador neste turno.)",
-  "cobblemon.battle.singleturn.mat_block": "%1$s pretende girar um tapete para bloquear ataques iminentes!",
-  "cobblemon.battle.singleturn.max_guard": "%1$s se protegeu!",
+  "cobblemon.battle.singleturn.matblock": "%1$s pretende levantar um tapete e bloquear ataques!",
+  "cobblemon.battle.singleturn.maxguard": "%1$s se protegeu!",
  "cobblemon.battle.singleturn.instruct": "%1$s seguiu as instruções de %2$s!",
-  "cobblemon.battle.singleturn.focus_punch": "%1$s está focando!",
+  "cobblemon.battle.singleturn.focuspunch": "%1$s está aumentando o seu foco!",
  "cobblemon.battle.singleturn.electrify": "Os movimentos de %1$s foram eletrizados!",
-  "cobblemon.battle.singleturn.beak_blast": "%1$s começou a aquecer seu bico!",
-  "cobblemon.battle.singleturn.helping_hand": "%2$s está pronto para ajudar %1$s!",
-  "cobblemon.battle.singleturn.magic_coat": "%1$s envolveu-se com Capa Mágica!",
-  "cobblemon.battle.singleturn.rage_powder": "%1$s se tornou o centro da atenção!",
-  "cobblemon.battle.singleturn.shell_trap": "%1$s colocou uma Armadilha de Carapaça!",
+  "cobblemon.battle.singleturn.beakblast": "%1$s começou a aquecer o seu bico!",
+  "cobblemon.battle.singleturn.helpinghand": "%2$s está pronto para ajudar %1$s!",
+  "cobblemon.battle.singleturn.magiccoat": "%1$s se envolveu com a Capa Mágica!",
+  "cobblemon.battle.singleturn.ragepowder": "%1$s se tornou o centro da atenção!",
+  "cobblemon.battle.singleturn.shelltrap": "%1$s preparou uma armadilha de carapaça!",
  "cobblemon.battle.singleturn.spotlight": "%1$s se tornou o centro da atenção!",
-  "cobblemon.battle.singlemove.destiny_bond": "%1$s espera derrubar seu oponente junto de si!",
-  "cobblemon.battle.singlemove.glaive_rush": "%1$s se lança em uma carga imprudente!",
+  "cobblemon.battle.singlemove.destinybond": "%1$s espera levar seu atacante com ele!",
+  "cobblemon.battle.singlemove.glaiverush": "%1$s se lança em uma investida imprudente!",
  "cobblemon.battle.singlemove.grudge": "%1$s quer que seu alvo tenha rancor!",
  "cobblemon.battle.singlemove.rage": "%1$s entra em fúria!",
+  "cobblemon.battle.damage.wrap": "%1$s foi ferido(a) pelo aperto!",
+  "cobblemon.battle.damage.confusion": "%1$s se feriu na confusão!",
+  "cobblemon.battle.damage.leechseed": "A saúde do(a) %1$s foi sugada pela Semente Sanguessuga!",
+  "cobblemon.battle.damage.sandstorm": "%1$s foi atingido(a) pela tempestade de areia.",
+  "cobblemon.battle.damage.hail": "%1$s foi atingido(a) pelo granizo.",
+  "cobblemon.battle.damage.stealthrock": "Pedras pontudas perfuram o(a) %1$s!",
+  "cobblemon.battle.damage.spikes": "%1$s foi ferido(a) pelos espinhos!",
+  "cobblemon.battle.damage.recoil": "%1$s foi danificado(a) pelo recuo!",
+  "cobblemon.battle.damage.item": "%1$s foi ferido por seu(sua) %2$s!",
+  "cobblemon.battle.damage.lifeorb": "%1$s perdeu um pouco do seu PV!",
+  "cobblemon.battle.damage.rockyhelmet": "%1$s foi ferido(a) pelo Capacete de Pedra do(a) %2$s!",
+  "cobblemon.battle.damage.generic": "%1$s foi ferido(a)!",
+  "cobblemon.battle.damage.pokemonmimikyubusted": "O disfarce do(a) %1$s foi quebrado!",
+  "cobblemon.battle.damage.whirlpool": "%1$s foi ferido(a) pelo Redemoinho!",
+  "cobblemon.battle.damage.clamp": "%1$s foi ferido pelo(a) Capturar!",
+  "cobblemon.battle.damage.curse": "%1$s foi afetado(a) pela maldição!",
  "cobblemon.battle.end.bind": "%1$s não está mais sendo apertado!",
-  "cobblemon.battle.set_hp.pain_split": "Os batalhadores dividiram as suas dores!",
+  "cobblemon.battle.end.wrap": "%1$s foi libertado da constrição!",
+  "cobblemon.battle.end.disable": "O movimento do(a) %1$s não está mais desabilitado!",
+  "cobblemon.battle.end.protosynthesis": "Os efeitos da Protossíntese do(a) %1$s acabaram!",
+  "cobblemon.battle.end.taunt": "%1$s se livrou da provocação!",
+  "cobblemon.battle.end.firespin": "%1$s foi libertado(a) do Redemoinho de Fogo!",
+  "cobblemon.battle.end.bide": "%1$s liberou sua energia!",
+  "cobblemon.battle.end.confusion": "%1$s saiu de sua confusão!",
+  "cobblemon.battle.end.whirlpool": "%1$s foi libertado(a) do vórtice!",
+  "cobblemon.battle.end.clamp": "%1$s foi libertado(a) do Capturar!",
+  "cobblemon.battle.end.dynamax": "%1$s voltou ao normal!",
+  "cobblemon.battle.sethp.painsplit": "Os lutadores compartilharam sua dor!",
  "cobblemon.battle.ability.sturdy": "%1$s suportou o golpe!",
-  "cobblemon.battle.ability.speed_boost": "O Impulso de Velocidade de %1$s ativou!",
-  "cobblemon.battle.ability.intimidate": "Intimidação de %1$s ativou!",
  "cobblemon.battle.ability.unnerve": "%1$s deixou o oponente muito nervoso para comer berries!",
  "cobblemon.battle.ability.anticipation": "%1$s estremeceu em antecipação!",
-  "cobblemon.battle.ability.air_lock": "Os efeitos do clima desapareceram.",
+  "cobblemon.battle.ability.airlock": "Os efeitos do tempo desapareceram.",
  "cobblemon.battle.ability.generic": "%1$s %2$s ativou!",
+  "cobblemon.battle.ability.magicbounce": "%1$s refletiu o(a) %2$s!",
  "cobblemon.battle.errors.busy": "%1$s está ocupado(a)!",
  "cobblemon.battle.error.in_battle": "%1$s está em uma batalha.",
  "cobblemon.battle.error.in_battle.personal": "Você já está em batalha!",
  "cobblemon.battle.error.no_pokemon": "Você não tem nenhum Pokémon usável!",
+  "cobblemon.battle.error.no_pokemon_opponent": "Seu oponente não tem nenhum Pokémon utilizável!",
  "cobblemon.battle.error.insufficient_pokemon": "%1$s tem %2 Pokémon quando %3 são necessários.",
  "cobblemon.battle.error.insufficient_pokemon.personal": "Você tem %1 Pokémon usáveis, porém precisam de %2.",
+  "cobblemon.battle.error.pokemon_is_trapped": "[Escolha indisponível] Não pode trocar: O Pokémon atual está preso",
  "cobblemon.battle.immune": "Mas %1$s é imune!",
  "cobblemon.battle.missed": "Mas errou.",
  "cobblemon.battle.hit_count": "Acertou %1$s vezes!",
  "cobblemon.battle.hit_count_singular": "Acertou 1 vez!",
-  "cobblemon.battle.item.air_balloon.start": "%1$s Flutua no ar com seu Balão de Ar!",
-  "cobblemon.battle.item.recycle_or_pickup.start": "%1$s encontrou um %2$s!",
-  "cobblemon.battle.item.frisk.start": "%1$s revistou %2$s e encontrou seu %3$s!",
-  "cobblemon.battle.item.take_item.start": "%1$s roubou %3$s de %2$s!",
-  "cobblemon.battle.item.harvest.start": "%1$s colheu um(a) %2$s!",
-  "cobblemon.battle.item.bestow.start": "%1$s recebeu %2$s de %3$s!",
-  "cobblemon.battle.item.tricked.start": "%1$s trocou itens com seu alvo!",
-  "cobblemon.battle.item.eat.end": "%1$s comeu seu %2$s!",
-  "cobblemon.battle.item.fling.end": "%1$s arremessou seu %2$s!",
-  "cobblemon.battle.item.knock_off.end": "%1$s derrubou %3$s de %2$s!",
-  "cobblemon.battle.item.gem.end": "O %1$s aumentou o poder de %2$s!",
-  "cobblemon.battle.item.incinerate.end": "%2$s de %1$s foi incinerado!",
-  "cobblemon.battle.item.air_balloon.end": "O Balão de Ar de %1$s estourou!",
-  "cobblemon.battle.item.hung_on.end": "%1$s perseverou usando seu %2$s!",
-  "cobblemon.battle.item.red_card.end": "%1$s levantou seu Cartão Vermelho contra %2$s!",
-  "cobblemon.battle.item.steal_eat.end": "%1$s roubou %3$s de %2$s e comeu!",
-  "cobblemon.battle.item.berry_juice.end": "Suco de Fruta de %1$s se ativou!",
-  "cobblemon.battle.item.used_its.end": "%1$s usou seu %2$s!",
-  "cobblemon.battle.item.mental_herb.end": "%1$s removeu seus efeitos mentais devido à Erva Mental!",
-  "cobblemon.battle.item.power_herb.end": "%1$s foi totalmente carregado devido a sua Erva de Energia!",
-  "cobblemon.battle.item.mirror_herb.end": "%1$s copiou as alterações de atributo com sua Erva Espelho!",
-  "cobblemon.battle.item.white_herb.end": "%1$s retornou os status ao normal usando a Erva Branca!",
-  "cobblemon.battle.item.quick_claw.end": "%1$s pode agir mais rápido que o normal, graças a sua Garra Rápida!",
-  "cobblemon.battle.heal.z_effect": "o PV de %1$s foi restaurado pela Força Z!",
+  "cobblemon.battle.item.airballoon": "%1$s flutua no ar com seu %2$s!",
+  "cobblemon.battle.item.recycle": "%1$s encontrou um(a) %2$s!",
+  "cobblemon.battle.item.frisk": "%3$s revistou %1$s e encontrou seu(sua) %2$s!",
+  "cobblemon.battle.item.thief": "%1$s roubou %2$s do(a) %3$s!",
+  "cobblemon.battle.item.harvest": "%1$s colheu uma %2$s!",
+  "cobblemon.battle.item.bestow": "%1$s recebeu %2$s do(a) %3$s!",
+  "cobblemon.battle.item.trick": "%1$s obteve um(a) %2$s.",
+  "cobblemon.battle.item.eat": "%1$s comeu seu(sua) %2$s.",
+  "cobblemon.battle.enditem.eat": "%1$s comeu seu(sua) %2$s!",
+  "cobblemon.battle.enditem.fling": "%1$s arremessou seu(sua) %2$s!",
+  "cobblemon.battle.enditem.knockoff": "%3$s derrubou o(a) %2$s do(a) %1$s!",
+  "cobblemon.battle.enditem.gem": "A %2$s fortaleceu o poder de %1$s!",
+  "cobblemon.battle.enditem.incinerate": "A %2$s do(a) %1$s foi incinerada!",
+  "cobblemon.battle.enditem.airballoon": "O Balão de Ar do(a) %1$s estourou!",
+  "cobblemon.battle.enditem.redcard": "%1$s mostrou seu Cartão Vermelho contra %3$s!",
+  "cobblemon.battle.enditem.pluck": "%3$s roubou e comeu a %1$s do(a) %2$s!",
+  "cobblemon.battle.enditem.berryjuice": "O Suco de Baga do(a) %1$s foi ativado!",
+  "cobblemon.battle.enditem.generic": "%1$s usou seu(sua) %2$s!",
+  "cobblemon.battle.enditem.mentalherb": "%1$s se livrou dos efeitos mentais graças à sua Erva Mental!",
+  "cobblemon.battle.enditem.powerherb": "%1$s ficou totalmente carregado(a) devido à sua Erva de Força!",
+  "cobblemon.battle.enditem.mirrorherb": "%1$s copiou as alterações de status com sua Erva Espelho!",
+  "cobblemon.battle.enditem.whiteherb": "%1$s retornou seus status ao normal usando sua Erva Branca!",
+  "cobblemon.battle.heal.zeffect": "O PV do(a) %1$s foi restaurado pelo Poder-Z!",
  "cobblemon.battle.heal.wish": "Desejo de %1$s tornou-se realidade!",
  "cobblemon.battle.heal.drain": "%1$s teve seu PV drenado!",
-  "cobblemon.battle.heal.healing_wish": "O desejo de cura tornou-se realidade para %1$s!",
-  "cobblemon.battle.heal.revival_blessing": "%1$s foi revivido e está pronto para lutar de novo!",
-  "cobblemon.battle.heal.aqua_ring": "Um véu de água restaurou a vida de %1$s!",
+  "cobblemon.battle.heal.healingwish": "O desejo de cura se tornou realidade para %1$s!",
+  "cobblemon.battle.heal.revivalblessing": "%1$s foi revivido(a) e está pronto(a) para lutar novamente!",
+  "cobblemon.battle.heal.aquaring": "Um véu de água restaurou PV do(a) %1$s!",
  "cobblemon.battle.heal.ingrain": "%1$s absorveu nutrientes com suas raízes!",
-  "cobblemon.battle.heal.grassy_terrain": "O HP de %1$s foi restaurado.",
-  "cobblemon.battle.heal.leftovers": "%1$s restaurou um pouco de HP usando suas sobras!",
-  "cobblemon.battle.heal.rain_dish": "%1$s restaurou o HP devido a Prato De Chuva!",
+  "cobblemon.battle.heal.grassyterrain": "O PV do(a) %1$s foi restaurado.",
+  "cobblemon.battle.heal.leftovers": "%1$s restaurou um pouco de PV usando seu(sua) %2$s!",
+  "cobblemon.battle.heal.item": "%1$s restaurou PV usando seu(sua) %2$s!",
+  "cobblemon.battle.heal.raindish": "%1$s restaurou PV usando sua Refeição Pluvial!",
  "cobblemon.battle.heal.generic": "%1$s restaurou seu HP.",
+  "cobblemon.battle.heal.bagitempotion": "Restaurou o PV do(a) %1$s",
+  "cobblemon.battle.curestatus.naturalcure": "%1$s foi curado(a) pela sua Cura Natural!",
+  "cobblemon.battle.bagitem.use": "%1$s usou um(a) %2$s em %3$s!",
+  "cobblemon.battle.bagitem.cannot": "Você não pode usar itens agora.",
+  "cobblemon.battle.bagitem.invalid": "Este item não funcionaria.",
+  "cobblemon.battle.zpower": "%1$s se cercou com seu Poder-Z!",
+  "cobblemon.battle.zbroken": "%1$s não conseguiu se proteger totalmente e se machucou!",
+  "cobblemon.battle.terastallize": "%1$s Terastalizou para o tipo %2$s!",
+  "cobblemon.battle.detailschange.mega": "%1$s está reagindo à Pedra-Chave!",
+  "cobblemon.battle.mega": "%1$s Mega Evoluiu!",
  "cobblemon.experience.gained": "%1$s recebeu %2$s de experiência.",
  "cobblemon.experience.level_up": "%1$s agora é nível %2$s!",
  "cobblemon.experience.learned_move": "%1$s aprendeu %2$s.",
@@ -609,16 +1024,19 @@
  "cobblemon.move.category.status": "Status",
  "cobblemon.status.sleep.apply": "%1$s adormeceu!",
  "cobblemon.status.sleep.is": "%1$s está em sono profundo.",
-  "cobblemon.status.sleep.woke": "%1$s acordou!",
+  "cobblemon.status.sleep.cure": "%1$s acordou!",
  "cobblemon.status.paralysis.apply": "%1$s foi paralizado(a)!",
  "cobblemon.status.paralysis.is": "%1$s está paralisado(a) e não pode se mover",
+  "cobblemon.status.paralysis.cure": "%1$s foi curado(a) da sua paralisia!",
  "cobblemon.status.poison.apply": "%1$s foi envenenado(a)!",
+  "cobblemon.status.poison.cure": "%1$s foi curado(a) de seu envenenamento!",
  "cobblemon.status.poisonbadly.apply": "%1$s foi terrivelmente envenenado(a)!",
-  "cobblemon.status.poison.hurt": "%1$s foi ferido(a) pelo veneno",
+  "cobblemon.status.poison.hurt": "%1$s foi ferido(a) pelo veneno!",
  "cobblemon.status.burn.apply": "%1$s está queimado(a)!",
  "cobblemon.status.burn.hurt": "%1$s foi ferido(a) pelas queimaduras!",
+  "cobblemon.status.burn.cure": "%1$s foi curado(a) de sua queimadura!",
  "cobblemon.status.frozen.apply": "%1$s está congelado(a)!",
-  "cobblemon.status.frozen.thawed": "%1$s descongelou!",
+  "cobblemon.status.frozen.cure": "%1$s descongelou!",
  "cobblemon.status.frozen.is": "%1$s está congelado(a)!",
  "block.cobblemon.dawn_stone_ore": "Minério de pedra da alvorada",
  "block.cobblemon.dusk_stone_ore": "Minério de pedra do crepúsculo",
@@ -641,8 +1059,45 @@
  "block.cobblemon.deepslate_thunder_stone_ore": "Minério de pedra trovão de ardósia",
  "block.cobblemon.deepslate_water_stone_ore": "Minério de pedra d'água de ardósia",
  "block.cobblemon.dripstone_moon_stone_ore": "Minério de pedra lunar de ardósia",
+  "block.cobblemon.pasture": "Bloco de Pasto",
  "gamerule.doPokemonSpawning": "Spawn pokémon",
+  "gamerule.doShinyStarters": "Iniciais serão brilhantes",
  "cobblemon.command.checkspawns.invalid-bucket": "Balde de nascimento inválido",
  "cobblemon.command.checkspawns.spawns": "Nascimentos",
-  "cobblemon.command.checkspawns.nothing": "Nada pode nascer aqui agora."
+  "cobblemon.command.checkspawns.nothing": "Nada pode nascer aqui agora.",
+  "cobblemon.interaction.ev.add": "Os EVs de %2$s do(a) %1$s aumentaram por %3$s!",
+  "cobblemon.interaction.ev.deduct": "Os EVs de %2$s do(a) %1$s aumentaram por %3$s!",
+  "cobblemon.interaction.pp.restore": "Você restaurou o PP de %1$s.",
+  "cobblemon.interaction.friendsip.add": "%1$s se aproxima mais de você!",
+  "cobblemon.interaction.status.cure": "%1$s está curado(a) das suas condições de status!",
+  "cobblemon.interaction.hp.heal": "%1$s restaurou um pouco de PV!",
+  "tag.item.cobblemon.apricorn_logs": "Troncos de Bolota",
+  "tag.item.cobblemon.apricorn_sprouts": "Mudas de Bolota",
+  "tag.item.cobblemon.apricorns": "Bolotas",
+  "tag.item.cobblemon.azalea_tree": "Árvores de Azaleia",
+  "tag.item.cobblemon.berries": "Bagas",
+  "tag.item.cobblemon.cobblemon_seeds": "Sementes",
+  "tag.item.cobblemon.evolution_items": "Itens de Evolução",
+  "tag.item.cobblemon.evolution_stones": "Pedras de Evolução",
+  "tag.item.cobblemon.experience_candies": "Doces de Experiência",
+  "tag.item.cobblemon.held.destiny_knot": "Nós do Destino",
+  "tag.item.cobblemon.held.everstone": "Pedras Imutáveis",
+  "tag.item.cobblemon.held.experience_share": "Compartilhadores de Experiência",
+  "tag.item.cobblemon.held.is_held_item": "Itens Carregados",
+  "tag.item.cobblemon.held.lucky_egg": "Ovos da Sorte",
+  "tag.item.cobblemon.held.power_anklet": "Tornozeleiras do Poder",
+  "tag.item.cobblemon.held.power_band": "Faixas do Poder",
+  "tag.item.cobblemon.held.power_belt": "Cintos do Poder",
+  "tag.item.cobblemon.held.power_bracer": "Braçadeiras do Poder",
+  "tag.item.cobblemon.held.power_lens": "Lentes do Poder",
+  "tag.item.cobblemon.held.power_weight": "Pesos do Poder",
+  "tag.item.cobblemon.herbs": "Ervas",
+  "tag.item.cobblemon.mint_leaf": "Folhas de Menta",
+  "tag.item.cobblemon.mints": "Mentas",
+  "tag.item.cobblemon.mutated_berries": "Bagas de Mutação",
+  "tag.item.cobblemon.plants": "Plantas",
+  "tag.item.cobblemon.poke_balls": "Poké Bolas",
+  "tag.item.cobblemon.protein_ingredients": "Ingredientes de proteínas",
+  "tag.item.cobblemon.zinc_ingredients": "Ingredientes de Zinco",
+  "tag.item.cobblemon.seeds": "Sementes"
 }
@@ -1,5 +1,4 @@
 {
-  "itemGroup.cobblemon.pokeball": "Poké Bolas",
  "item.cobblemon.poke_ball": "Pokébola",
  "item.cobblemon.slate_ball": "Bola de Ardósia",
  "item.cobblemon.azure_ball": "Bola Cerúlea",
@@ -46,7 +45,8 @@
  "item.cobblemon.red_apricorn": "Bolota Vermelha",
  "item.cobblemon.white_apricorn": "Bolota Branca",
  "item.cobblemon.yellow_apricorn": "Bolota Amarela",
-  "itemGroup.cobblemon.evolution_item": "Itens de Evolução",
+  "item.cobblemon.vivichoke_seeds": "Sementes de Alcachofra",
+  "item.cobblemon.vivichoke": "Alcachofra",
  "item.cobblemon.link_cable": "Cabo de Ligação",
  "item.cobblemon.dragon_scale": "Escama de Dragão",
  "item.cobblemon.kings_rock": "Rocha do Rei",
@@ -88,7 +88,6 @@
  "item.cobblemon.sun_stone": "Pedra do Sol",
  "item.cobblemon.thunder_stone": "Pedra de Trovão",
  "item.cobblemon.water_stone": "Pedra de Água",
-  "itemGroup.cobblemon.medicine": "Medicamento",
  "item.cobblemon.rare_candy": "Doce Raro",
  "item.cobblemon.exp_candy_xs": "Doce de Exp. XS",
  "item.cobblemon.exp_candy_s": "Doce de Exp. S",
@@ -101,10 +100,47 @@
  "item.cobblemon.iron": "Ferro",
  "item.cobblemon.protein": "Proteína",
  "item.cobblemon.zinc": "Zinco",
-  "itemGroup.cobblemon.held_item": "Equipamento",
+  "item.cobblemon.potion": "Poção",
+  "item.cobblemon.super_potion": "Super Poção",
+  "item.cobblemon.hyper_potion": "Hiper Poção",
+  "item.cobblemon.max_potion": "Poção Máxima",
+  "item.cobblemon.full_restore": "Restauração completa",
+  "item.cobblemon.red_mint_leaf": "Folha de Hortelã Vermelha",
+  "item.cobblemon.red_mint_leaf.tooltip": "Capaz de influenciar o atributo de ataque de um Pokémon",
+  "item.cobblemon.blue_mint_leaf": "Folha de Hortelã Azul",
+  "item.cobblemon.blue_mint_leaf.tooltip": "Capaz de influenciar o atributo de defesa de um Pokémon",
+  "item.cobblemon.cyan_mint_leaf": "Folha de Hortelã Ciano",
+  "item.cobblemon.cyan_mint_leaf.tooltip": "Capaz de influenciar o atributo de ataque especial de um Pokémon",
+  "item.cobblemon.pink_mint_leaf": "Folha de Hortelã Rosa",
+  "item.cobblemon.pink_mint_leaf.tooltip": "Capaz de influenciar o atributo de defesa especial de um Pokémon",
+  "item.cobblemon.green_mint_leaf": "Folha de Hortelã Verde",
+  "item.cobblemon.green_mint_leaf.tooltip": "Capaz de influenciar o atributo de velocidade de um Pokémon",
+  "item.cobblemon.white_mint_leaf": "Folha de Hortelã Branca",
+  "item.cobblemon.white_mint_leaf.tooltip": "Capaz de neutralizar a natureza de um Pokémon",
+  "item.cobblemon.lonely_mint": "Hortelã Solitária",
+  "item.cobblemon.adamant_mint": "Hortelã Inflexível",
+  "item.cobblemon.naughty_mint": "Hortelã Desobediente",
+  "item.cobblemon.brave_mint": "Hortelã Corejosa",
+  "item.cobblemon.bold_mint": "Hortelã Audaciosa",
+  "item.cobblemon.impish_mint": "Hortelã Marota",
+  "item.cobblemon.lax_mint": "Hortelã Descuidada",
+  "item.cobblemon.relaxed_mint": "Hortelã Relaxada",
+  "item.cobblemon.modest_mint": "Hortelã Modesta",
+  "item.cobblemon.mild_mint": "Hortelã Suave",
+  "item.cobblemon.rash_mint": "Hortelã Precipitada",
+  "item.cobblemon.quiet_mint": "Hortelã Silenciosa",
+  "item.cobblemon.calm_mint": "Hortelã Calma",
+  "item.cobblemon.gentle_mint": "Hortelã Gentil",
+  "item.cobblemon.careful_mint": "Hortelã Cuidadosa",
+  "item.cobblemon.sassy_mint": "Hortelã Atrevida",
+  "item.cobblemon.timid_mint": "Hortelã Tímida",
+  "item.cobblemon.hasty_mint": "Hortelã Apressada",
+  "item.cobblemon.jolly_mint": "Hortelã Alegre",
+  "item.cobblemon.naive_mint": "Hortelã Ingénua",
+  "item.cobblemon.serious_mint": "Hortelã Séria",
  "item.cobblemon.assault_vest": "Colete de Assalto",
  "item.cobblemon.auspicious_armor": "Armadura Peculiar",
-  "item.cobblemon.big_root": "Raiz Grande",
+  "item.cobblemon.malicious_armor": "Armadura Maliciosa",
  "item.cobblemon.black_belt": "Cinturão Preto",
  "item.cobblemon.black_glasses": "Óculos Negros",
  "item.cobblemon.black_sludge": "Lodo Preto",
@@ -138,6 +174,21 @@
  "item.cobblemon.spell_tag": "Etiqueta de Feitiço",
  "item.cobblemon.twisted_spoon": "Colher Torcida",
  "item.cobblemon.wise_glasses": "Óculos Sábios",
+  "item.cobblemon.mental_herb": "Erva Mental",
+  "item.cobblemon.mirror_herb": "Erva Espelho",
+  "item.cobblemon.power_herb": "Erva do Poder",
+  "item.cobblemon.white_herb": "Erva Branca",
+  "item.cobblemon.bright_powder": "Pó Brilhante",
+  "item.cobblemon.metal_powder": "Pó de Metal",
+  "item.cobblemon.quick_powder": "Pó Rápido",
+  "item.cobblemon.destiny_knot": "Nó do Destino",
+  "item.cobblemon.everstone": "Pedra Eterna",
+  "item.cobblemon.power_anklet": "Tornozeleira do Poder",
+  "item.cobblemon.power_band": "Banda do Poder",
+  "item.cobblemon.power_belt": "Cinturão do Poder",
+  "item.cobblemon.power_bracer": "Braçadeira do Poder",
+  "item.cobblemon.power_lens": "Lentes do Poder",
+  "item.cobblemon.power_weight": "Peso do Poder",
  "item.cobblemon.poke_ball.tooltip": "Taxa de Captura 1×",
  "item.cobblemon.slate_ball.tooltip": "Taxa de Captura 1×",
  "item.cobblemon.azure_ball.tooltip": "Taxa de Captura 1×",
@@ -170,6 +221,56 @@
  "item.cobblemon.park_ball.tooltip": "2.5× em todos os biomas de Floresta ou Planície",
  "item.cobblemon.dream_ball.tooltip": "4× em Pokémon a dormir",
  "item.cobblemon.beast_ball.tooltip": "5× em Ultra Feras, senão só 0.1×",
+  "item.cobblemon.mulch_base": "Adubo",
+  "item.cobblemon.coarse_mulch": "Adubo Grosso",
+  "item.cobblemon.growth_mulch": "Adubo de Crescimento",
+  "item.cobblemon.humid_mulch": "Adubo Húmido",
+  "item.cobblemon.loamy_mulch": "Adubo Argiloso",
+  "item.cobblemon.peat_mulch": "Adubo de Turfa",
+  "item.cobblemon.rich_mulch": "Adubo Rico",
+  "item.cobblemon.sandy_mulch": "Adubo Arenoso",
+  "item.cobblemon.surprise_mulch": "Adubo Surpresa",
+  "item.cobblemon.medicinal_leek": "Alho-porro Medicinal",
+  "item.cobblemon.energy_root": "Raiz de Energia",
+  "item.cobblemon.revival_herb": "Erva do Renascimento",
+  "item.cobblemon.roasted_leek": "Alho-porro Assado",
+  "item.cobblemon.leek_and_potato_stew": "Ensopado de Alho-porro e Batata",
+  "item.cobblemon.braised_vivichoke": "Alcachofra Refogada",
+  "item.cobblemon.vivichoke_dip": "Mergulho de Alcachofra",
+  "item.cobblemon.berry_juice": "Sumo de Baga",
+  "item.cobblemon.remedy": "Remédio",
+  "item.cobblemon.fine_remedy": "Remédio Refinado",
+  "item.cobblemon.superb_remedy": "Remédio Soberbo",
+  "item.cobblemon.heal_powder": "Pó de Cura",
+  "item.cobblemon.medicinal_brew": "Poção Medicinal",
+  "item.cobblemon.revive": "Reviver",
+  "item.cobblemon.max_revive": "Reviver Máximo",
+  "item.cobblemon.pp_up": "PP Up",
+  "item.cobblemon.pp_max": "PP Máximo",
+  "item.cobblemon.x_attack": "X Ataque",
+  "item.cobblemon.x_defence": "X Defesa",
+  "item.cobblemon.x_accuracy": "X Precisão",
+  "item.cobblemon.x_speed": "X Velocidade",
+  "item.cobblemon.x_special_defence": "X Defesa Especial",
+  "item.cobblemon.x_special_attack": "X Ataque Especial",
+  "item.cobblemon.dire_hit": "Golpe Terrível",
+  "item.cobblemon.guard_spec": "Guarda de Efeitos",
+  "item.cobblemon.full_heal": "Cura Completa",
+  "item.cobblemon.antidote": "Antídoto",
+  "item.cobblemon.awakening": "Despertador",
+  "item.cobblemon.burn_heal": "Cura de Queimadura",
+  "item.cobblemon.ice_heal": "Cura de Gelo",
+  "item.cobblemon.paralyze_heal": "Cura de Paralisia",
+  "item.cobblemon.ether": "Éter",
+  "item.cobblemon.max_ether": "Éter Máximo",
+  "item.cobblemon.elixir": "Elixir",
+  "item.cobblemon.max_elixir": "Elixir Máximo",
+  "itemGroup.cobblemon.blocks": "Blocos",
+  "itemGroup.cobblemon.pokeball": "Poké Bolas",
+  "itemGroup.cobblemon.agriculture": "Agricultura",
+  "itemGroup.cobblemon.consumables": "Consumíveis",
+  "itemGroup.cobblemon.held_item": "Equipamento",
+  "itemGroup.cobblemon.evolution_item": "Itens de Evolução",
  "block.cobblemon.apricorn_log": "Tronco de Bolota",
  "block.cobblemon.stripped_apricorn_log": "Tronco de Bolota descascado",
  "block.cobblemon.apricorn_wood": "Madeira de Bolota",
@@ -183,6 +284,7 @@
  "block.cobblemon.apricorn_button": "Botão de Bolota",
  "block.cobblemon.apricorn_slab": "Degrau de Bolota",
  "block.cobblemon.apricorn_fence_gate": "Portão de Bolota",
+  "block.cobblemon.big_root": "Raiz Grande",
  "block.cobblemon.black_apricorn_sapling": "Rebento de Bolota Preta",
  "block.cobblemon.blue_apricorn_sapling": "Rebento de Bolota Azul",
  "block.cobblemon.green_apricorn_sapling": "Rebento de Bolota Verde",
@@ -196,12 +298,24 @@
  "block.cobblemon.healing_machine.tooltip1": "Precisa de carregar após ser colocada.",
  "block.cobblemon.healing_machine.tooltip2": "Carrega com o tempo.",
  "block.cobblemon.pc": "PC",
+  "block.cobblemon.red_mint": "Sementes de Hortelã Vermelha",
+  "block.cobblemon.blue_mint": "Sementes de Hortelã Azul",
+  "block.cobblemon.cyan_mint": "Sementes de Hortelã Ciano",
+  "block.cobblemon.pink_mint": "Sementes de Hortelã Rosa",
+  "block.cobblemon.green_mint": "Sementes de Hortelã Verde",
+  "block.cobblemon.white_mint": "Sementes de Hortelã Branca",
+  "block.cobblemon.vivichoke_seeds": "Sementes de Alcachofra",
+  "block.cobblemon.pep_up_flower": "Flor Estimulante",
+  "block.cobblemon.potted_pep_up_flower": "Flor Estimulante Envasada",
  "cobblemon.overflow_no_pc": "A tua equipa estava cheia e não tens um PC!",
  "cobblemon.overflow_no_space": "A tua equipa estava cheia e %1$s também!",
  "cobblemon.overflow_to_pc": "A tua equipa está cheia! %1$s foi adicionado(a) a %2$s.",
  "cobblemon.your_pc": "Teu PC",
  "cobblemon.command.pokespawn.invalid-pokemon": "Nome de Pokémon inválido",
  "cobblemon.command.pokespawn.invalid-move": "Nome de ataque inválido",
+  "cobblemon.command.clearparty.nonethere": "Não há nenhum Pokémon na equipa do(a) %1$s.",
+  "cobblemon.command.clearparty.cleared": "A equipa do(a) %1$s foi removida.",
+  "cobblemon.command.clearpc.cleared": "O PC do(a) %1$s foi limpo.",
  "cobblemon.ui.generic.yes": "Sim",
  "cobblemon.ui.generic.no": "Não",
  "cobblemon.ui.pokenav.title": "PokeNav",
@@ -211,6 +325,8 @@
  "cobblemon.ui.starter.alreadyselected": "Já escolheste um iniciante!",
  "cobblemon.ui.starter.cannotchoose": "Não podes escolher um iniciante neste momento.",
  "cobblemon.ui.starter.hasalreadychosen": "%1$s já escolheu um iniciante.",
+  "cobblemon.ui.starter.choose_starter_title": "Escolha o seu inicial!",
+  "cobblemon.ui.starter.choose_starter_description": "Pressiona a tecla \"%1$s\"",
  "cobblemon.ui.starter.chooseyourstarter": "Pressiona %1$s para escolher o teu Pokémon e iniciar a tua jornada!",
  "cobblemon.ui.moves": "Ataques",
  "cobblemon.ui.moves.switch": "Trocar Ataque",
@@ -237,6 +353,12 @@
  "cobblemon.ui.info.ability": "Habilidade",
  "cobblemon.ui.info.experience_points": "Pontos de Exp.",
  "cobblemon.ui.info.to_next_level": "Para Próximo Nível",
+  "cobblemon.ui.trade": "Troca",
+  "cobblemon.trade.occupied": "%1$s está ocupado(a).",
+  "cobblemon.trade.request_expired": "A solicitação para trocar com %1$s expirou.",
+  "cobblemon.trade.request_already_expired": "A solicitação de troca deles já expirou.",
+  "cobblemon.trade.request_sent": "Ofereceu-se para trocar com %1$s",
+  "cobblemon.trade.offer": "%1$s ofereceu-se para trocar Pokémon com você.",
  "cobblemon.ui.party": "Equipa",
  "cobblemon.ui.power": "Poder",
  "cobblemon.ui.accuracy": "Precisão",
@@ -245,6 +367,10 @@
  "cobblemon.ui.exit": "Sair",
  "cobblemon.ui.pc.box.title": "Caixa %1$s",
  "cobblemon.ui.pc.release": "Libertar",
+  "cobblemon.ui.pasture": "Pastagem",
+  "cobblemon.ui.pasture.recall_all": "Retirar Todos",
+  "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)",
+  "cobblemon.pasture.too_many_nearby": "Há demasiados Pokémon por perto.",
  "key.cobblemon.upshiftparty": "Subir slot da equipa selecionada",
  "key.cobblemon.downshiftparty": "Descer slot da equipa selecionada",
  "key.cobblemon.hideparty": "Esconder a sobreposição da equipa",
@@ -291,9 +417,150 @@
  "cobblemon.label.lv": "Nível %1$s",
  "cobblemon.challenge_label": "Pressiona %1$s para combater.",
  "cobblemon.challenge.sender": "Desafiaste o(a) %1$s para uma luta!",
-  "cobblemon.challenge.receiver": "%1$s desafiou-te para lutar! Olha para ele(a) e pressiona %2$s para lutar.",
+  "cobblemon.challenge.receiver": "%1$s desafiou-te para uma batalha!",
  "cobblemon.drop.item.inventory": "Tu recebeste %2$s (%2$sx).",
  "cobblemon.drop.item.full": "O teu inventário está cheio por isso o(a) %1$s caiu ao chão.",
+  "cobblemon.mint.interact": "Os atributos do(a) %1$s mudaram!",
+  "cobblemon.mint.same_nature": "Os atributos do(a) %1$s não são afetados pela %2$s.",
+  "itemGroup.cobblemon.plants": "Plantas",
+  "item.cobblemon.aguav_berry": "Baga Aguav",
+  "item.cobblemon.aguav_berry.tooltip": "Restaura 1/3 do HP máximo ao alcançar 1/4 do HP máximo ou menos; confunde se Natureza -SpD",
+  "item.cobblemon.apicot_berry": "Baga Apicot",
+  "item.cobblemon.apicot_berry.tooltip": "Aumenta a Defesa Especial do portador por 1 estágio ao alcançar 1/4 do HP máximo ou menos",
+  "item.cobblemon.aspear_berry": "Baga Aspear",
+  "item.cobblemon.aspear_berry.tooltip": "O portador é curado se for congelado",
+  "item.cobblemon.babiri_berry": "Baga Babiri",
+  "item.cobblemon.babiri_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Aço",
+  "item.cobblemon.belue_berry": "Baga Belue",
+  "item.cobblemon.belue_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.bluk_berry": "Baga Bluk",
+  "item.cobblemon.bluk_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.charti_berry": "Baga Charti",
+  "item.cobblemon.charti_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Pedra",
+  "item.cobblemon.cheri_berry": "Baga Cheri",
+  "item.cobblemon.cheri_berry.tooltip": "O portador é curado se for paralisado",
+  "item.cobblemon.chesto_berry": "Baga Chesto",
+  "item.cobblemon.chesto_berry.tooltip": "O portador é curado se adormecer",
+  "item.cobblemon.chilan_berry": "Baga Chilan",
+  "item.cobblemon.chilan_berry.tooltip": "Reduz pela metade o dano recebido de um ataque do tipo Normal",
+  "item.cobblemon.chople_berry": "Baga Chople",
+  "item.cobblemon.chople_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Lutador",
+  "item.cobblemon.coba_berry": "Baga Coba",
+  "item.cobblemon.coba_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Voador",
+  "item.cobblemon.colbur_berry": "Baga Colbur",
+  "item.cobblemon.colbur_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Escuridão",
+  "item.cobblemon.cornn_berry": "Baga Cornn",
+  "item.cobblemon.cornn_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.custap_berry": "Baga Custap",
+  "item.cobblemon.custap_berry.tooltip": "O portador move-se primeiro ao alcançar 1/4 do HP máximo",
+  "item.cobblemon.durin_berry": "Baga Durin",
+  "item.cobblemon.durin_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.enigma_berry": "Baga Enigma",
+  "item.cobblemon.enigma_berry.tooltip": "Restaura 1/4 do HP máximo após o portador ser atingido por um movimento super eficaz",
+  "item.cobblemon.figy_berry": "Baga Figy",
+  "item.cobblemon.figy_berry.tooltip": "Restaura 1/3 do HP máximo ao alcançar 1/4 do HP máximo ou menos; confunde se Natureza -Atk",
+  "item.cobblemon.ganlon_berry": "Baga Ganlon",
+  "item.cobblemon.ganlon_berry.tooltip": "Aumenta a Defesa do portador por 1 estágio ao alcançar 1/4 do HP máximo ou menos",
+  "item.cobblemon.grepa_berry": "Baga Grepa",
+  "item.cobblemon.grepa_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.haban_berry": "Baga Haban",
+  "item.cobblemon.haban_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Dragão",
+  "item.cobblemon.hondew_berry": "Baga Hondrew",
+  "item.cobblemon.hondew_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.hopo_berry": "Baga Hopo",
+  "item.cobblemon.hopo_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.iapapa_berry": "Baga Iapapa",
+  "item.cobblemon.iapapa_berry.tooltip": "Restaura 1/3 do HP máximo ao alcançar 1/4 do HP máximo ou menos; confunde se Natureza -Def",
+  "item.cobblemon.jaboca_berry": "Baga Jaboca",
+  "item.cobblemon.jaboca_berry.tooltip": "Se o portador for atingido por um ataque físico, o atacante perde 1/8 do seu HP máximo",
+  "item.cobblemon.kasib_berry": "Baga Kasib",
+  "item.cobblemon.kasib_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Fantasma",
+  "item.cobblemon.kebia_berry": "Baga Kebia",
+  "item.cobblemon.kebia_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Veneno",
+  "item.cobblemon.kee_berry": "Baga Kee",
+  "item.cobblemon.kee_berry.tooltip": "Aumenta a Defesa do portador por 1 estágio após ser atingido por um ataque físico",
+  "item.cobblemon.kelpsy_berry": "Baga Kelpsy",
+  "item.cobblemon.kelpsy_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.lansat_berry": "Baga Lansat",
+  "item.cobblemon.lansat_berry.tooltip": "O portador ganha o efeito de Foco de Energia ao alcançar 1/4 do HP máximo ou menos",
+  "item.cobblemon.leppa_berry": "Baga Leppa",
+  "item.cobblemon.leppa_berry.tooltip": "Restaura 10 PP para o primeiro ataque do portador a alcançar 0 PP",
+  "item.cobblemon.liechi_berry": "Baga Liechi",
+  "item.cobblemon.liechi_berry.tooltip": "Aumenta o Ataque do portador por 1 estágio ao alcançar 1/4 do HP máximo ou menos",
+  "item.cobblemon.lum_berry": "Baga Lum",
+  "item.cobblemon.lum_berry.tooltip": "O portador cura-se se tiver um estado não volátil ou estiver confuso",
+  "item.cobblemon.mago_berry": "Baga Mago",
+  "item.cobblemon.mago_berry.tooltip": "Restaura 1/3 do HP máximo ao alcançar 1/4 do HP máximo ou menos; confunde se Natureza -Spe",
+  "item.cobblemon.magost_berry": "Baga Magost",
+  "item.cobblemon.magost_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.maranga_berry": "Baga Maranga",
+  "item.cobblemon.maranga_berry.tooltip": "Aumenta a Defesa Especial do portador por 1 estágio após ser atingido por um ataque especial",
+  "item.cobblemon.micle_berry": "Baga Micle",
+  "item.cobblemon.micle_berry.tooltip": "O próximo ataque do portador tem 1.2x precisão ao alcançar 1/4 do HP máximo or menos",
+  "item.cobblemon.nanab_berry": "Baga Nanab",
+  "item.cobblemon.nanab_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.touga_berry": "Baga Touga",
+  "item.cobblemon.touga_berry.tooltip": "O portador é curado se ficar confuso",
+  "item.cobblemon.nomel_berry": "Baga Nomel",
+  "item.cobblemon.nomel_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.occa_berry": "Baga Occa",
+  "item.cobblemon.occa_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Fogo",
+  "item.cobblemon.oran_berry": "Baga Oran",
+  "item.cobblemon.oran_berry.tooltip": "Restaura 10 HP ao alcançar 1/2 do HP máximo ou menos",
+  "item.cobblemon.pamtre_berry": "Baga Pamtre",
+  "item.cobblemon.pamtre_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.passho_berry": "Baga Passho",
+  "item.cobblemon.passho_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Água",
+  "item.cobblemon.payapa_berry": "Baga Payapa",
+  "item.cobblemon.payapa_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Psíquico",
+  "item.cobblemon.pecha_berry": "Baga Pecha",
+  "item.cobblemon.pecha_berry.tooltip": "O portador é curado se for envenenado",
+  "item.cobblemon.persim_berry": "Baga Persim",
+  "item.cobblemon.persim_berry.tooltip": "O portador é curado se ficar confuso",
+  "item.cobblemon.petaya_berry": "Baga Petaya",
+  "item.cobblemon.petaya_berry.tooltip": "Aumenta o Ataque Especial do portador por 1 estágio ao alcançar 1/4 do HP máximo ou menos",
+  "item.cobblemon.pinap_berry": "Baga Pinap",
+  "item.cobblemon.pinap_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.pomeg_berry": "Baga Pomeg",
+  "item.cobblemon.pomeg_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.qualot_berry": "Baga Qualot",
+  "item.cobblemon.qualot_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.rabuta_berry": "Baga Rabuta",
+  "item.cobblemon.rabuta_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.rawst_berry": "Baga Rawst",
+  "item.cobblemon.rawst_berry.tooltip": "O portador é curado se for queimado",
+  "item.cobblemon.razz_berry": "Baga Razz",
+  "item.cobblemon.razz_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.rindo_berry": "Baga Rindo",
+  "item.cobblemon.rindo_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Erva",
+  "item.cobblemon.roseli_berry": "Baga Roseli",
+  "item.cobblemon.roseli_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Fada",
+  "item.cobblemon.rowap_berry": "Baga Rowap",
+  "item.cobblemon.rowap_berry.tooltip": "Se o portador for atingido por um ataque especial, o atacante perde 1/8 do seu HP máximo",
+  "item.cobblemon.salac_berry": "Baga Salac",
+  "item.cobblemon.salac_berry.tooltip": "Aumenta a Velocidade do portador por 1 estágio ao alcançar 1/4 do HP máximo ou menos",
+  "item.cobblemon.shuca_berry": "Baga Shuca",
+  "item.cobblemon.shuca_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Terra",
+  "item.cobblemon.sitrus_berry": "Baga Sitrus",
+  "item.cobblemon.sitrus_berry.tooltip": "Restaura 1/4 do HP máximo quando alcançar 1/2 do HP máximo ou menos",
+  "item.cobblemon.spelon_berry": "Baga Spelon",
+  "item.cobblemon.spelon_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.starf_berry": "Baga Starf",
+  "item.cobblemon.starf_berry.tooltip": "Aumenta um atributo aleatório por 2 ao alcançar 1/4 do HP máximo ou menos",
+  "item.cobblemon.tamato_berry": "Baga Tamato",
+  "item.cobblemon.tamato_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.tanga_berry": "Baga Tanga",
+  "item.cobblemon.tanga_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Inseto",
+  "item.cobblemon.wacan_berry": "Baga Wacan",
+  "item.cobblemon.wacan_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Elétrico",
+  "item.cobblemon.watmel_berry": "Baga Watmel",
+  "item.cobblemon.watmel_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.wepear_berry": "Baga Wepear",
+  "item.cobblemon.wepear_berry.tooltip": "Não pode ser comida pelo portador",
+  "item.cobblemon.wiki_berry": "Baga Wiki",
+  "item.cobblemon.wiki_berry.tooltip": "Restaura 1/3 do HP máximo ao alcançar 1/4 do HP máximo ou menos; confunde se Natureza -SpA",
+  "item.cobblemon.yache_berry": "Baga Yache",
+  "item.cobblemon.yache_berry.tooltip": "Reduz pela metade o dano recebido de um ataque super eficaz do tipo Gelo",
  "cobblemon.command.general.invalid-party-slot": "Não há nenhum Pokémon no slot %1$s!",
  "cobblemon.command.givepokemon.give": "Foi dado %1$s a %2$s.",
  "cobblemon.command.pokemonedit": "%1$s de %2$s foi editado.",
@@ -305,10 +572,19 @@
  "cobblemon.command.spawnpokemon.nospecies": "Erro. Tens de incluir o nome de um Pokémon ou 'random' para um aleatório.",
  "cobblemon.command.held_item": "%2$s do(a) %1$s foi dado um(a) %3$s para segurar.",
  "cobblemon.command.pokeheal.in_battle": "Não podes curar a tua equipa em combate!",
+  "cobblemon.command.spawnpokemonfrompool": "Um(a) %1$s surgiu na área.",
+  "cobblemon.command.spawnpokemonfrompool.unable_to_spawn": "Não foi possível gerar um Pokémon.",
+  "cobblemon.command.pokebox.box_does_not_exist": "Aquele jogador não tem uma caixa %1$s.",
+  "cobblemon.command.pokebox.box_is_full": "A caixa daquele jogador %1$s está cheia.",
+  "cobblemon.command.pokebox.storage_is_full": "O armazenamento desse jogador está cheio.",
+  "cobblemon.command.pokebox.last_pokemon": "Não foi possível enviar o último Pokemon desse jogador para o PC.",
+  "cobblemon.command.pokemonrestart": "A equipa e o PC do(a) %1$s foram limpos.",
  "advancements.cobblemon.root": "O Mundo de Pedramon!",
-  "advancements.cobblemon.obtain_leftovers": "Reduzir, Reutilizar, Reciclar!",
-  "advancements.cobblemon.obtain_leftovers.description": "Keep the leftovers after eating an apple.",
  "advancements.cobblemon.root.description": "Escolhe um Pokémon inicial e parte numa nova aventura",
+  "advancements.cobblemon.obtain_leftovers": "Reduzir, Reutilizar, Reciclar!",
+  "advancements.cobblemon.obtain_leftovers.description": "Guarda os restos após comer uma maçã.",
+  "advancements.cobblemon.any_plant": "Recompensa da Mãe Natureza",
+  "advancements.cobblemon.any_plant.description": "Espero que sejas bom com jardinagem!",
  "advancements.cobblemon.harvest_apricorn": "É Fruta ou É Noz?",
  "advancements.cobblemon.harvest_apricorn.description": "Interage com uma Bolota madura para colhê-la",
  "advancements.cobblemon.harvest_apricorn_seed": "A Fazer a Minha Parte",
@@ -328,7 +604,7 @@
  "advancements.cobblemon.first_catch": "Um Novo Amigo!",
  "advancements.cobblemon.first_catch.description": "Usa uma Poké Bola para capturar o teu primeiro Pokémon",
  "advancements.cobblemon.full_party": "Casa Cheia",
-  "advancements.cobblemon.full_party.description": "Captura 5 ou mais Pokémon para ter uma equipa completa",
+  "advancements.cobblemon.full_party.description": "Captura mais Pokémon para ter uma equipa completa de 6",
  "advancements.cobblemon.first_evolution": "Trabalho Duro e Dedicação",
  "advancements.cobblemon.first_evolution.description": "Cumpre os requisitos para um Pokémon evoluir, e evolui-o(a) através do menu de equipa",
  "advancements.cobblemon.first_battle_victory": "E a Música para Celebrar?",
@@ -337,6 +613,55 @@
  "advancements.cobblemon.first_shiny_catch.description": "Captura o teu primeiro Pokémon Brilhante",
  "advancements.cobblemon.healing_machine": "Poder da Cura",
  "advancements.cobblemon.healing_machine.description": "Espera até uma Máquina de Cura carregar, e depois cura a tua equipa",
+  "advancements.cobblemon.obtain_leek": "O Tesouro do Farfetch'd",
+  "advancements.cobblemon.obtain_leek.description": "Obtém um Alho-porro Medicinal, uma planta selvagem que cresce em água doce",
+  "advancements.cobblemon.medicinal_brew": "Boticária Local",
+  "advancements.cobblemon.medicinal_brew.description": "Prepara um Alho-porro Medicinal para criar a base para as suas necessidades de cura",
+  "advancements.cobblemon.brew_potion": "Tu não podes lidar com as minhas poções",
+  "advancements.cobblemon.brew_potion.description": "Prepara Alho-porro Medicinal através de uma Baga Oran para criar uma Poção",
+  "advancements.cobblemon.brew_full_restore": "Escolha do Campeão",
+  "advancements.cobblemon.brew_full_restore.description": "Segue a árvore de poções e cria uma Restauração Completa com uma Baga Lum e Poção Máxima",
+  "advancements.cobblemon.brew_all": "Mestre da Medicina",
+  "advancements.cobblemon.brew_all.description": "Cria todos os itens possíveis usando Alho-porro Medicinal",
+  "advancements.cobblemon.obtain_mint": "Horta de Hortelãs",
+  "advancements.cobblemon.obtain_mint.description": "Obtém uma Hortelã Natural, uma planta selvagem que cresce no alto nas montanhas",
+  "advancements.cobblemon.obtain_all_mints": "Uma Miscelânea de Personalidades",
+  "advancements.cobblemon.obtain_all_mints.description": "Obtém todos as 6 cores de Hortelãs Naturais e ganha acesso a uma variedade completa de naturezas",
+  "advancements.cobblemon.obtain_revival_herb": "Bons Medicamentos têm sempre um Mau Sabor",
+  "advancements.cobblemon.obtain_revival_herb.description": "Obtém uma Erva do Renascimento, uma planta selvagem que cresce em cavernas exuberantes",
+  "advancements.cobblemon.use_revive": "Vive para lutar mais um dia!",
+  "advancements.cobblemon.use_revive.description": "Usa um Reviver, Reviver Máximo, ou Erva do Renascimento para reviver um Pokémon desmaiado",
+  "advancements.cobblemon.obtain_big_root": "A Raiz da Cura Básica",
+  "advancements.cobblemon.obtain_big_root.description": "Obtém uma Raiz Grande, uma planta que cresce em cavernas de terra perto da superfície",
+  "advancements.cobblemon.craft_remedy": "Cura Básica",
+  "advancements.cobblemon.craft_remedy.description": "Cria um Remédio, um item do início do jogo que pode ser transformado em formas mais fortes",
+  "advancements.cobblemon.obtain_vivichoke": "A Estranha do Grupo",
+  "advancements.cobblemon.obtain_vivichoke.description": "Obtém Alcachofra, cultivada a partir de Sementes de Alcachofra estranhamente escassas",
+  "advancements.cobblemon.obtain_berry": "A Primeira Baga no Menu",
+  "advancements.cobblemon.obtain_berry.description": "Obtém qualquer Baga, plantas selvagens que crescem na superfície e têm vários usos",
+  "advancements.cobblemon.obtain_mutated_berry": "Um Resultado Inesperado",
+  "advancements.cobblemon.obtain_mutated_berry.description": "Plante Árvores de Bagas de diferentes tipos umas ao lado das outras e testemunhe Mutação em ação",
+  "advancements.cobblemon.obtain_all_berries": "Oops, todas as Bagas!",
+  "advancements.cobblemon.obtain_all_berries.description": "Obtém um de cada Baga em Cobblemon",
+  "advancements.cobblemon.use_pasture": "Um Novo Jardim Zoológico",
+  "advancements.cobblemon.use_pasture.description": "Cria um Bloco de Pastagem e permite que os teus amigos vagueiem",
+  "advancements.cobblemon.catch_all_vivillon": "Asas Padronizadas",
+  "advancements.cobblemon.catch_all_vivillon.description": "Obtém todos os padrões de Vivillon",
+  "advancements.cobblemon.evolve_veevees": "Veevees Valorizadas",
+  "advancements.cobblemon.evolve_veevees.description": "Evolui Eevee em 8 formas diferentes",
+  "advancements.cobblemon.evolve_shedinja": "Fantasma no Casco",
+  "advancements.cobblemon.evolve_shedinja.description": "Tenha uma Poké Bola extra no seu inventário e obtenha um Shedinja",
+  "advancements.cobblemon.trade_pokemon": "Cuida-te bem!",
+  "advancements.cobblemon.trade_pokemon.description": "Troque um Pokémon com outro Treinador",
+  "advancements.cobblemon.trade_shelmet_karrablast": "Eu gostaria de denunciar um roubo!",
+  "advancements.cobblemon.trade_shelmet_karrablast.description": "Troque um Shelmet e um Karrablast",
+  "advancements.cobblemon.max_level_baby": "Darwin? Quem é esse?",
+  "advancements.cobblemon.max_level_baby.description": "Leva um Pokémon de primeira fase capaz de evoluir até ao nível 100",
+  "advancements.cobblemon.use_candy": "Dente Doce",
+  "advancements.cobblemon.use_candy.description": "Usa qualquer Doce de XP num Pokémon",
+  "advancements.cobblemon.own_zangoose_seviper": "Parceiros relutantes",
+  "advancements.cobblemon.own_zangoose_seviper.description": "Tenha um Zangoose e um Seviper na sua equipa ao mesmo tempo",
+  "cobblemon.battle.crash": "Ocorreu um erro de batalha. Se está a jogar em single-player, reporte isto à equipe de mods. Caso contrário, reporte isto ao administrador do servidor.",
  "cobblemon.battle.damage_dealt": "%1$s sofreu %2$s de dano!",
  "cobblemon.battle.used_move": "%1$s usou %2$s!",
  "cobblemon.battle.used_move_on": "%1$s usou %2$s contra %3$s!",
@@ -356,14 +681,19 @@
  "cobblemon.battle.crit": "Golpe crítico!",
  "cobblemon.battle.nothing": "Mas nada aconteceu.",
  "cobblemon.battle.clearallboost": "Todos os atributos alterados voltaram ao normal.",
+  "cobblemon.battle.clearallnegativeboost": "As mudanças negativas dos atributos do(a) %1$s foram removidas!",
+  "cobblemon.battle.clearallnegativeboost.zeffect": "Os atributos diminuídos do(a) %1$s voltaram ao normal usando o seu Poder-Z!",
  "cobblemon.battle.unboost.slight": "O(a) %2$s do(a) %1$s baixou.",
  "cobblemon.battle.unboost.sharp": "O(a) %2$s do(a) %1$s baixou muito.",
  "cobblemon.battle.unboost.severe": "O(a) %2$s do(a) %1$s baixou severamente.",
  "cobblemon.battle.unboost.cap.single": "O(a) %2$s do(a) %1$s não consegue baixar mais.",
  "cobblemon.battle.unboost.cap.multiple": "Os atributos do(a)%1$s não conseguem baixar mais.",
  "cobblemon.battle.boost.slight": "O(a) %2$s do(a) %1$s aumentou.",
+  "cobblemon.battle.boost.slight.zeffect": "%1$s aumentou o(a) seu(sua) %2$s usando o seu Poder-Z!",
  "cobblemon.battle.boost.sharp": "O(a) %2$s do(a) %1$s aumentou muito.",
+  "cobblemon.battle.boost.sharp.zeffect": "%1$s aumentou o(a) seu(sua) %2$s usando o seu Poder-Z!",
  "cobblemon.battle.boost.severe": "O(a) %2$s do(a) %1$s aumentou drasticamente.",
+  "cobblemon.battle.boost.severe.zeffect": "%1$s aumentou o(a) seu(sua) %2$s drasticamente usando o seu Poder-Z!",
  "cobblemon.battle.boost.cap.single": "O(a) %2$s do %1$s já não aumenta mais.",
  "cobblemon.battle.boost.cap.multiple": "Os atributos do(a) %1$s não conseguem aumentar mais.",
  "cobblemon.battle.setboost.bellydrum": "%1$s cortou a própria Vida a meio e maximizou o seu Ataque!",
@@ -381,162 +711,247 @@
  "cobblemon.capture.not_single": "Só podes capturar Pokémon selvagens numa luta 1v1.",
  "cobblemon.you_in_battle": "Não podes fazer isso enquanto estás em combate!",
  "cobblemon.battle.turn": "Agora é o turno n.º %1$s",
-  "cobblemon.battle.rain_dance": "Começou a chover!",
-  "cobblemon.battle.rain_dance_upkeep": "Continua a chover.",
-  "cobblemon.battle.sandstorm": "Soprou uma tempestade de areia!",
-  "cobblemon.battle.sandstorm_buffeted": "%1$s foi esbofeteado pela tempestade de areia.",
-  "cobblemon.battle.sandstorm_upkeep": "A tempestade de areia continua.",
-  "cobblemon.battle.sunny_day": "O tempo aquece!",
-  "cobblemon.battle.sunny_day_upkeep": "O sol continua a bater.",
-  "cobblemon.battle.hail": "Começou a granizar!",
-  "cobblemon.battle.hail_upkeep": "O granizo continua a cair.",
-  "cobblemon.battle.hail_buffeted": "%1$s foi esbofeteado(a) pelo granizo.",
-  "cobblemon.battle.no_weather": "O céu fica limpo.",
-  "cobblemon.battle.confusion_start": "%1$s está confuso!",
-  "cobblemon.battle.confusion_activate": "Magoou-se a si próprio sem querer!",
-  "cobblemon.battle.confusion_snapped": "%1$s  já não está confuso!",
-  "cobblemon.battle.protect_start": "%1$s começa a proteger-se!",
-  "cobblemon.battle.protect_activate": "%1$s protegeu-se a si próprio(a)!",
-  "cobblemon.battle.magnitude_level": "Magnitude de %1$s!",
-  "cobblemon.battle.bide_start": "%1$s começa a armazenar energia!",
-  "cobblemon.battle.bide_activate": "%1$s está a armazenar energia!",
-  "cobblemon.battle.bide_end": "%1$s desencadeou a sua energia!",
-  "cobblemon.battle.field_start.electric_terrain": "Uma corrente elétrica corre pelo campo de batalha!",
-  "cobblemon.battle.field_start.grassy_terrain": "Relva cresceu e cobriu o campo de batalha!",
-  "cobblemon.battle.field_start.gravity": "A gravidade ficou mais intensa!",
-  "cobblemon.battle.field_start.magic_room": "Uma área estranha onde equipamento não tem efeitos foi criada!",
-  "cobblemon.battle.field_start.misty_terrain": "Nevoeiro rodeia o campo de batalha!",
-  "cobblemon.battle.field_start.mud_sport": "O poder de Eletricidade foi enfraquecido!",
-  "cobblemon.battle.field_start.psychic_terrain": "O campo de batalha ficou estranho!",
-  "cobblemon.battle.field_start.trick_room": "%1$s distorceu as dimensões!",
-  "cobblemon.battle.field_start.water_sport": "O poder de Fogo foi enfraquecido!",
-  "cobblemon.battle.field_start.wonder_room": "Criou uma área estranha onde os atributos de Defesa e Defesa Especial estão trocados!",
-  "cobblemon.battle.field_end.electric_terrain": "A corrente elétrica desapareceu do campo de batalha.",
-  "cobblemon.battle.field_end.grassy_terrain": "A relva desapareceu do campo de batalha.",
-  "cobblemon.battle.field_end.gravity": "A gravidade voltou ao normal!",
-  "cobblemon.battle.field_end.magic_room": "A Sala Mágica acabou, e o equipamento voltou ao normal!",
-  "cobblemon.battle.field_end.misty_terrain": "O nevoeiro desapareceu do campo de batalha.",
-  "cobblemon.battle.field_end.mud_sport": "Os efeitos da Brincadeira de Lama acabaram",
-  "cobblemon.battle.field_end.psychic_terrain": "A estranheza desapareceu do campo de batalha!",
-  "cobblemon.battle.field_end.trick_room": "As dimensões distorcidas voltaram ao normal!",
-  "cobblemon.battle.field_end.water_sport": "Os efeitos da Brincadeira de Água acabaram.",
-  "cobblemon.battle.field_end.wonder_room": "A Sala Maravilha acabou, e os atributos de Defesa e Defesa Especial voltaram ao normal!",
-  "cobblemon.battle.cant.generic_block": "%1$s não pode usar %2$s!",
+  "cobblemon.battle.side_subject.ally": "teu",
+  "cobblemon.battle.side_subject.opponent": "o adversário",
+  "cobblemon.battle.weather.raindance.start": "Começou a chover!",
+  "cobblemon.battle.weather.raindance.upkeep": "A chuva continua a cair.",
+  "cobblemon.battle.weather.raindance.end": "A chuva parou.",
+  "cobblemon.battle.weather.sandstorm.start": "Uma tempestade de areia surgiu!",
+  "cobblemon.battle.weather.sandstorm.upkeep": "A tempestade de areia continua.",
+  "cobblemon.battle.weather.sandstorm.end": "A tempestade de areia acabou.",
+  "cobblemon.battle.weather.sunnyday.start": "A luz do Sol intensificou!",
+  "cobblemon.battle.weather.sunnyday.upkeep": "A luz do Sol está forte.",
+  "cobblemon.battle.weather.sunnyday.end": "A luz do Sol desapareceu.",
+  "cobblemon.battle.weather.hail.start": "Começou a cair granizo!",
+  "cobblemon.battle.weather.hail.upkeep": "O granizo continua a cair.",
+  "cobblemon.battle.weather.hail.end": "O granizo parou.",
+  "cobblemon.battle.start.bide": "%1$s começa a armazenar energia!",
+  "cobblemon.battle.start.yawn": "%1$s ficou sonolento(a)!",
+  "cobblemon.battle.start.perish": "A contagem de morte do(a) %1$s caiu para %2$s.",
+  "cobblemon.battle.start.leechseed": "%1$s foi semeado(a)!",
+  "cobblemon.battle.start.aquaring": "%1$s envolveu-se num véu de água!",
+  "cobblemon.battle.start.charge": "%1$s começou a carregar energia!",
+  "cobblemon.battle.start.taunt": "%1$s caiu para a provocação!",
+  "cobblemon.battle.start.autotomize": "%1$s tornou-se ágil!",
+  "cobblemon.battle.start.attract": "%1$s apaixonou-se!",
+  "cobblemon.battle.start.focusenergy": "%1$s está a encher-se de adrenalina!",
+  "cobblemon.battle.start.uproar": "%1$s causou um alvoroço!",
+  "cobblemon.battle.start.curse": "%1$s curtou o seu próprio HP e pôs uma maldição no(a) %2$s!",
+  "cobblemon.battle.start.miracleeye": "%1$s foi identificado(a)!",
+  "cobblemon.battle.start.dynamax": "%1$s Dinamaxizou!",
+  "cobblemon.battle.start.gmax": "%1$s Gigantamaxizou!",
+  "cobblemon.battle.fieldstart.electricterrain": "Uma corrente elétrica percorreu o campo de batalha!",
+  "cobblemon.battle.fieldstart.grassyterrain": "Relva cresceu para cobrir o campo de batalha!",
+  "cobblemon.battle.fieldstart.gravity": "A gravidade intensificou!",
+  "cobblemon.battle.fieldstart.magicroom": "Uma área bizarra onde equipamentos não têm efeitos foi criada!",
+  "cobblemon.battle.fieldstart.mistyterrain": "Redemoinhos de névoa rodeiam o campo de batalha!",
+  "cobblemon.battle.fieldstart.mudsport": "O poder de eletricidade foi enfraquecido!",
+  "cobblemon.battle.fieldstart.psychicterrain": "O campo de batalha ficou estranho!",
+  "cobblemon.battle.fieldstart.trickroom": "%1$s distorceu as dimensões!",
+  "cobblemon.battle.fieldstart.watersport": "O poder de fogo foi enfraquecido!",
+  "cobblemon.battle.fieldstart.wonderroom": "Isso criou uma área bizarra onde os atributos de Defesa e Defesa Especial estão trocados!",
+  "cobblemon.battle.fieldend.electricterrain": "A eletricidade desapareceu do campo de batalha.",
+  "cobblemon.battle.fieldend.grassyterrain": "A relva desapareceu do campo de batalha.",
+  "cobblemon.battle.fieldend.gravity": "A gravidade voltou ao normal!",
+  "cobblemon.battle.fieldend.magicroom": "A Sala Mágica desapareceu, e os efeitos do equipamento voltaram ao normal!",
+  "cobblemon.battle.fieldend.mistyterrain": "A névoa desapareceu do campo de batalha.",
+  "cobblemon.battle.fieldend.mudsport": "Os efeitos de Brincadeira de Lama acabaram.",
+  "cobblemon.battle.fieldend.psychicterrain": "A estranheza desapareceu do campo de batalha!",
+  "cobblemon.battle.fieldend.trickroom": "As dimensões distorcidas voltaram ao normal!",
+  "cobblemon.battle.fieldend.watersport": "Os efeitos de Brincadeira de Água acabaram.",
+  "cobblemon.battle.fieldend.wonderroom": "Sala Maravilha acabou, e os atributos de Defesa e Defesa Especial voltaram ao normal!",
+  "cobblemon.battle.fieldactivate.perishsong": "Todos os Pokémon que ouviram a canção vão desmaiar em três turnos!",
+  "cobblemon.battle.sidestart.stealthrock": "Pedras polidas flutuam no ar em torno da equipa do(a) %1$s!",
+  "cobblemon.battle.sidestart.spikes": "Espinhos foram espalhados no chão ao redor da equipa do(a) %1$s!",
+  "cobblemon.battle.sidestart.toxicspikes": "Espinhos de veneno foram espalhados no chão ao redor da equipa do(a) %1$s!",
+  "cobblemon.battle.sidestart.stickyweb": "Uma rede pegajosa foi colocada no chão ao redor da equipa do(a) %1$s!",
+  "cobblemon.battle.sidestart.reflect": "Reflexão tornou a equipa do(a) %1$s mais forte contra ataques físicos!",
+  "cobblemon.battle.sidestart.lightscreen": "Tela de Luz tornou a equipa do(a) %1$s mais forte contra ataques especiais!",
+  "cobblemon.battle.sidestart.auroraveil": "Véu de Aurora tornou a equipa do(a) %1$s mais forte contra ataques físicos e especiais!",
+  "cobblemon.battle.sidestart.tailwind": "O Vento de Cauda soprou por trás da equipa do(a) %1$s!",
+  "cobblemon.battle.sidestart.safeguard": "A equipa do(a) %1$s disfarçou-se num véu místico!",
+  "cobblemon.battle.sideend.stealthrock": "As pedras pontiagudas desapareceram ao redor da equipa do(a) %1$s!",
+  "cobblemon.battle.sideend.spikes": "Os espinhos desapareceram do chão ao redor da equipa do(a) %1$s!",
+  "cobblemon.battle.sideend.toxicspikes": "Os espinhos de veneno desapareceram do chão ao redor da equipa do(a) %1$s!",
+  "cobblemon.battle.sideend.stickyweb": "A rede pegajosa desapareceu do chão ao redor da equipa do(a) %1$s",
+  "cobblemon.battle.sideend.reflect": "A Reflexão da equipa do(a) %1$s acabou!",
+  "cobblemon.battle.sideend.lightscreen": "A Tela de Luz da equipa do(a) %1$s desapareceu!",
+  "cobblemon.battle.sideend.auroraveil": "O Véu de Aurora da equipa do(a) %1$s acabou!",
+  "cobblemon.battle.sideend.tailwind": "O Vento de Cauda da equipa do(a) %1$s!",
+  "cobblemon.battle.sideend.safeguard": "A equipa do(a) %1$s deixou de estar protegida por Salvaguarda!",
+  "cobblemon.battle.cant.generic": "%1$s não pode usar %2$s!",
  "cobblemon.battle.cant.truant": "%1$s está com preguiça!",
-  "cobblemon.battle.cant.flinched": "%1$s recuou e não conseguiu se mexer!",
+  "cobblemon.battle.cant.flinch": "%1$s recuou e não conseguiu se mover!",
  "cobblemon.battle.cant.recharge": "%1$s tem que descansar!",
  "cobblemon.battle.cant.attract": "%1$s está encantado e não se mexe!",
  "cobblemon.battle.cant.disable": "%2$s do(a) %1$s está desativado!",
-  "cobblemon.battle.cant.focus_punch": "%1$s perdeu o foco e não conseguiu se mexer!",
-  "cobblemon.battle.cant.heal_block": "%1$s não pode usar %2$s por causa do Bloqueio de Cura!",
+  "cobblemon.battle.cant.focuspunch": "%1$s perdeu o seu foco e não conseguiu se mover!",
+  "cobblemon.battle.cant.healblock": "%1$s não pode usar %2$s por causa do Bloqueio de Cura!",
  "cobblemon.battle.cant.imprison": "%1$s não pode usar %2$s que está preso!",
  "cobblemon.battle.cant.gravity": "%1$s não pode usar %2$s por causa da gravidade!",
-  "cobblemon.battle.cant.shell_trap": "A armadilha de cartuchos do(a) %1$s não funcionou!",
+  "cobblemon.battle.cant.shelltrap": "A armadilha de carapaça do(a) %1$s não funcionou!",
  "cobblemon.battle.cant.taunt": "%1$s não pode usar %2$s depois de ser provocado(a)!",
-  "cobblemon.battle.cant.throat_chop": "Os efeitos de Golpe de Garganta impedem o(a) %1$s de usar certos ataques!",
-  "cobblemon.battle.cant.no_pp": "%1$s tentou usar %2$s mas já não tem mais PP!",
+  "cobblemon.battle.cant.throatchop": "Os efeitos de Corte de Garganta impedem o(a) %1$s de usar certos ataques!",
+  "cobblemon.battle.activate.confusion": "%1$s está confuso(a)!",
  "cobblemon.battle.activate.gravity": "%1$s não pode ficar no ar por causa da gravidade!",
-  "cobblemon.battle.activate.misty_terrain": "%1$s cercou-se com um nevoeiro protetor!",
-  "cobblemon.battle.activate.psychic_terrain": "%1$s cercou-se com um terreno psíquico!",
-  "cobblemon.battle.activate.heal_bell": "Um sino tocou!",
+  "cobblemon.battle.activate.mistyterrain": "%1$s rodeou-se com uma névoa protetora!",
+  "cobblemon.battle.activate.psychicterrain": "%1$s cercou-se com um terreno psíquico!",
+  "cobblemon.battle.activate.healbell": "Um sino tocou!",
  "cobblemon.battle.activate.aromatherapy": "Um aroma calmante soprou pela área!",
  "cobblemon.battle.activate.trapped": "%1$s já não consegue escapar!",
-  "cobblemon.battle.activate.bind": "%1$s was squeezed by %2$s!",
-  "cobblemon.battle.activate.court_change": "%1$s trocou os efeitos de batalha que afetam cada lado do campo!",
-  "cobblemon.battle.activate.guard_split": "%1$s shared its guard with the target!",
-  "cobblemon.battle.activate.spite": "It reduced the PP of %1$s's %2$s by %3$s!",
-  "cobblemon.battle.prepare.bounce": "%1$s sprang up!",
-  "cobblemon.battle.prepare.dig": "%1$s burrowed its way under the ground!",
-  "cobblemon.battle.prepare.dive": "%1$s hid underwater!",
-  "cobblemon.battle.prepare.fly": "%1$s flew up high!",
-  "cobblemon.battle.prepare.freeze_shock": "%1$s became cloaked in a freezing light!",
-  "cobblemon.battle.prepare.geomancy": "%1$s is absorbing power!",
-  "cobblemon.battle.prepare.ice_burn": "%1$s became cloaked in freezing air!",
-  "cobblemon.battle.prepare.meteor_beam": "%1$s is overflowing with space power!",
-  "cobblemon.battle.prepare.phantom_force": "%1$s vanished instantly!",
-  "cobblemon.battle.prepare.razor_wind": "%1$s whipped up a whirlwind!",
-  "cobblemon.battle.prepare.skull_bash": "%1$s tucked in its head!",
-  "cobblemon.battle.prepare.sky_attack": "%1$s became cloaked in a harsh light!",
-  "cobblemon.battle.prepare.sky_drop": "%1$s took its target into the sky!",
-  "cobblemon.battle.prepare.solar_beam": "%1$s absorbed light!",
-  "cobblemon.battle.swapboost.generic": "%1$s swapped stat boosts with %2$s!",
-  "cobblemon.battle.singleturn.protect": "%1$s protected itself!",
-  "cobblemon.battle.singleturn.endure": "%1$s braced itself!",
-  "cobblemon.battle.singleturn.crafty_shield": "Crafty Shield protected %1$s's team!",
-  "cobblemon.battle.singleturn.powder": "%1$s is covered in powder!",
-  "cobblemon.battle.singleturn.follow_me": "%1$s became the center of attention!",
-  "cobblemon.battle.singleturn.snatch": "%1$s is waiting for a target to make a move!",
-  "cobblemon.battle.singleturn.quick_guard": "Quick Guard protected %1$s's team!",
-  "cobblemon.battle.singleturn.wide_guard": "Wide Guard protected %1$s's team!",
-  "cobblemon.battle.singleturn.roost": "(%1$s loses Flying type this turn.)",
-  "cobblemon.battle.singleturn.mat_block": "%1$s intends to flip up a mat and block incoming attacks!",
-  "cobblemon.battle.singleturn.max_guard": "%1$s protected itself!",
-  "cobblemon.battle.singleturn.instruct": "%1$s followed %2$s's instructions!",
-  "cobblemon.battle.singleturn.focus_punch": "%1$s is tightening its focus!",
-  "cobblemon.battle.singleturn.electrify": "%1$s's moves have been electrified!",
-  "cobblemon.battle.singleturn.beak_blast": "%1$s started heating up its beak!",
-  "cobblemon.battle.singleturn.helping_hand": "%2$s is ready to help %1$s!",
-  "cobblemon.battle.singleturn.magic_coat": "%1$s shrouded itself with Magic Coat!",
-  "cobblemon.battle.singleturn.rage_powder": "%1$s became the center of attention!",
-  "cobblemon.battle.singleturn.shell_trap": "%1$s set a shell trap!",
-  "cobblemon.battle.singleturn.spotlight": "%1$s became the center of attention!",
-  "cobblemon.battle.singlemove.destiny_bond": "%1$s is hoping to take its attacker down with it!",
-  "cobblemon.battle.singlemove.glaive_rush": "%1$s throws itself into a reckless charge!",
-  "cobblemon.battle.singlemove.grudge": "%1$s wants its target to bear a grudge!",
-  "cobblemon.battle.singlemove.rage": "%1$s goes into a rage!",
-  "cobblemon.battle.end.bind": "%1$s is no longer being squeezed!",
-  "cobblemon.battle.set_hp.pain_split": "Os combatentes partilharam a sua dor!",
-  "cobblemon.battle.ability.sturdy": "%1$s endured the hit!",
-  "cobblemon.battle.ability.speed_boost": "%1$s's Speed Boost activated!",
-  "cobblemon.battle.ability.intimidate": "%1$s's Intimidate activated!",
-  "cobblemon.battle.ability.unnerve": "%1$s made the opponent too nervous to eat berries!",
-  "cobblemon.battle.ability.anticipation": "%1$s shuddered in anticipation!",
-  "cobblemon.battle.ability.air_lock": "The effects of the weather disappeared.",
-  "cobblemon.battle.ability.generic": "%1$s's %2$s activated!",
+  "cobblemon.battle.activate.bind": "%1$s foi espremido por %2$s!",
+  "cobblemon.battle.activate.wrap": "%1$s foi apertado por %2$s!",
+  "cobblemon.battle.activate.struggle": "%1$s não tem mais ataques disponíveis!",
+  "cobblemon.battle.activate.courtchange": "%1$s trocou os efeitos de batalha afetando cada lado do campo!",
+  "cobblemon.battle.activate.guardsplit": "%1$s compartilhou a sua guarda com o alvo!",
+  "cobblemon.battle.activate.spite": "Isso reduziu o PP de %2$s do(a) %1$s por %3$s!",
+  "cobblemon.battle.activate.lockon": "%1$s mirou no(a) %2$s!",
+  "cobblemon.battle.activate.protosynthesis": "A luz do Sol ativou a Protossíntese do(a) %1$s!",
+  "cobblemon.battle.activate.bide": "%1$s está a armazenar energia!",
+  "cobblemon.battle.activate.protect": "%1$s protegeu-se!",
+  "cobblemon.battle.activate.magnitude": "Magnitude %1$s!",
+  "cobblemon.battle.activate.destinybond": "%1$s levou o seu atacante consigo!",
+  "cobblemon.battle.activate.synchronize": "[Sincronizar do(a) %1$s]",
+  "cobblemon.battle.activate.endure": "%1$s suportou o golpe!",
+  "cobblemon.battle.activate.attract": "%1$s está apaixonado por %2$s!",
+  "cobblemon.battle.activate.firespin": "%1$s ficou preso(a) no vórtice de fogo!",
+  "cobblemon.battle.activate.trick": "%1$s trocou de equipamento com o seu alvo!",
+  "cobblemon.battle.activate.quickclaw": "%1$s consegue agir mais rápido do que o normal, graças à sua Garra Rápida!",
+  "cobblemon.battle.activate.focusband": "%1$s aguentou-se ao usar a sua %2$s!",
+  "cobblemon.battle.activate.forewarn": "%2$s do(a) %1$s foi revelado(a)!",
+  "cobblemon.battle.activate.disguise": "O seu disfarce serviu-lhe como uma distração!",
+  "cobblemon.battle.activate.liquidooze": "%1$s sugou o lodo líquido!",
+  "cobblemon.battle.activate.whirlpool": "%1$s ficou preso(a) no vórtice!",
+  "cobblemon.battle.activate.clamp": "%2$s apertou o(a) %1$s!",
+  "cobblemon.battle.prepare.bounce": "%1$s saltou para cima!",
+  "cobblemon.battle.prepare.dig": "%1$s escavou o seu caminho pelo solo!",
+  "cobblemon.battle.prepare.dive": "%1$s escondeu-se debaixo de água!",
+  "cobblemon.battle.prepare.fly": "%1$s voou alto!",
+  "cobblemon.battle.prepare.freezeshock": "%1$s ficou camuflado(a) na luz congelante!",
+  "cobblemon.battle.prepare.geomancy": "%1$s está a absorver poder!",
+  "cobblemon.battle.prepare.iceburn": "%1$s ficou camuflado(a) no ar congelante!",
+  "cobblemon.battle.prepare.meteorbeam": "%1$s está a transbordar com poder espacial!",
+  "cobblemon.battle.prepare.phantomforce": "%1$s desapareceu instantaneamente!",
+  "cobblemon.battle.prepare.razorwind": "%1$s chicoteou um redemoinho!",
+  "cobblemon.battle.prepare.skullbash": "%1$s preparou a sua cabeça!",
+  "cobblemon.battle.prepare.skyattack": "%1$s ficou camuflado(a) na luz intensa!",
+  "cobblemon.battle.prepare.skydrop": "%1$s levou o seu alvo até ao céu!",
+  "cobblemon.battle.prepare.solarbeam": "%1$s absorveu luz!",
+  "cobblemon.battle.swapboost.generic": "%1$s trocou de aumentos de atributos com %2$s!",
+  "cobblemon.battle.singleturn.protect": "%1$s protegeu-se!",
+  "cobblemon.battle.singleturn.endure": "%1$s preparou-se para o que aí vem!",
+  "cobblemon.battle.singleturn.craftyshield": "Escudo Astuto protegeu a equipa do(a) %1$s!",
+  "cobblemon.battle.singleturn.powder": "%1$s foi coberto(a) de pó!",
+  "cobblemon.battle.singleturn.followme": "%1$s tornou-se no centro das atenções!",
+  "cobblemon.battle.singleturn.snatch": "%1$s está à espera de um alvo para fazer uma jogada!",
+  "cobblemon.battle.singleturn.quickguard": "Guarda Rápida protegeu a equipa do(a) %1$s!",
+  "cobblemon.battle.singleturn.wideguard": "Guarda Larga protegeu a equipa do(a) %1$s!",
+  "cobblemon.battle.singleturn.roost": "(%1$s perde o tipo Voador este turno.)",
+  "cobblemon.battle.singleturn.matblock": "%1$s pretende virar um tapete e bloquear os próximos ataques!",
+  "cobblemon.battle.singleturn.maxguard": "%1$s protegeu-se!",
+  "cobblemon.battle.singleturn.instruct": "%1$s seguiu as instruções de %2$s!",
+  "cobblemon.battle.singleturn.focuspunch": "%1$s está a focar-se!",
+  "cobblemon.battle.singleturn.electrify": "Os ataques do(a) %1$s foram eletrificados!",
+  "cobblemon.battle.singleturn.beakblast": "%1$s começou a aquecer o seu bico!",
+  "cobblemon.battle.singleturn.helpinghand": "%2$s está pronto(a) para ajudar %1$s!",
+  "cobblemon.battle.singleturn.magiccoat": "%1$s envolveu-se com o Casaco Mágico!",
+  "cobblemon.battle.singleturn.ragepowder": "%1$s tornou-se no centro das atenções!",
+  "cobblemon.battle.singleturn.shelltrap": "%1$s colocou uma armadilha de carapaça!",
+  "cobblemon.battle.singleturn.spotlight": "%1$s tornou-se no centro das atenções!",
+  "cobblemon.battle.singlemove.destinybond": "%1$s espera derrubar o seu atacante juntamente consigo!",
+  "cobblemon.battle.singlemove.glaiverush": "%1$s lançou-se em uma carga imprudente!",
+  "cobblemon.battle.singlemove.grudge": "%1$s quer que o seu alvo guarde rancor!",
+  "cobblemon.battle.singlemove.rage": "%1$s entra em fúria!",
+  "cobblemon.battle.damage.wrap": "%1$s foi magoado pela constrição!",
+  "cobblemon.battle.damage.confusion": "%1$s magoou-se em confusão!",
+  "cobblemon.battle.damage.leechseed": "A saúde do(a) %1$s foi sugada pela Semente Sanguessuga!",
+  "cobblemon.battle.damage.sandstorm": "%1$s foi esbofeteado(a) pela tempestade de areia.",
+  "cobblemon.battle.damage.hail": "%1$s foi esbofeteado(a) pelo granizo.",
+  "cobblemon.battle.damage.stealthrock": "Pedras pontiagudas espetaram-se contra %1$s!",
+  "cobblemon.battle.damage.spikes": "%1$s magoou-se com os espinhos!",
+  "cobblemon.battle.damage.recoil": "%1$s magoou-se a si mesmo(a)!",
+  "cobblemon.battle.damage.item": "%1$s foi magoado pelo seu/sua %2$s!",
+  "cobblemon.battle.damage.lifeorb": "%1$s perdeu um pouco do seu HP!",
+  "cobblemon.battle.damage.rockyhelmet": "%1$s foi magoado(a) pelo Capacete Rochoso do(a) %2$s!",
+  "cobblemon.battle.damage.generic": "%1$s foi ferido!",
+  "cobblemon.battle.damage.pokemonmimikyubusted": "O disfarce do(a) %1$s foi quebrado!",
+  "cobblemon.battle.damage.whirlpool": "%1$s foi magoado(a) pelo Redemoinho de Água!",
+  "cobblemon.battle.damage.clamp": "%1$s foi magoado(a) por Braçadeira!",
+  "cobblemon.battle.damage.curse": "%1$s foi atormentado(a) pela maldição!",
+  "cobblemon.battle.end.bind": "%1$s já não está a ser espremido!",
+  "cobblemon.battle.end.wrap": "%1$s libertou-se da constrição!",
+  "cobblemon.battle.end.disable": "O ataque do(a) %1$s deixou de estar desabilitado!",
+  "cobblemon.battle.end.protosynthesis": "Os efeitos da Protossíntese do(a) %1$s acabaram!",
+  "cobblemon.battle.end.taunt": "%1$s libertou-se da provocação!",
+  "cobblemon.battle.end.firespin": "%1$s foi libertado(a) do redemoinho de fogo!",
+  "cobblemon.battle.end.bide": "%1$s libertou a sua energia!",
+  "cobblemon.battle.end.confusion": "%1$s deixou de estar confuso(a)!",
+  "cobblemon.battle.end.whirlpool": "%1$s foi libertado(a) do vórtice!",
+  "cobblemon.battle.end.clamp": "%1$s foi libertado(a) da Braçadeira!",
+  "cobblemon.battle.end.dynamax": "%1$s voltou ao normal!",
+  "cobblemon.battle.sethp.painsplit": "Os combatentes partilharam a sua dor!",
+  "cobblemon.battle.ability.sturdy": "%1$s resistiu ao golpe!",
+  "cobblemon.battle.ability.unnerve": "%1$s deixou o oponente demasiado nervoso para comer bagas!",
+  "cobblemon.battle.ability.anticipation": "%1$s estremeceu em antecipação!",
+  "cobblemon.battle.ability.airlock": "Os efeitos do tempo desapareceram.",
+  "cobblemon.battle.ability.generic": "%2$s de %1$s ativado!",
+  "cobblemon.battle.ability.magicbounce": "%1$s mandou o(a) %2$s de volta!",
  "cobblemon.battle.errors.busy": "%1$s está ocupado(a)!",
  "cobblemon.battle.error.in_battle": "%1$s ja está em combate.",
  "cobblemon.battle.error.in_battle.personal": "Já estás em combate!",
  "cobblemon.battle.error.no_pokemon": "Não tens nenhum Pokémon estável!",
+  "cobblemon.battle.error.no_pokemon_opponent": "O(A) teu/tua adversário(a) não tem nenhum Pokémon usável!",
  "cobblemon.battle.error.insufficient_pokemon": "%1$s tem %2 Pokémon quando são precisos %3.",
  "cobblemon.battle.error.insufficient_pokemon.personal": "Tu tens %1 Pokémon estáveis, mas precisas de %2.",
+  "cobblemon.battle.error.pokemon_is_trapped": "[Escolha indisposnível] Não é possível trocar: O Pokémon ativo está preso",
  "cobblemon.battle.immune": "Mas %1$s é imune!",
  "cobblemon.battle.missed": "Mas falhou.",
  "cobblemon.battle.hit_count": "Acertou %1$s vezes!",
  "cobblemon.battle.hit_count_singular": "Acertou 1 vez!",
-  "cobblemon.battle.item.air_balloon.start": "%1$s está a flutuar no ar com o seu Balão de Ar!",
-  "cobblemon.battle.item.recycle_or_pickup.start": "%1$s encontrou um(a) %2$s!",
-  "cobblemon.battle.item.frisk.start": "%1$s revistou o(a) %2$s e encontrou um(a) %3$s!",
-  "cobblemon.battle.item.take_item.start": "%1$s roubou o(a) %3$s do(a) %2$s!",
-  "cobblemon.battle.item.harvest.start": "%1$s colheu um(a) %2$s!",
-  "cobblemon.battle.item.bestow.start": "%1$s recebeu um(a) %2$s do(a) %3$s!",
-  "cobblemon.battle.item.tricked.start": "%1$s trocou de equipamento com o seu alvo!",
-  "cobblemon.battle.item.eat.end": "%1$s comeu o(a) %2$s que tinha!",
-  "cobblemon.battle.item.fling.end": "%1$s atirou o(a) %2$s que tinha!",
-  "cobblemon.battle.item.knock_off.end": "%1$s derrubou o(a) %3$s do(a) %2$s!",
-  "cobblemon.battle.item.gem.end": "O(A) %1$s fortaleceu o poder do(a) %2$s!",
-  "cobblemon.battle.item.incinerate.end": "O(A) %2$s do(a) %1$s incendiou!",
-  "cobblemon.battle.item.air_balloon.end": "O Balão de Ar do(a) %1$s arrebentou!",
-  "cobblemon.battle.item.hung_on.end": "%1$s aguentou-se ao usar o(a) seu(sua) %2$s!",
-  "cobblemon.battle.item.red_card.end": "%1$s mostrou o Cartão Vermelho ao(à) %2$s!",
-  "cobblemon.battle.item.steal_eat.end": "%1$s roubou e comeu o(a) %3$s do(a) %2$s!",
-  "cobblemon.battle.item.berry_juice.end": "O Sumo de Baga do(a) %1$s ativou-se!",
-  "cobblemon.battle.item.used_its.end": "%1$s usou o seu(sua) %2$s!",
-  "cobblemon.battle.item.mental_herb.end": "%1$s ultrapassou os efeitos mentais graças à sua Erva Mental!",
-  "cobblemon.battle.item.power_herb.end": "%1$s ficou totalmente carregado graças à sua Erva de Energia!",
-  "cobblemon.battle.item.mirror_herb.end": "%1$s copiou as alterações de atributos graças à sua Erva Espelho",
-  "cobblemon.battle.item.white_herb.end": "%1$s voltou ao seu estado normal graças à sua Erva Branca!",
-  "cobblemon.battle.item.quick_claw.end": "%1$s consegue agir mais rápido que o normal, graças à sua Garra Afiada!",
-  "cobblemon.battle.heal.z_effect": "A Vida do(a) %1$s foi restaurada pelo Poder-Z!",
+  "cobblemon.battle.item.airballoon": "%1$s flutua no ar com o seu %2$s!",
+  "cobblemon.battle.item.recycle": "%1$s encountrou um(a) %2$s!",
+  "cobblemon.battle.item.frisk": "%3$s revistou o(a) %1$s e encontrou um(a) %2$s!",
+  "cobblemon.battle.item.thief": "%1$s roubou o(a) %2$s do(a) %3$s!",
+  "cobblemon.battle.item.harvest": "%1$s colheu um(a) %2$s!",
+  "cobblemon.battle.item.bestow": "%1$s recebeu um(a) %2$s do(a) %3$s!",
+  "cobblemon.battle.item.trick": "%1$s obteve um(a) %2$s.",
+  "cobblemon.battle.item.eat": "%1$s comeu o(a) seu/sua %2$s.",
+  "cobblemon.battle.enditem.eat": "%1$s comeu o(a) seu/sua %2$s!",
+  "cobblemon.battle.enditem.fling": "%1$s atirou o(a) seu/sua %2$s!",
+  "cobblemon.battle.enditem.knockoff": "%3$s derrubou o(a) %2$s do(a) %1$s!",
+  "cobblemon.battle.enditem.gem": "A %2$s fortaleceu o poder de %1$s!",
+  "cobblemon.battle.enditem.incinerate": "O(A) %2$s do(a) %1$s foi queimado(a)!",
+  "cobblemon.battle.enditem.airballoon": "O Balão de Ar do(a) %1$s arrebentou!",
+  "cobblemon.battle.enditem.redcard": "%1$s mostrou o seu Cartão Vermelho ao/à %3$s!",
+  "cobblemon.battle.enditem.pluck": "%3$s roubou e comeu o(a) %2$s do(a) %1$s!",
+  "cobblemon.battle.enditem.berryjuice": "O Sumo de Baga do(a) %1$s ativou-se!",
+  "cobblemon.battle.enditem.generic": "%1$s usou o seu/sua %2$s!",
+  "cobblemon.battle.enditem.mentalherb": "%1$s libertou-se dos efeitos mentais graças à sua Erva Mental!",
+  "cobblemon.battle.enditem.powerherb": "%1$s ficou totalmente carregado(a) graças à sua Erva de Poder!",
+  "cobblemon.battle.enditem.mirrorherb": "%1$s copiou as alterações de atributos com a sua Erva Espelho!",
+  "cobblemon.battle.enditem.whiteherb": "%1$s voltou ao seu estado normal graças à sua Erva Branca!",
+  "cobblemon.battle.heal.zeffect": "O HP do(a) %1$s foi restaurado pelo Poder-Z!",
  "cobblemon.battle.heal.wish": "O desejo do(a) %1$s realizou-se!",
  "cobblemon.battle.heal.drain": "A Vida do(a) %1$s foi sugada!",
-  "cobblemon.battle.heal.healing_wish": "O desejo de cura tornou-se realidade para o(a) %1$s!",
-  "cobblemon.battle.heal.revival_blessing": "%1$s foi reanimado(a) e está pronto(a) para lutar outra vez!",
-  "cobblemon.battle.heal.aqua_ring": "Um véu de água restaurou Vida ao(à) %1$s!",
+  "cobblemon.battle.heal.healingwish": "O desejo de cura concretizou-se pelo(a) %1$s!",
+  "cobblemon.battle.heal.revivalblessing": "%1$s foi revivido(a) e está pronto(a) para lutar de novo!",
+  "cobblemon.battle.heal.aquaring": "Um véu de água restaurou o HP do(a) %1$s!",
  "cobblemon.battle.heal.ingrain": "%1$s absorveu nutrientes com as suas raízes!",
-  "cobblemon.battle.heal.grassy_terrain": "A Vida do(a) %1$S foi restaurada.",
-  "cobblemon.battle.heal.leftovers": "%1$s recuperou um bocadinho de Vida com os seus Restos!",
-  "cobblemon.battle.heal.rain_dish": "%1$s restored HP from Rain Dish!",
+  "cobblemon.battle.heal.grassyterrain": "O HP do(a) %1$s foi restaurado.",
+  "cobblemon.battle.heal.leftovers": "%1$s restaurou um pouco de HP usando os seus %2$s!",
+  "cobblemon.battle.heal.item": "%1$s restaurou HP usando o(a) seu/sua %2$s!",
+  "cobblemon.battle.heal.raindish": "%1$s restaurou HP graças ao Prato de Chuva!",
  "cobblemon.battle.heal.generic": "%1$s restaurou a sua própria Vida.",
+  "cobblemon.battle.heal.bagitempotion": "Restaurou o HP do(a) %1$s",
+  "cobblemon.battle.curestatus.naturalcure": "%1$s foi curado por Cura Natural!",
+  "cobblemon.battle.bagitem.use": "%1$s usou um(a) %2$s no(a) %3$s!",
+  "cobblemon.battle.bagitem.cannot": "Tu não podes usar itens agora.",
+  "cobblemon.battle.bagitem.invalid": "Este item não funcionaria.",
+  "cobblemon.battle.zpower": "%1$s cercou-se com o seu Poder-Z!",
+  "cobblemon.battle.zbroken": "%1$s não conseguiu proteger-se completamente e magoou-se!",
+  "cobblemon.battle.terastallize": "%1$s Terastalizou para o tipo %2$s!",
+  "cobblemon.battle.detailschange.mega": "%1$s está a reagir com a Pedra Chave!",
+  "cobblemon.battle.mega": "%1$s Mega Evoluiu!",
  "cobblemon.experience.gained": "%1$s recebeu %2$s de experiência.",
  "cobblemon.experience.level_up": "%1$s é agora nível %2$s!",
  "cobblemon.experience.learned_move": "%1$s aprendeu a usar %2$s.",
@@ -609,16 +1024,19 @@
  "cobblemon.move.category.status": "Estado",
  "cobblemon.status.sleep.apply": "%1$s adormeceu!",
  "cobblemon.status.sleep.is": "%1$s está a dormir.",
-  "cobblemon.status.sleep.woke": "%1$s acordou!",
+  "cobblemon.status.sleep.cure": "%1$s acordou!",
  "cobblemon.status.paralysis.apply": "%1$s está paralisado!",
  "cobblemon.status.paralysis.is": "%1$s está paralisado e não consegue se mexer",
+  "cobblemon.status.paralysis.cure": "%1$s foi curado(a) da sua paralisia!",
  "cobblemon.status.poison.apply": "%1$s foi envenenado!",
+  "cobblemon.status.poison.cure": "%1$s foi curado(a) do seu envenenamento!",
  "cobblemon.status.poisonbadly.apply": "%1$s ficou gravemente envenenado(a)!",
-  "cobblemon.status.poison.hurt": "%1$s sente-se mal com o veneno",
+  "cobblemon.status.poison.hurt": "%1$s magoou-se com o veneno!",
  "cobblemon.status.burn.apply": "%1$s entrou em chamas!",
  "cobblemon.status.burn.hurt": "%1$s está a arder!",
+  "cobblemon.status.burn.cure": "%1$s foi curado(a) do seu/sua queimadura!",
  "cobblemon.status.frozen.apply": "%1$s ficou congelado(a)!",
-  "cobblemon.status.frozen.thawed": "%1$s quebrou o gelo!",
+  "cobblemon.status.frozen.cure": "%1$s descongelou-se!",
  "cobblemon.status.frozen.is": "%1$s está congelado(a)!",
  "block.cobblemon.dawn_stone_ore": "Minério de Pedra do Amanhecer",
  "block.cobblemon.dusk_stone_ore": "Minério de Pedra do Crepúsculo",
@@ -641,8 +1059,45 @@
  "block.cobblemon.deepslate_thunder_stone_ore": "Minério de Pedra de Trovão de ardósia",
  "block.cobblemon.deepslate_water_stone_ore": "Minério de Pedra de Água de ardósia",
  "block.cobblemon.dripstone_moon_stone_ore": "Minério de Pedra da Lua de espeleotema",
+  "block.cobblemon.pasture": "Bloco de Pastagem",
  "gamerule.doPokemonSpawning": "Gerar Pokémon",
+  "gamerule.doShinyStarters": "Iniciantes serão brilhantes",
  "cobblemon.command.checkspawns.invalid-bucket": "Categoria Inválida de Geração",
  "cobblemon.command.checkspawns.spawns": "Gerações",
-  "cobblemon.command.checkspawns.nothing": "Nada pode gerar aqui neste momento."
+  "cobblemon.command.checkspawns.nothing": "Nada pode gerar aqui neste momento.",
+  "cobblemon.interaction.ev.add": "Os EVs de %2$s do(a) %1$s aumentaram por %3$s!",
+  "cobblemon.interaction.ev.deduct": "Os EVs de %2$s do(a) %1$s diminuíram por %3$s!",
+  "cobblemon.interaction.pp.restore": "Tu restauraste o PP de %1$s.",
+  "cobblemon.interaction.friendsip.add": "%1$s aproxima-se de ti!",
+  "cobblemon.interaction.status.cure": "%1$s foi curado(a) da sua condição de estado!",
+  "cobblemon.interaction.hp.heal": "%1$s restaurou um pouco do seu HP!",
+  "tag.item.cobblemon.apricorn_logs": "Troncos de Bolotas",
+  "tag.item.cobblemon.apricorn_sprouts": "Brotos de Bolotas",
+  "tag.item.cobblemon.apricorns": "Bolotas",
+  "tag.item.cobblemon.azalea_tree": "Árvores de Azálea",
+  "tag.item.cobblemon.berries": "Bagas",
+  "tag.item.cobblemon.cobblemon_seeds": "Sementes",
+  "tag.item.cobblemon.evolution_items": "Itens de Evolução",
+  "tag.item.cobblemon.evolution_stones": "Pedras de Evolução",
+  "tag.item.cobblemon.experience_candies": "Doces de Experiência",
+  "tag.item.cobblemon.held.destiny_knot": "Nós do Destino",
+  "tag.item.cobblemon.held.everstone": "Pedras Eternas",
+  "tag.item.cobblemon.held.experience_share": "Partilhas de Experiência",
+  "tag.item.cobblemon.held.is_held_item": "Equipamentos",
+  "tag.item.cobblemon.held.lucky_egg": "Ovos sortudos",
+  "tag.item.cobblemon.held.power_anklet": "Tornozeleiras do Poder",
+  "tag.item.cobblemon.held.power_band": "Bandas do Poder",
+  "tag.item.cobblemon.held.power_belt": "Cinturões do Poder",
+  "tag.item.cobblemon.held.power_bracer": "Braçadeiras do Poder",
+  "tag.item.cobblemon.held.power_lens": "Lentes do Poder",
+  "tag.item.cobblemon.held.power_weight": "Pesos do Poder",
+  "tag.item.cobblemon.herbs": "Ervas",
+  "tag.item.cobblemon.mint_leaf": "Folhas de Hortelã",
+  "tag.item.cobblemon.mints": "Hortelãs",
+  "tag.item.cobblemon.mutated_berries": "Bagas de Mutação",
+  "tag.item.cobblemon.plants": "Plantas",
+  "tag.item.cobblemon.poke_balls": "Poké Bolas",
+  "tag.item.cobblemon.protein_ingredients": "Ingredientes de Proteína",
+  "tag.item.cobblemon.zinc_ingredients": "Ingredientes de Zinco",
+  "tag.item.cobblemon.seeds": "Sementes"
 }
@@ -1,5 +1,4 @@
 {
-  "itemGroup.cobblemon.pokeball": "มอนสเตอร์บอล",
  "item.cobblemon.poke_ball": "มอนสเตอร์บอล",
  "item.cobblemon.slate_ball": "สเลทบอล",
  "item.cobblemon.azure_ball": "อาซัวร์บอล",
@@ -32,13 +31,13 @@
  "item.cobblemon.park_ball": "พาร์คบอล",
  "item.cobblemon.dream_ball": "ดรีมบอล",
  "item.cobblemon.beast_ball": "อัลตร้าบอล",
-  "item.cobblemon.black_apricorn_seed": "เมล็ดบงงุริสีดำ",
-  "item.cobblemon.blue_apricorn_seed": "เมล็ดบงงุริสีฟ้า",
-  "item.cobblemon.green_apricorn_seed": "เมล็ดบงงุริสีเขียว",
-  "item.cobblemon.pink_apricorn_seed": "เมล็ดบงงุริสีชมพู",
-  "item.cobblemon.red_apricorn_seed": "เมล็ดบงงุริสีแดง",
-  "item.cobblemon.white_apricorn_seed": "เมล็ดบงงุริสีขาว",
-  "item.cobblemon.yellow_apricorn_seed": "เมล็ดบงงุริสีเหลือง",
+  "item.cobblemon.black_apricorn_seed": "ต้นกล้าบงงุริสีดำ",
+  "item.cobblemon.blue_apricorn_seed": "ต้นกล้าบงงุริสีฟ้า",
+  "item.cobblemon.green_apricorn_seed": "ต้นกล้าบงงุริสีเขียว",
+  "item.cobblemon.pink_apricorn_seed": "ต้นกล้าบงงุริสีชมพู",
+  "item.cobblemon.red_apricorn_seed": "ต้นกล้าบงงุริสีแดง",
+  "item.cobblemon.white_apricorn_seed": "ต้นกล้าบงงุริสีขาว",
+  "item.cobblemon.yellow_apricorn_seed": "ต้นกล้าบงงุริสีเหลือง",
  "item.cobblemon.black_apricorn": "บงงุริสีดำ",
  "item.cobblemon.blue_apricorn": "บงงุริสีฟ้า",
  "item.cobblemon.green_apricorn": "บงงุริสีเขียว",
@@ -46,7 +45,8 @@
  "item.cobblemon.red_apricorn": "บงงุริสีแดง",
  "item.cobblemon.white_apricorn": "บงงุริสีขาว",
  "item.cobblemon.yellow_apricorn": "บงงุริสีเหลือง",
-  "itemGroup.cobblemon.evolution_item": "ไอเทมวิวัฒนาการ",
+  "item.cobblemon.vivichoke_seeds": "เมล็ดดอกตูมแห่งพลัง",
+  "item.cobblemon.vivichoke": "ดอกตูมแห่งพลัง",
  "item.cobblemon.link_cable": "สายลิงค์",
  "item.cobblemon.dragon_scale": "เกล็ดมังกร",
  "item.cobblemon.kings_rock": "สัญลักษณ์แห่งราชา",
@@ -88,7 +88,6 @@
  "item.cobblemon.sun_stone": "หินพระอาทิตย์",
  "item.cobblemon.thunder_stone": "หินสายฟ้า",
  "item.cobblemon.water_stone": "หินน้ำ",
-  "itemGroup.cobblemon.medicine": "ยา",
  "item.cobblemon.rare_candy": "ลูกอมประหลาด",
  "item.cobblemon.exp_candy_xs": "ลูกอมประสบการณ์ XS",
  "item.cobblemon.exp_candy_s": "ลูกอมประสบการณ์ S",
@@ -101,10 +100,47 @@
  "item.cobblemon.iron": "ธาตุเหล็ก",
  "item.cobblemon.protein": "โปรตีน",
  "item.cobblemon.zinc": "ซิงค์",
-  "itemGroup.cobblemon.held_item": "ไอเทมที่ถือ",
+  "item.cobblemon.potion": "ยารักษาแผล",
+  "item.cobblemon.super_potion": "ยารักษาแผลอย่างดี",
+  "item.cobblemon.hyper_potion": "ยารักษาแผลชั้นยอด",
+  "item.cobblemon.max_potion": "ยาฟื้นพลังกายเต็มถัง",
+  "item.cobblemon.full_restore": "ยาฟื้นฟูร่างกายอย่างครบถ้วน",
+  "item.cobblemon.red_mint_leaf": "ใบมินต์สีแดง",
+  "item.cobblemon.red_mint_leaf.tooltip": "สามารถมีอิทธิพลต่อค่าพลังโจมตีของโปเกมอน",
+  "item.cobblemon.blue_mint_leaf": "ใบมินต์สีน้ำเงิน",
+  "item.cobblemon.blue_mint_leaf.tooltip": "สามารถมีอิทธิพลต่อค่าพลังป้องกันของโปเกมอน",
+  "item.cobblemon.cyan_mint_leaf": "ใบมินต์สีฟ้า",
+  "item.cobblemon.cyan_mint_leaf.tooltip": "สามารถมีอิทธิพลต่อค่าพลังโจมตีพิเศษของโปเกมอน",
+  "item.cobblemon.pink_mint_leaf": "ใบมินต์สีชมพู",
+  "item.cobblemon.pink_mint_leaf.tooltip": "สามารถมีอิทธิพลต่อค่าพลังป้องกันพิเศษของโปเกมอน",
+  "item.cobblemon.green_mint_leaf": "ใบมินต์สีเขียว",
+  "item.cobblemon.green_mint_leaf.tooltip": "สามารถมีอิทธิพลต่อค่าความเร็วของโปเกมอน",
+  "item.cobblemon.white_mint_leaf": "ใบมินต์สีขาว",
+  "item.cobblemon.white_mint_leaf.tooltip": "สามารถให้นิสัยของโปเกมอนไม่เพิ่มและลดค่าพลังได้",
+  "item.cobblemon.lonely_mint": "ใบมินต์โดดเดี่ยว",
+  "item.cobblemon.adamant_mint": "ใบมินต์ดื้อดึง",
+  "item.cobblemon.naughty_mint": "ใบมินต์ซุกซน",
+  "item.cobblemon.brave_mint": "ใบมินต์กล้าหาญ",
+  "item.cobblemon.bold_mint": "ใบมินต์ใจกล้า",
+  "item.cobblemon.impish_mint": "ใบมินต์ขี้เล่น",
+  "item.cobblemon.lax_mint": "ใบมินต์เหลวไหล",
+  "item.cobblemon.relaxed_mint": "ใบมินต์ไม่รีบร้อน",
+  "item.cobblemon.modest_mint": "ใบมินต์ถ่อมตัว",
+  "item.cobblemon.mild_mint": "ใบมินต์อ่อนโยน",
+  "item.cobblemon.rash_mint": "ใบมินต์เผอเรอ",
+  "item.cobblemon.quiet_mint": "ใบมินต์เงียบ",
+  "item.cobblemon.calm_mint": "ใบมินต์ใจเย็น",
+  "item.cobblemon.gentle_mint": "ใบมินต์เรียบร้อย",
+  "item.cobblemon.careful_mint": "ใบมินต์รอบคอบ",
+  "item.cobblemon.sassy_mint": "ใบมินต์หยาบคาย",
+  "item.cobblemon.timid_mint": "ใบมินต์ขี้ขลาด",
+  "item.cobblemon.hasty_mint": "ใบมินต์ใจร้อน",
+  "item.cobblemon.jolly_mint": "ใบมินต์ร่าเริง",
+  "item.cobblemon.naive_mint": "ใบมินต์ซื่อ ๆ",
+  "item.cobblemon.serious_mint": "ใบมินต์จริงจัง",
  "item.cobblemon.assault_vest": "เสื้อเกราะกันการโจมตี",
  "item.cobblemon.auspicious_armor": "เกราะศักดิ์สิทธิ์",
-  "item.cobblemon.big_root": "รากใหญ่",
+  "item.cobblemon.malicious_armor": "เกราะต้องสาป",
  "item.cobblemon.black_belt": "สายดำ",
  "item.cobblemon.black_glasses": "แว่นตาดำ",
  "item.cobblemon.black_sludge": "สลัดจ์ดำ",
@@ -138,6 +174,21 @@
  "item.cobblemon.spell_tag": "ยันต์คำสาป",
  "item.cobblemon.twisted_spoon": "ช้อนบิดเบี้ยว",
  "item.cobblemon.wise_glasses": "แว่นผู้รอบรู้",
+  "item.cobblemon.mental_herb": "สมุนไพรทางจิต",
+  "item.cobblemon.mirror_herb": "สมุนไพรแห่งการคัดลอก",
+  "item.cobblemon.power_herb": "สมุนไพรอันทรงพลัง",
+  "item.cobblemon.white_herb": "สมุนไพรสีขาว",
+  "item.cobblemon.bright_powder": "ผงเบาบาง",
+  "item.cobblemon.metal_powder": "เมทเทิลเพาเดอร์",
+  "item.cobblemon.quick_powder": "สปีดเพาเดอร์",
+  "item.cobblemon.destiny_knot": "ด้ายแดง",
+  "item.cobblemon.everstone": "หินที่ไม่เปลี่ยนแปลง",
+  "item.cobblemon.power_anklet": "พาวเวอร์แองเกิ้ล",
+  "item.cobblemon.power_band": "พาวเวอร์แบนด์",
+  "item.cobblemon.power_belt": "พาวเวอร์เบลท์",
+  "item.cobblemon.power_bracer": "พาวเวอร์ริสท์",
+  "item.cobblemon.power_lens": "พาวเวอร์เลนส์",
+  "item.cobblemon.power_weight": "พาวเวอร์เวท",
  "item.cobblemon.poke_ball.tooltip": "มีอัตราการจับ 1x",
  "item.cobblemon.slate_ball.tooltip": "มีอัตราการจับ 1x",
  "item.cobblemon.azure_ball.tooltip": "มีอัตราการจับ 1x",
@@ -170,6 +221,56 @@
  "item.cobblemon.park_ball.tooltip": "มีอัตราการจับ 2.5x หากจับโปเกมอนที่ไบโอมป่า หรือที่ราบทุกชนิด",
  "item.cobblemon.dream_ball.tooltip": "มีอัตราการจับ 4x หากจับโปเกมอนที่หลับอยู่",
  "item.cobblemon.beast_ball.tooltip": "มีอัตราการจับ 5x หากจับอัลตร้าบีสต์ แต่ถ้าจับอย่างอื่นมีอัตราการจับ 0.1x",
+  "item.cobblemon.mulch_base": "ปุ๋ย",
+  "item.cobblemon.coarse_mulch": "ปุ๋ยหยาบ",
+  "item.cobblemon.growth_mulch": "ปุ๋ยเร่งโต",
+  "item.cobblemon.humid_mulch": "ปุ๋ยชื้น",
+  "item.cobblemon.loamy_mulch": "ปุ๋ยดินร่วน",
+  "item.cobblemon.peat_mulch": "ปุ๋ยพีต",
+  "item.cobblemon.rich_mulch": "ปุ๋ยที่อุดมสมบูรณ์",
+  "item.cobblemon.sandy_mulch": "ปุ๋ยทราย",
+  "item.cobblemon.surprise_mulch": "ปุ๋ยอัศจรรย์",
+  "item.cobblemon.medicinal_leek": "พืชสมุนไพร",
+  "item.cobblemon.energy_root": "รากพลังงาน",
+  "item.cobblemon.revival_herb": "สมุนไพรคืนชีพ",
+  "item.cobblemon.roasted_leek": "ต้นหอมคั่ว",
+  "item.cobblemon.leek_and_potato_stew": "สตูว์มันฝรั่งกับต้นหอม",
+  "item.cobblemon.braised_vivichoke": "ดอกตูมแห่งพลังตุ๋น",
+  "item.cobblemon.vivichoke_dip": "ดอกตูมแห่งพลังจุ่ม",
+  "item.cobblemon.berry_juice": "น้ำเบอร์รี่",
+  "item.cobblemon.remedy": "ยาคัมโป",
+  "item.cobblemon.fine_remedy": "ยาคัมโปที่ดี",
+  "item.cobblemon.superb_remedy": "ยาคัมโปที่สุดยอด",
+  "item.cobblemon.heal_powder": "ผงรักษาทุกอย่าง",
+  "item.cobblemon.medicinal_brew": "ยาชง",
+  "item.cobblemon.revive": "ยาคืนชีพ",
+  "item.cobblemon.max_revive": "ยาคืนชีพชั้นยอด",
+  "item.cobblemon.pp_up": "พอยต์อัพ",
+  "item.cobblemon.pp_max": "พอยต์แมกซ์",
+  "item.cobblemon.x_attack": "เพิ่มพลังโจมตี",
+  "item.cobblemon.x_defence": "เพิ่มพลังป้องกัน",
+  "item.cobblemon.x_accuracy": "เพิ่มความแม่นยำ",
+  "item.cobblemon.x_speed": "เพิ่มความเร็ว",
+  "item.cobblemon.x_special_defence": "เพิ่มพลังป้องกันพิเศษ",
+  "item.cobblemon.x_special_attack": "เพิ่มพลังโจมตีพิเศษ",
+  "item.cobblemon.dire_hit": "คริติคัต",
+  "item.cobblemon.guard_spec": "เอฟเฟกต์การ์ด",
+  "item.cobblemon.full_heal": "ยารักษาทุกอาการ",
+  "item.cobblemon.antidote": "ยาแก้พิษ",
+  "item.cobblemon.awakening": "ยาตื่นนอน",
+  "item.cobblemon.burn_heal": "ยาดับไหม้",
+  "item.cobblemon.ice_heal": "ยาละลายน้ำแข็ง",
+  "item.cobblemon.paralyze_heal": "ยาแก้ชา",
+  "item.cobblemon.ether": "PP เอด",
+  "item.cobblemon.max_ether": "PP รีคัฟเวอร์",
+  "item.cobblemon.elixir": "PP เอดเดอร์",
+  "item.cobblemon.max_elixir": "PP แมกซ์",
+  "itemGroup.cobblemon.blocks": "บล็อค",
+  "itemGroup.cobblemon.pokeball": "มอนสเตอร์บอล",
+  "itemGroup.cobblemon.agriculture": "เกษตรกรรม",
+  "itemGroup.cobblemon.consumables": "ไอเทมใช้งาน",
+  "itemGroup.cobblemon.held_item": "ไอเทมที่ถือ",
+  "itemGroup.cobblemon.evolution_item": "ไอเทมวิวัฒนาการ",
  "block.cobblemon.apricorn_log": "ท่อนไม้บงงุริ",
  "block.cobblemon.stripped_apricorn_log": "ท่อนไม้บงงุริลอกเปลือก",
  "block.cobblemon.apricorn_wood": "ไม้บงงุริ",
@@ -183,6 +284,7 @@
  "block.cobblemon.apricorn_button": "ปุ่มไม้บงงุริ",
  "block.cobblemon.apricorn_slab": "แผ่นไม้บงงุริ",
  "block.cobblemon.apricorn_fence_gate": "ประตูรั้วไม้บงงุริ",
+  "block.cobblemon.big_root": "รากใหญ่",
  "block.cobblemon.black_apricorn_sapling": "ต้นอ่อนไม้บงงุริผลสีดำ",
  "block.cobblemon.blue_apricorn_sapling": "ต้นอ่อนไม้บงงุริผลสีฟ้า",
  "block.cobblemon.green_apricorn_sapling": "ต้นอ่อนไม้บงงุริผลสีเขียว",
@@ -196,12 +298,24 @@
  "block.cobblemon.healing_machine.tooltip1": "ต้องชาร์จหลังวางบล็อก",
  "block.cobblemon.healing_machine.tooltip2": "ชาร์จต่อเนื่อง",
  "block.cobblemon.pc": "พีซี",
+  "block.cobblemon.red_mint": "เมล็ดมินต์สีแดง",
+  "block.cobblemon.blue_mint": "เมล็ดมินต์สีน้ำเงิน",
+  "block.cobblemon.cyan_mint": "เมล็ดมินต์สีฟ้า",
+  "block.cobblemon.pink_mint": "เมล็ดมินต์สีชมพู",
+  "block.cobblemon.green_mint": "เมล็ดมินต์สีเขียว",
+  "block.cobblemon.white_mint": "เมล็ดมินต์สีขาว",
+  "block.cobblemon.vivichoke_seeds": "เมล็ดดอกตูมแห่งพลัง",
+  "block.cobblemon.pep_up_flower": "ดอก PP",
+  "block.cobblemon.potted_pep_up_flower": "กระถางดอก PP",
  "cobblemon.overflow_no_pc": "ปาร์ตี้โปเกมอนของคุณเต็มแล้ว และคุณยังไม่มีพีซี!",
  "cobblemon.overflow_no_space": "ปาร์ตี้โปเกมอนของคุณเต็มแล้ว และ%1$sเต็มเช่นกัน!",
  "cobblemon.overflow_to_pc": "ปาร์ตี้โปเกมอนของคุณเต็มแล้ว! ทำให้%1$sถูกเพิ่มใน%2$s",
  "cobblemon.your_pc": "พีซีของคุณ",
-  "cobblemon.command.pokespawn.invalid-pokemon": "ชื่อโปเกมอนผิด",
+  "cobblemon.command.pokespawn.invalid-pokemon": "ชื่อโปเกมอนไม่ถูกต้อง",
  "cobblemon.command.pokespawn.invalid-move": "ชื่อท่าผิด",
+  "cobblemon.command.clearparty.nonethere": "ไม่มีโปเกมอนในปาร์ตี้ของ%1$s",
+  "cobblemon.command.clearparty.cleared": "เคลียร์ปาร์ตี้ของ%1$sแล้ว",
+  "cobblemon.command.clearpc.cleared": "เคลียร์พีซีของ%1$sแล้ว",
  "cobblemon.ui.generic.yes": "ใช่",
  "cobblemon.ui.generic.no": "ไม่ใช่",
  "cobblemon.ui.pokenav.title": "โปเกเนวิ",
@@ -211,6 +325,8 @@
  "cobblemon.ui.starter.alreadyselected": "คุณได้เลือกโปเกมอนเริ่มต้นแล้ว!",
  "cobblemon.ui.starter.cannotchoose": "ตอนนี้คุณไม่สามารถเลือกโปเกมอนเริ่มต้นได้",
  "cobblemon.ui.starter.hasalreadychosen": "%1$s ได้เลือกโปเกมอนเริ่มต้นแล้ว",
+  "cobblemon.ui.starter.choose_starter_title": "เลือกโปเกมอนเริ่มต้นของคุณ!",
+  "cobblemon.ui.starter.choose_starter_description": "กดปุ่ม \"%1$s\"",
  "cobblemon.ui.starter.chooseyourstarter": "กด %1$s เพื่อเลือกโปเกมอนเริ่มต้นและเริ่มการผจญภัยของคุณเลย",
  "cobblemon.ui.moves": "ท่า",
  "cobblemon.ui.moves.switch": "สลับท่า",
@@ -237,6 +353,12 @@
  "cobblemon.ui.info.ability": "ความสามารถ",
  "cobblemon.ui.info.experience_points": "ค่าประสบการณ์",
  "cobblemon.ui.info.to_next_level": "เลเวลถัดไป",
+  "cobblemon.ui.trade": "แลกเปลี่ยน",
+  "cobblemon.trade.occupied": "%1$sไม่ว่าง",
+  "cobblemon.trade.request_expired": "คำขอแลกเปลี่ยนกับ%1$sได้หมดเวลาลงแล้ว",
+  "cobblemon.trade.request_already_expired": "คำขอแลกเปลี่ยนของพวกเขาได้หมดเวลาลงแล้ว",
+  "cobblemon.trade.request_sent": "เสนอการแลกเปลี่ยนกับ%1$s",
+  "cobblemon.trade.offer": "%1$sได้เสนอการแลกเปลี่ยนโปเกมอนกับคุณ",
  "cobblemon.ui.party": "ปาร์ตี้",
  "cobblemon.ui.power": "พลัง",
  "cobblemon.ui.accuracy": "ความแม่นยำ",
@@ -245,6 +367,10 @@
  "cobblemon.ui.exit": "ออก",
  "cobblemon.ui.pc.box.title": "กล่อง %1$s",
  "cobblemon.ui.pc.release": "ปล่อย",
+  "cobblemon.ui.pasture": "ทุ่งเลี้ยงสัตว์",
+  "cobblemon.ui.pasture.recall_all": "เรียกรวมทั้งหมด",
+  "cobblemon.ui.pasture.owned_name": "%1$s (%2$s)",
+  "cobblemon.pasture.too_many_nearby": "มีโปเกมอนมากเกินไปในบริเวณใกล้เคียง",
  "key.cobblemon.upshiftparty": "เลื่อนปาร์ตี้ขึ้น",
  "key.cobblemon.downshiftparty": "เลื่อนปาร์ตี้ลง",
  "key.cobblemon.hideparty": "ซ่อนโอเวอร์เลย์ปาร์ตี้",
@@ -291,9 +417,150 @@
  "cobblemon.label.lv": "Lv. %1$s",
  "cobblemon.challenge_label": "กด %1$s เพื่อต่อสู้",
  "cobblemon.challenge.sender": "คุณได้ท้าดวล %1$s!",
-  "cobblemon.challenge.receiver": "%1$s ได้ท้าดวลคุณ! มองผู้ท้าดวลแล้วกด %2$s เพื่อต่อสู้",
+  "cobblemon.challenge.receiver": "%1$sได้ท้าดวลคุณในการต่อสู้โปเกมอน!",
  "cobblemon.drop.item.inventory": "คุณได้รับ%2$s (%1$sx)",
  "cobblemon.drop.item.full": "ช่องเก็บของของคุณเต็มแล้ว ทำให้%1$sจึงตกลงบนพื้น",
+  "cobblemon.mint.interact": "ค่าพลังของ%1$sได้เปลี่ยนไป!",
+  "cobblemon.mint.same_nature": "ดูเหมือนค่าพลังของ%1$sจะไม่มีผลจาก%2$s",
+  "itemGroup.cobblemon.plants": "พืช",
+  "item.cobblemon.aguav_berry": "ผลบังจี",
+  "item.cobblemon.aguav_berry.tooltip": "ฟื้นฟู 1/3 จาก HP เต็ม เมื่อ HP เหลือ 1/4 หรือน้อยกว่า ถ้าผู้กินมีนิสัยที่ลดพลังป้องกันพิเศษ จะทำให้ผู้กินสับสนตัวเอง",
+  "item.cobblemon.apicot_berry": "ผลซูอา",
+  "item.cobblemon.apicot_berry.tooltip": "เพิ่มพลังป้องกันพิเศษของผู้ถือ 1 ระดับ เมื่อ HP ของผู้ถือเหลือ 1/4 หรือน้อยกว่า",
+  "item.cobblemon.aspear_berry": "ผลนานาชิ",
+  "item.cobblemon.aspear_berry.tooltip": "รักษาผู้ถือจากการถูกแช่แข็ง",
+  "item.cobblemon.babiri_berry": "ผลลิลิวา",
+  "item.cobblemon.babiri_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทโลหะที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
+  "item.cobblemon.belue_berry": "ผลเบลิบุ",
+  "item.cobblemon.belue_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.bluk_berry": "ผลแบลร์",
+  "item.cobblemon.bluk_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.charti_berry": "ผลโยโรกิ",
+  "item.cobblemon.charti_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทหินที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
+  "item.cobblemon.cheri_berry": "ผลคุราโบะ",
+  "item.cobblemon.cheri_berry.tooltip": "รักษาผู้ถือจากอาการชา",
+  "item.cobblemon.chesto_berry": "ผลคาโกะ",
+  "item.cobblemon.chesto_berry.tooltip": "ปลุกผู้ถือให้ตื่นนอน",
+  "item.cobblemon.chilan_berry": "ผลโฮซึ",
+  "item.cobblemon.chilan_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทปกติครึ่งหนึ่ง",
+  "item.cobblemon.chople_berry": "ผลโยปู",
+  "item.cobblemon.chople_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทต่อสู้ที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
+  "item.cobblemon.coba_berry": "ผลบาโก้",
+  "item.cobblemon.coba_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทบินที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
+  "item.cobblemon.colbur_berry": "ผลนาโม",
+  "item.cobblemon.colbur_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทความมืดที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
+  "item.cobblemon.cornn_berry": "ผลโมโคชิ",
+  "item.cobblemon.cornn_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.custap_berry": "ผลไอบัน",
+  "item.cobblemon.custap_berry.tooltip": "ผู้ถือใช้ท่าก่อนโปเกมอนตัวอื่น เมื่อ HP เหลือ 1/4 หรือน้อยกว่า",
+  "item.cobblemon.durin_berry": "ผลโดริ",
+  "item.cobblemon.durin_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.enigma_berry": "ผลนาโซ",
+  "item.cobblemon.enigma_berry.tooltip": "ถ้าผู้ถือถูกโจมตีโดยท่าที่ได้ผลดีเยี่ยม จะฟื้นฟู HP 1/4 จาก HP เต็มของผู้ถือ",
+  "item.cobblemon.figy_berry": "ผลฟิร่า",
+  "item.cobblemon.figy_berry.tooltip": "ฟื้นฟู 1/3 จาก HP เต็ม เมื่อ HP เหลือ 1/4 หรือน้อยกว่า ถ้าผู้กินมีนิสัยที่ลดพลังโจมตี จะทำให้ผู้กินสับสนตัวเอง",
+  "item.cobblemon.ganlon_berry": "ผลริวกะ",
+  "item.cobblemon.ganlon_berry.tooltip": "เพิ่มพลังป้องกันของผู้ถือ 1 ระดับ เมื่อ HP ของผู้ถือเหลือ 1/4 หรือน้อยกว่า",
+  "item.cobblemon.grepa_berry": "ผลยูบุ",
+  "item.cobblemon.grepa_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.haban_berry": "ผลฮาวาน",
+  "item.cobblemon.haban_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทมังกรที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
+  "item.cobblemon.hondew_berry": "ผลโลเม",
+  "item.cobblemon.hondew_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.hopo_berry": "ผลโพฟุ",
+  "item.cobblemon.hopo_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.iapapa_berry": "ผลเอีย",
+  "item.cobblemon.iapapa_berry.tooltip": "ฟื้นฟู 1/3 จาก HP เต็ม เมื่อ HP เหลือ 1/4 หรือน้อยกว่า ถ้าผู้กินมีนิสัยที่ลดพลังป้องกัน จะทำให้ผู้กินสับสนตัวเอง",
+  "item.cobblemon.jaboca_berry": "ผลจาโป",
+  "item.cobblemon.jaboca_berry.tooltip": "หากผู้ถือโดนโจมตีด้วยท่ากายภาพ ผู้โจมตีสูญเสีย HP 1/8 จาก HP เต็ม",
+  "item.cobblemon.kasib_berry": "ผลคาซิบุ",
+  "item.cobblemon.kasib_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทผีที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
+  "item.cobblemon.kebia_berry": "ผลเบีย",
+  "item.cobblemon.kebia_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทพิษที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
+  "item.cobblemon.kee_berry": "ผลอากิ",
+  "item.cobblemon.kee_berry.tooltip": "เพิ่มพลังป้องกันของผู้ถือ 1 ระดับ เมื่อถูกโจมตีด้วยท่ากายภาพ",
+  "item.cobblemon.kelpsy_berry": "ผลเนโคบุ",
+  "item.cobblemon.kelpsy_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.lansat_berry": "ผลซาน",
+  "item.cobblemon.lansat_berry.tooltip": "ผู้ถือได้รับเอฟเฟกต์ท่าสะสมพลัง เมื่อเหลือ HP 1/4 หรือน้อยกว่า",
+  "item.cobblemon.leppa_berry": "ผลฮิเมริ",
+  "item.cobblemon.leppa_berry.tooltip": "ฟื้นฟู 10 PP เมื่อท่าหนึ่งท่าใดของผู้ถือเหลือ PP เท่ากับ 0",
+  "item.cobblemon.liechi_berry": "ผลชีรา",
+  "item.cobblemon.liechi_berry.tooltip": "เพิ่มพลังโจมตีของผู้ถือ 1 ระดับ เมื่อ HP ของผู้ถือเหลือ 1/4 หรือน้อยกว่า",
+  "item.cobblemon.lum_berry": "ผลลัม",
+  "item.cobblemon.lum_berry.tooltip": "รักษาผู้ถือจากสภาวะผิดปกติ หรือการสับสนตัวเอง",
+  "item.cobblemon.mago_berry": "ผลมาโก",
+  "item.cobblemon.mago_berry.tooltip": "ฟื้นฟู 1/3 จาก HP เต็ม เมื่อ HP เหลือ 1/4 หรือน้อยกว่า ถ้าผู้กินมีนิสัยที่ลดความเร็ว จะทำให้ผู้กินสับสนตัวเอง",
+  "item.cobblemon.magost_berry": "ผลโกสุ",
+  "item.cobblemon.magost_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.maranga_berry": "ผลธาราปู",
+  "item.cobblemon.maranga_berry.tooltip": "เพิ่มพลังป้องกันพิเศษของผู้ถือ 1 ระดับ เมื่อถูกโจมตีด้วยท่าหมวดพิเศษ",
+  "item.cobblemon.micle_berry": "ผลมิคุรุ",
+  "item.cobblemon.micle_berry.tooltip": "ท่าต่อไปของผู้ถือมีความแม่นยำ 1.2x เมื่อเหลือ HP 1/4 หรือน้อยกว่า",
+  "item.cobblemon.nanab_berry": "ผลนานา",
+  "item.cobblemon.nanab_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.touga_berry": "ผลโทก้า",
+  "item.cobblemon.touga_berry.tooltip": "รักษาผู้ถือจากการสับสนตัวเอง",
+  "item.cobblemon.nomel_berry": "ผลโนเมล",
+  "item.cobblemon.nomel_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.occa_berry": "ผลอ็อกก้า",
+  "item.cobblemon.occa_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทไฟที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
+  "item.cobblemon.oran_berry": "ผลโอรัน",
+  "item.cobblemon.oran_berry.tooltip": "ฟื้นฟู 10 HP เมื่อ HP เหลือ 1/2 หรือน้อยกว่า",
+  "item.cobblemon.pamtre_berry": "ผลชิยะ",
+  "item.cobblemon.pamtre_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.passho_berry": "ผลอิโตเกะ",
+  "item.cobblemon.passho_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทน้ำที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
+  "item.cobblemon.payapa_berry": "ผลอูตัน",
+  "item.cobblemon.payapa_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทพลังจิตที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
+  "item.cobblemon.pecha_berry": "ผลโมมอน",
+  "item.cobblemon.pecha_berry.tooltip": "รักษาผู้ถือจากการติดพิษ",
+  "item.cobblemon.persim_berry": "ผลคี",
+  "item.cobblemon.persim_berry.tooltip": "รักษาผู้ถือจากการสับสนตัวเอง",
+  "item.cobblemon.petaya_berry": "ผลยาตาปิ",
+  "item.cobblemon.petaya_berry.tooltip": "เพิ่มพลังโจมตีพิเศษของผู้ถือ 1 ระดับ เมื่อ HP ของผู้ถือเหลือ 1/4 หรือน้อยกว่า",
+  "item.cobblemon.pinap_berry": "ผลไพน์",
+  "item.cobblemon.pinap_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.pomeg_berry": "ผลซาโรคุ",
+  "item.cobblemon.pomeg_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.qualot_berry": "ผลทาโปรุ",
+  "item.cobblemon.qualot_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.rabuta_berry": "ผลราบูต้า",
+  "item.cobblemon.rabuta_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.rawst_berry": "ผลชิโก้",
+  "item.cobblemon.rawst_berry.tooltip": "รักษาผู้ถือจากการถูกเผาไหม้",
+  "item.cobblemon.razz_berry": "ผลราส",
+  "item.cobblemon.razz_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.rindo_berry": "ผลรินโด้",
+  "item.cobblemon.rindo_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทหญ้าที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
+  "item.cobblemon.roseli_berry": "ผลโรเซรุ",
+  "item.cobblemon.roseli_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทแฟรี่ที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
+  "item.cobblemon.rowap_berry": "ผลเล็มบู",
+  "item.cobblemon.rowap_berry.tooltip": "หากผู้ถือโดนโจมตีด้วยท่าหมวดพิเศษ ผู้โจมตีสูญเสีย HP 1/8 จาก HP เต็ม",
+  "item.cobblemon.salac_berry": "ผลคามูระ",
+  "item.cobblemon.salac_berry.tooltip": "เพิ่มความเร็วของผู้ถือ 1 ระดับ เมื่อ HP ของผู้ถือเหลือ 1/4 หรือน้อยกว่า",
+  "item.cobblemon.shuca_berry": "ผลชูก้า",
+  "item.cobblemon.shuca_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทดินที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
+  "item.cobblemon.sitrus_berry": "ผลโอบง",
+  "item.cobblemon.sitrus_berry.tooltip": "ฟื้นฟู 1/4 จาก HP เต็ม เมื่อ HP เหลือ 1/2 หรือน้อยกว่า",
+  "item.cobblemon.spelon_berry": "ผลโนวากิ",
+  "item.cobblemon.spelon_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.starf_berry": "ผลสตาร์",
+  "item.cobblemon.starf_berry.tooltip": "สุ่มเพิ่มค่าพลังของผู้ถือ 2 ระดับ เมื่อเหลือ HP 1/4 หรือน้อยกว่า",
+  "item.cobblemon.tamato_berry": "ผลมาโทมา",
+  "item.cobblemon.tamato_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.tanga_berry": "ผลแทงก้า",
+  "item.cobblemon.tanga_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทแมลงที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
+  "item.cobblemon.wacan_berry": "ผลโซคุโนะ",
+  "item.cobblemon.wacan_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทไฟฟ้าที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
+  "item.cobblemon.watmel_berry": "ผลไคซู",
+  "item.cobblemon.watmel_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.wepear_berry": "ผลเซชินะ",
+  "item.cobblemon.wepear_berry.tooltip": "ผู้ถือไม่สามารถกินผลไม้นี้ได้",
+  "item.cobblemon.wiki_berry": "ผลอุ้ย",
+  "item.cobblemon.wiki_berry.tooltip": "ฟื้นฟู 1/3 จาก HP เต็ม เมื่อ HP เหลือ 1/4 หรือน้อยกว่า ถ้าผู้กินมีนิสัยที่ลดพลังโจมตีพิเศษ จะทำให้ผู้กินสับสนตัวเอง",
+  "item.cobblemon.yache_berry": "ผลยาชิ",
+  "item.cobblemon.yache_berry.tooltip": "ลดแดเมจที่ได้รับจากการโจมตีประเภทน้ำแข็งที่ได้ผลดีเยี่ยมครึ่งหนึ่ง",
  "cobblemon.command.general.invalid-party-slot": "ไม่มีโปเกมอนในช่อง %1$s!",
  "cobblemon.command.givepokemon.give": "ให้%1$sกับ %2$s",
  "cobblemon.command.pokemonedit": "แก้ไข%2$sของ%1$s",
@@ -305,8 +572,19 @@
  "cobblemon.command.spawnpokemon.nospecies": "เกิดข้อผิดพลาด: คุณต้องใส่ชื่อโปเกมอนหรือ 'random'",
  "cobblemon.command.held_item": "%2$sของ%1$sถูกให้%3$sเพื่อถือ",
  "cobblemon.command.pokeheal.in_battle": "คุณไม่สามารถรักษาโปเกมอนในปาร์ตี้ขณะต่อสู้!",
+  "cobblemon.command.spawnpokemonfrompool": "%1$sได้เกิดในแอเรีย",
+  "cobblemon.command.spawnpokemonfrompool.unable_to_spawn": "ไม่สามารถทำให้เกิดโปเกมอนได้",
+  "cobblemon.command.pokebox.box_does_not_exist": "ผู้เล่นคนนั้นไม่มีกล่อง %1$s",
+  "cobblemon.command.pokebox.box_is_full": "กล่อง %1$s ของผู้เล่นคนนั้นเต็มแล้ว",
+  "cobblemon.command.pokebox.storage_is_full": "กล่องของผู้เล่นคนนั้นเต็มแล้ว",
+  "cobblemon.command.pokebox.last_pokemon": "ส่งโปเกมอนตัวสุดท้ายของผู้เล่นคนนั้นไปยังพีซีไม่ได้",
+  "cobblemon.command.pokemonrestart": "เคลียร์ปาร์ตี้และพีซีของ%1$sแล้ว",
  "advancements.cobblemon.root": "โลกของคอบเบิลมอน!",
  "advancements.cobblemon.root.description": "เลือกโปเกมอนเริ่มต้น และเริ่มการผจญภัยใหม่ของคุณ",
+  "advancements.cobblemon.obtain_leftovers": "ลด ใช้ซ้ำ รีไซเคิล!",
+  "advancements.cobblemon.obtain_leftovers.description": "เก็บอาหารเหลือหลังกินแอปเปิ้ล",
+  "advancements.cobblemon.any_plant": "ความอารีของพระแม่ธรรมชาติ",
+  "advancements.cobblemon.any_plant.description": "หวังว่าคุณเป็นคนมือเย็น!",
  "advancements.cobblemon.harvest_apricorn": "มันเป็นผลไม้หรือมันเป็นเกาลัด?",
  "advancements.cobblemon.harvest_apricorn.description": "คลิกขวาเพื่อเก็บเกี่ยวบงงุริที่โตเต็มที่",
  "advancements.cobblemon.harvest_apricorn_seed": "ทำส่วนของฉัน",
@@ -326,7 +604,7 @@
  "advancements.cobblemon.first_catch": "เพื่อนใหม่!",
  "advancements.cobblemon.first_catch.description": "ใช้มอนสเตอร์บอลและจับโปเกมอนตัวแรก",
  "advancements.cobblemon.full_party": "ฟูลเฮาส์",
-  "advancements.cobblemon.full_party.description": "จับโปเกมอนเพิ่มอีก 5 ตัวและทำให้ปาร์ตี้เต็ม",
+  "advancements.cobblemon.full_party.description": "จับโปเกมอนเพิ่ม และทำปาร์ตี้เต็ม 6",
  "advancements.cobblemon.first_evolution": "ทำงานหนักและความทุ่มเท",
  "advancements.cobblemon.first_evolution.description": "บรรลุข้อกำหนดการวิวัฒนาการของโปเกมอน และวิวัฒนาการโปเกมอนจากปาร์ตี้เมนู",
  "advancements.cobblemon.first_battle_victory": "เพลงชัยชนะของฉันอยู่ที่ไหน?",
@@ -335,6 +613,55 @@
  "advancements.cobblemon.first_shiny_catch.description": "จับโปเกมอนสีแตกต่างตัวแรก",
  "advancements.cobblemon.healing_machine": "พลังการรักษา",
  "advancements.cobblemon.healing_machine.description": "รอให้เครื่องรักษาโปเกมอนชาร์จเพียงพอ แล้วรักษาโปเกมอนในปาร์ตี้ของคุณ",
+  "advancements.cobblemon.obtain_leek": "มีสมุนไพรอยู่ในเรือ!",
+  "advancements.cobblemon.obtain_leek.description": "ได้รับพืชสมุนไพรซึ่งเป็นพืชป่าที่เติบโตในน้ำจืด",
+  "advancements.cobblemon.medicinal_brew": "เภสัชกรท้องถิ่น",
+  "advancements.cobblemon.medicinal_brew.description": "ปรุงพืชสมุนไพรเพื่อเป็นรากฐานในการใช้รักษาโปเกมอนของคุณ",
+  "advancements.cobblemon.brew_potion": "คุณไม่สามารถรับมือกับยารักษาแผลของฉัน",
+  "advancements.cobblemon.brew_potion.description": "ปรุงผลโอรันให้เป็นยาชงเพื่อสร้างยารักษาแผล",
+  "advancements.cobblemon.brew_full_restore": "ตัวเลือกของแชมป์เปี้ยน",
+  "advancements.cobblemon.brew_full_restore.description": "เดินตามแผนผังการปรุง และสร้างยาฟื้นฟูร่างกายอย่างครบถ้วนด้วยผลลัมกับยาฟื้นพลังกายเต็มถัง",
+  "advancements.cobblemon.brew_all": "งานหนักสองเท่ากับปัญหาสองเท่า",
+  "advancements.cobblemon.brew_all.description": "ปรุงไอเทมทุกไอเทมที่เป็นไปได้โดยใช้ยาชง",
+  "advancements.cobblemon.obtain_mint": "เฟรชมินต์",
+  "advancements.cobblemon.obtain_mint.description": "ได้รับมินต์นิสัยซึ่งเป็นพืชป่าที่เติบโตบนภูเขาสูง",
+  "advancements.cobblemon.obtain_all_mints": "บิ๊กคอมมิทมินต์",
+  "advancements.cobblemon.obtain_all_mints.description": "ได้รับมินต์นิสัยทุก 6 สี และเข้าถึงนิสัยโปเกมอนอันหลากหลาย",
+  "advancements.cobblemon.obtain_revival_herb": "สมุนไพรกับความกระตือรือร้นของคุณ",
+  "advancements.cobblemon.obtain_revival_herb.description": "ได้รับสมุนไพรคืนชีพซึ่งเป็นพืชป่าที่เติบโตในถ้ำเขียวชอุ่ม",
+  "advancements.cobblemon.use_revive": "มีชีวิตอยู่เพื่อสู้ในวันต่อไป!",
+  "advancements.cobblemon.use_revive.description": "ใช้ยาคืนชีพ ยาคืนชีพชั้นยอดหรือสมุนไพรคืนชีพเพื่อให้โปเกมอนที่หมดสติฟื้นขึ้นมา",
+  "advancements.cobblemon.obtain_big_root": "รากแห่งการรักษาขั้นพื้นฐาน",
+  "advancements.cobblemon.obtain_big_root.description": "ได้รับรากใหญ่ซึ่งเป็นพืชป่าที่เติบโตในถ้ำดินใกล้พื้นดิน",
+  "advancements.cobblemon.craft_remedy": "การรักษาขั้นพื้นฐาน",
+  "advancements.cobblemon.craft_remedy.description": "คราฟต์ยาคัมโปซึ่งเป็นไอเทมการรักษาในช่วงต้นเกมที่สามารถคราฟต์เป็นไอเทมการรักษาที่รักษาเพิ่มขึ้น",
+  "advancements.cobblemon.obtain_vivichoke": "โอคิโดคิ ดอกตูมแห่งพลัง",
+  "advancements.cobblemon.obtain_vivichoke.description": "ได้รับดอกตูมแห่งพลังที่โตมาจากเมล็ดดอกตูมแห่งพลังที่หายากอย่างแปลกประหลาด",
+  "advancements.cobblemon.obtain_berry": "ผลไม้แท้",
+  "advancements.cobblemon.obtain_berry.description": "ได้รับผลไม้ที่มีประโยชน์มากมายจากพืชป่าที่เติบโตบนพื้นดิน",
+  "advancements.cobblemon.obtain_mutated_berry": "ผลลัพธ์ที่ไม่คาดคิด",
+  "advancements.cobblemon.obtain_mutated_berry.description": "ปลูกต้นผลไม้ต่างชนิดติดกัน และเห็นการกลายพันธุ์ของผลไม้กับตา",
+  "advancements.cobblemon.obtain_all_berries": "อ๊ะ! ผลไม้ทั้งหมด!",
+  "advancements.cobblemon.obtain_all_berries.description": "ได้รับผลไม้ทุกชนิดในคอบเบิลมอนอย่างละ 1 ลูก",
+  "advancements.cobblemon.use_pasture": "เดินเตร่อย่างอิสระ: เปิดใช้งาน",
+  "advancements.cobblemon.use_pasture.description": "คราฟต์บล็อกทุ่งเลี้ยงสัตว์ และปล่อยให้เพื่อน ๆ ของคุณเดินเตร่",
+  "advancements.cobblemon.catch_all_vivillon": "ปีกที่มีลวดลาย",
+  "advancements.cobblemon.catch_all_vivillon.description": "ได้รับลวดลายทั้งหมดของวิวิญอง",
+  "advancements.cobblemon.evolve_veevees": "อีวุยอันทรงคุณค่า",
+  "advancements.cobblemon.evolve_veevees.description": "พัฒนาร่างอีวุยเป็น 8 ร่างที่แตกต่างกัน",
+  "advancements.cobblemon.evolve_shedinja": "ผีในเปลือกแมลง",
+  "advancements.cobblemon.evolve_shedinja.description": "มีมอนสเตอร์บอลเหลืออยู่ในช่องเก็บของของคุณ และได้รับนูเคนิน",
+  "advancements.cobblemon.trade_pokemon": "ขอให้ดูแลอย่างดี!",
+  "advancements.cobblemon.trade_pokemon.description": "แลกเปลี่ยนโปเกมอนกับเทรนเนอร์คนอื่น",
+  "advancements.cobblemon.trade_shelmet_karrablast": "ฉันต้องการแจ้งความเรื่องการขโมยของ!",
+  "advancements.cobblemon.trade_shelmet_karrablast.description": "แลกเปลี่ยนโชโบมากิกับคาบูรูโมะ",
+  "advancements.cobblemon.max_level_baby": "ดาร์วิน? นั่นคือใคร?",
+  "advancements.cobblemon.max_level_baby.description": "เอาโปเกมอนร่างพื้นฐานที่สามารถวิวัฒนาการได้อัพเลเวลให้ถึง 100",
+  "advancements.cobblemon.use_candy": "ฟันหวาน",
+  "advancements.cobblemon.use_candy.description": "ใช้ลูกอมประสบการณ์ให้โปเกมอนกิน",
+  "advancements.cobblemon.own_zangoose_seviper": "พันธมิตรที่ทรยศ",
+  "advancements.cobblemon.own_zangoose_seviper.description": "มีแซงกูสและฮาบูเนคอยู่ในปาร์ตี้ของคุณพร้อมกัน",
+  "cobblemon.battle.crash": "เกิดข้อผิดพลาดในการต่อสู้ ถ้าเล่นแบบผู้เล่นคนเดียว ให้รายงานข้อผิดพลาดนี้กับทีมม็อด ถ้าอย่างอื่นให้รายงานข้อผิดพลาดนี้กับผู้ดูแลเซิร์ฟเวอร์",
  "cobblemon.battle.damage_dealt": "%1$sได้รับแดเมจ %2$s!",
  "cobblemon.battle.used_move": "%1$sใช้ท่า%2$s!",
  "cobblemon.battle.used_move_on": "%1$sใช้ท่า%2$sใส่%3$s!",
@@ -354,14 +681,19 @@
  "cobblemon.battle.crit": "การโจมตีนี้ติดคริติคอล!",
  "cobblemon.battle.nothing": "ไม่เกิดอะไรขึ้น",
  "cobblemon.battle.clearallboost": "รีเซ็ตการเปลี่ยนแปลงค่าพลัง",
+  "cobblemon.battle.clearallnegativeboost": "การเปลี่ยนแปลงค่าพลังที่เป็นลบของ%1$sได้หายไป!",
+  "cobblemon.battle.clearallnegativeboost.zeffect": "%1$sได้ค่าพลังที่ถูกลดกลับคืนมาเป็นปกติ หลังใช้พลัง-Z!",
  "cobblemon.battle.unboost.slight": "ลด%2$sของ%1$s",
  "cobblemon.battle.unboost.sharp": "ลด%2$sของ%1$sอย่างมาก",
  "cobblemon.battle.unboost.severe": "ลด%2$sของ%1$sอย่างรุนแรง",
  "cobblemon.battle.unboost.cap.single": "ไม่สามารถลด%2$sของ%1$sน้อยไปกว่านี้",
  "cobblemon.battle.unboost.cap.multiple": "ไม่สามารถลดพลังของ%1$sน้อยไปกว่านี้",
  "cobblemon.battle.boost.slight": "เพิ่ม%2$sของ%1$s",
+  "cobblemon.battle.boost.slight.zeffect": "%1$sได้เพิ่ม%2$sหลังใช้พลัง-Z!",
  "cobblemon.battle.boost.sharp": "เพิ่ม%2$sของ%1$sอย่างรวดเร็ว",
+  "cobblemon.battle.boost.sharp.zeffect": "%1$sได้เพิ่ม%2$sอย่างรวดเร็วหลังใช้พลัง-Z!",
  "cobblemon.battle.boost.severe": "เพิ่ม%2$sของ%1$sอย่างมาก",
+  "cobblemon.battle.boost.severe.zeffect": "%1$sได้เพิ่ม%2$sอย่างมากหลังใช้พลัง-Z!",
  "cobblemon.battle.boost.cap.single": "ไม่สามารถเพิ่ม%2$sของ%1$sมากไปกว่านี้",
  "cobblemon.battle.boost.cap.multiple": "ไม่สามารถเพิ่มพลังของ%1$sมากไปกว่านี้",
  "cobblemon.battle.setboost.bellydrum": "%1$sได้ลด HP ของตัวเอง และเพิ่มพลังโจมตีให้ถึงจุดสูงสุด!",
@@ -379,111 +711,247 @@
  "cobblemon.capture.not_single": "คุณสามารถจับโปเกมอนป่าในการต่อสู้ 1 ต่อ 1 ได้เท่านั้น",
  "cobblemon.you_in_battle": "คุณไม่สามารถทำสิ่งนั้นได้ขณะต่อสู้!",
  "cobblemon.battle.turn": "ตอนนี้เทิร์นที่ %1$s",
-  "cobblemon.battle.rain_dance": "ฝนเริ่มตก!",
-  "cobblemon.battle.rain_dance_upkeep": "ฝนยังตกอยู่",
-  "cobblemon.battle.sandstorm": "เกิดพายุทรายขึ้นมา!",
-  "cobblemon.battle.sandstorm_buffeted": "%1$sถูกพายุทรายพัด",
-  "cobblemon.battle.sandstorm_upkeep": "พายุทรายโหมกระหน่ำ",
-  "cobblemon.battle.sunny_day": "แสงแดดจ้า!",
-  "cobblemon.battle.sunny_day_upkeep": "แดดกำลังจ้าอยู่",
-  "cobblemon.battle.hail": "ลูกเห็บเริ่มตก!",
-  "cobblemon.battle.hail_upkeep": "ลูกเห็บกำลังตกลงมา",
-  "cobblemon.battle.hail_buffeted": "ลูกเห็บตกใส่%1$s",
-  "cobblemon.battle.no_weather": "อากาศกลับมาแจ่มใส",
-  "cobblemon.battle.confusion_start": "%1$sสับสนตัวเอง!",
-  "cobblemon.battle.confusion_activate": "สับสนตัวเองเลยทำลายตัวเอง",
-  "cobblemon.battle.confusion_snapped": "%1$sตั้งสติขึ้นมาได้!",
-  "cobblemon.battle.protect_start": "%1$sเริ่มป้องกันตัวเอง!",
-  "cobblemon.battle.protect_activate": "%1$sป้องกันตัวเอง!",
-  "cobblemon.battle.magnitude_level": "แมกนิจูด %1$s!",
-  "cobblemon.battle.bide_start": "%1$sเริ่มสะสมพลังงาน!",
-  "cobblemon.battle.bide_activate": "%1$sได้สะสมพลังงาน!",
-  "cobblemon.battle.bide_end": "%1$sปลดปล่อยพลังงานออกมา!",
-  "cobblemon.battle.field_start.electric_terrain": "กระแสไฟฟ้าวิ่งไปทั่วสนาม!",
-  "cobblemon.battle.field_start.grassy_terrain": "หญ้าได้ขึ้นปกคลุมสนาม!",
-  "cobblemon.battle.field_start.gravity": "แรงดึงดูดทวีความรุนแรงขึ้น!",
-  "cobblemon.battle.field_start.magic_room": "แอเรียที่แปลกที่ไอเทมที่ถือสูญเสียเอฟเฟกต์ได้ถูกสร้างขึ้นมา!",
-  "cobblemon.battle.field_start.misty_terrain": "หมอกหมุนวนรอบสนาม!",
-  "cobblemon.battle.field_start.mud_sport": "พลังประเภทไฟฟ้าอ่อนลง!",
-  "cobblemon.battle.field_start.psychic_terrain": "สนามต่อสู้เริ่มแปลก!",
-  "cobblemon.battle.field_start.trick_room": "%1$sได้บิดมิติ!",
-  "cobblemon.battle.field_start.water_sport": "พลังประเภทไฟอ่อนลง!",
-  "cobblemon.battle.field_start.wonder_room": "แอเรียที่แปลกที่สลับพลังป้องกันกับพลังป้องกันพิเศษได้ถูกสร้างขึ้นมา!",
-  "cobblemon.battle.field_end.electric_terrain": "กระแสไฟฟ้าได้หายไปจากสนาม",
-  "cobblemon.battle.field_end.grassy_terrain": "หญ้าได้หายไปจากสนาม",
-  "cobblemon.battle.field_end.gravity": "แรงดึงดูดกลับสู่ปกติ!",
-  "cobblemon.battle.field_end.magic_room": "เมจิกรูมได้หยุดทำงานจึงทำให้เอฟเฟกต์ของไอเทมที่ถือกลับมาเป็นเหมือนเดิม!",
-  "cobblemon.battle.field_end.misty_terrain": "หมอกได้หายไปจากสนาม",
-  "cobblemon.battle.field_end.mud_sport": "เอฟเฟกต์ของเกมส์โคลนได้จบลง",
-  "cobblemon.battle.field_end.psychic_terrain": "ความแปลกได้หายไปจากสนามต่อสู้!",
-  "cobblemon.battle.field_end.trick_room": "มิติที่บิดเบือนได้กลับมาสู่ปกติ!",
-  "cobblemon.battle.field_end.water_sport": "เอฟเฟกต์ของเกมส์น้ำได้จบลง",
-  "cobblemon.battle.field_end.wonder_room": "วันเดอร์รูมได้หยุดทำงานจึงทำให้พลังป้องกัน และพลังป้องกันพิเศษกลับมาเป็นปกติ!",
-  "cobblemon.battle.cant.generic_block": "%1$sไม่สามารถใช้ท่า%2$s!",
+  "cobblemon.battle.side_subject.ally": "ของคุณ",
+  "cobblemon.battle.side_subject.opponent": "ฝ่ายตรงข้าม",
+  "cobblemon.battle.weather.raindance.start": "ฝนเริ่มตก!",
+  "cobblemon.battle.weather.raindance.upkeep": "ฝนยังคงตกอยู่",
+  "cobblemon.battle.weather.raindance.end": "ฝนหยุดตกแล้ว",
+  "cobblemon.battle.weather.sandstorm.start": "เกิดพายุทรายขึ้นมา!",
+  "cobblemon.battle.weather.sandstorm.upkeep": "พายุทรายโหมกระหน่ำ",
+  "cobblemon.battle.weather.sandstorm.end": "พายุทรายได้สงบลงแล้ว",
+  "cobblemon.battle.weather.sunnyday.start": "แสงแดดจ้าอย่างรุนแรง!",
+  "cobblemon.battle.weather.sunnyday.upkeep": "แสงแดดจ้า",
+  "cobblemon.battle.weather.sunnyday.end": "แสงแดดได้จางลง",
+  "cobblemon.battle.weather.hail.start": "ลูกเห็บเริ่มตก!",
+  "cobblemon.battle.weather.hail.upkeep": "ลูกเห็บกำลังตกลงมา",
+  "cobblemon.battle.weather.hail.end": "ลูกเห็บหยุดตกแล้ว",
+  "cobblemon.battle.start.bide": "%1$sเริ่มสะสมพลังงาน!",
+  "cobblemon.battle.start.yawn": "%1$sเริ่มง่วง!",
+  "cobblemon.battle.start.perish": "อีก %2$s เทิร์น %1$sจะหมดสติลง",
+  "cobblemon.battle.start.leechseed": "%1$sถูกเพาะเมล็ดกาฝาก!",
+  "cobblemon.battle.start.aquaring": "%1$sห่อหุ้มตัวเองด้วยผ้าคลุมน้ำ!",
+  "cobblemon.battle.start.charge": "%1$sเริ่มชาร์จพลัง!",
+  "cobblemon.battle.start.taunt": "%1$sถูกยั่วยุ!",
+  "cobblemon.battle.start.autotomize": "%1$sว่องไวขึ้น!",
+  "cobblemon.battle.start.attract": "%1$sตกหลุมรัก!",
+  "cobblemon.battle.start.focusenergy": "%1$sตั้งสมาธิ!",
+  "cobblemon.battle.start.uproar": "%1$sทำให้เกิดการโห่ร้อง!",
+  "cobblemon.battle.start.curse": "%1$sลด HP ของตัวเองเพื่อแช่ง%2$s!",
+  "cobblemon.battle.start.miracleeye": "%1$sถูกระบุตัว!",
+  "cobblemon.battle.start.dynamax": "%1$sได้ไดแมกซ์!",
+  "cobblemon.battle.start.gmax": "%1$sได้กิกะแมกซ์!",
+  "cobblemon.battle.fieldstart.electricterrain": "กระแสไฟฟ้าวิ่งไปทั่วสนาม!",
+  "cobblemon.battle.fieldstart.grassyterrain": "หญ้าได้ขึ้นปกคลุมสนาม!",
+  "cobblemon.battle.fieldstart.gravity": "แรงดึงดูดทวีความรุนแรงขึ้น!",
+  "cobblemon.battle.fieldstart.magicroom": "แอเรียที่แปลกที่ไอเทมที่ถือสูญเสียเอฟเฟกต์ได้ถูกสร้างขึ้นมา!",
+  "cobblemon.battle.fieldstart.mistyterrain": "หมอกหมุนวนรอบสนาม!",
+  "cobblemon.battle.fieldstart.mudsport": "พลังประเภทไฟฟ้าอ่อนลง!",
+  "cobblemon.battle.fieldstart.psychicterrain": "สนามต่อสู้เริ่มแปลก!",
+  "cobblemon.battle.fieldstart.trickroom": "%1$sได้บิดมิติ!",
+  "cobblemon.battle.fieldstart.watersport": "พลังประเภทไฟอ่อนลง!",
+  "cobblemon.battle.fieldstart.wonderroom": "แอเรียที่แปลกที่สลับพลังป้องกันกับพลังป้องกันพิเศษได้ถูกสร้างขึ้นมา!",
+  "cobblemon.battle.fieldend.electricterrain": "กระแสไฟฟ้าได้หายไปจากสนาม",
+  "cobblemon.battle.fieldend.grassyterrain": "หญ้าได้หายไปจากสนาม",
+  "cobblemon.battle.fieldend.gravity": "แรงดึงดูดได้กลับสู่ปกติ!",
+  "cobblemon.battle.fieldend.magicroom": "เมจิกรูมได้หยุดทำงานจึงทำให้เอฟเฟกต์ของไอเทมที่ถือกลับมาเป็นเหมือนเดิม!",
+  "cobblemon.battle.fieldend.mistyterrain": "หมอกได้หายไปจากสนาม",
+  "cobblemon.battle.fieldend.mudsport": "เอฟเฟกต์ของเกมส์โคลนได้จบลง",
+  "cobblemon.battle.fieldend.psychicterrain": "ความแปลกได้หายไปจากสนามต่อสู้!",
+  "cobblemon.battle.fieldend.trickroom": "มิติที่บิดเบือนได้กลับมาสู่ปกติ!",
+  "cobblemon.battle.fieldend.watersport": "เอฟเฟกต์ของเกมส์น้ำได้จบลง",
+  "cobblemon.battle.fieldend.wonderroom": "วันเดอร์รูมได้หยุดทำงานจึงทำให้พลังป้องกัน และพลังป้องกันพิเศษกลับมาเป็นปกติ!",
+  "cobblemon.battle.fieldactivate.perishsong": "โปเกมอนทุกตัวที่ได้ยินเพลงนี้จะหมดสติลงในอีก 3 เทิร์น!",
+  "cobblemon.battle.sidestart.stealthrock": "หินขัดลอยอยู่ในอากาศรอบ ๆ ทีม%1$s!",
+  "cobblemon.battle.sidestart.spikes": "ลูกศรแท่งกระจายอยู่บนพื้นรอบ ๆ ทีม%1$s!",
+  "cobblemon.battle.sidestart.toxicspikes": "ตะปูพิษกระจายอยู่บนพื้นรอบ ๆ ทีม%1$s!",
+  "cobblemon.battle.sidestart.stickyweb": "ตาข่ายหนีบหนับวางอยู่บนพื้นรอบ ๆ ทีม%1$s!",
+  "cobblemon.battle.sidestart.reflect": "รีเฟล็กเตอร์ทำให้ทีม%1$sลดแดเมจที่ได้รับจากการโจมตีกายภาพ!",
+  "cobblemon.battle.sidestart.lightscreen": "ผนังลำแสงทำให้ทีม%1$sลดแดเมจที่ได้รับจากการโจมตีพิเศษ!",
+  "cobblemon.battle.sidestart.auroraveil": "ออโรร่าเวลล์ทำให้ทีม%1$sลดแดเมจที่ได้รับจากการโจมตีกายภาพและการโจมตีพิเศษ!",
+  "cobblemon.battle.sidestart.tailwind": "ลมจากท่าบินตามลมพัดมาจากด้านหลังทีม%1$s!",
+  "cobblemon.battle.sidestart.safeguard": "ทีมของ%1$sได้คลุมตัวเองด้วยผ้าคลุมลึกลับ!",
+  "cobblemon.battle.sideend.stealthrock": "หินแหลมได้หายไปจากรอบ ๆ ทีม%1$s!",
+  "cobblemon.battle.sideend.spikes": "ลูกศรแท่งได้หายไปจากพื้นรอบ ๆ ทีม%1$s!",
+  "cobblemon.battle.sideend.toxicspikes": "ตะปูพิษได้หายไปจากพื้นรอบ ๆ ทีม%1$s!",
+  "cobblemon.battle.sideend.stickyweb": "ตาข่ายหนีบหนับได้หายไปจากพื้นรอบ ๆ ทีม%1$s!",
+  "cobblemon.battle.sideend.reflect": "รีเฟล็กเตอร์ของทีม%1$sได้แตกออกมา!",
+  "cobblemon.battle.sideend.lightscreen": "ผนังลำแสงของทีม%1$sได้แตกออกมา!",
+  "cobblemon.battle.sideend.auroraveil": "ออโรร่าเวลล์ของทีม%1$sได้แตกออกมา!",
+  "cobblemon.battle.sideend.tailwind": "ลมจากท่าบินตามลมของทีม%1$sได้หายไป!",
+  "cobblemon.battle.sideend.safeguard": "ทีมของ%1$sไม่ได้รับป้องกันจากพลังคุ้มภัยอีกต่อไป!",
+  "cobblemon.battle.cant.generic": "%1$sไม่สามารถใช้ท่า%2$s!",
  "cobblemon.battle.cant.truant": "%1$sนอนอยู่เฉย ๆ ไม่ทำอะไร!",
-  "cobblemon.battle.cant.flinched": "%1$sผงะ เลยขยับตัวไม่ได้!",
+  "cobblemon.battle.cant.flinch": "%1$sผงะ เลยขยับตัวไม่ได้!",
  "cobblemon.battle.cant.recharge": "%1$sต้องพักร่างกาย!",
  "cobblemon.battle.cant.attract": "%1$sถูกตรึงไว้ด้วยความรัก!",
  "cobblemon.battle.cant.disable": "ท่า%2$sของ%1$sได้ถูกชะงักงัน!",
-  "cobblemon.battle.cant.focus_punch": "%1$sเสียสมาธิจึงไม่สามารถใช้ท่าโฟกัสพันช์ได้!",
-  "cobblemon.battle.cant.heal_block": "%1$sไม่สามารถใช้ท่า%2$sได้เพราะถูกขัดขวางการรักษา!",
+  "cobblemon.battle.cant.focuspunch": "%1$sเสียสมาธิจึงไม่สามารถใช้ท่าโฟกัสพันช์ได้!",
+  "cobblemon.battle.cant.healblock": "%1$sไม่สามารถใช้ท่า%2$sได้เพราะถูกขัดขวางการรักษา!",
  "cobblemon.battle.cant.imprison": "%1$sไม่สามารถใช้ท่า%2$sได้เพราะถูกปิดผนึกเอาไว้!",
  "cobblemon.battle.cant.gravity": "%1$sไม่สามารถใช้ท่า%2$sได้เนื่องจากแรงดึงดูดหนักขึ้น!",
-  "cobblemon.battle.cant.shell_trap": "แทรปเชลล์ของ%1$sไม่สามารถใช้งานได้!",
+  "cobblemon.battle.cant.shelltrap": "แทรปเชลล์ของ%1$sไม่สามารถใช้งานได้!",
  "cobblemon.battle.cant.taunt": "%1$sไม่สามารถใช้ท่า%2$sได้เพราะถูกยั่วยุ!",
-  "cobblemon.battle.cant.throat_chop": "ด้วยเอฟเฟกต์ของท่าสับคอจึงกันไม่ให้%1$sใช้ท่าบางท่า!",
-  "cobblemon.battle.cant.no_pp": "%1$sพยายามใช้ท่า%2$s แต่ไม่มี PP ของท่านั้นเหลือ!",
+  "cobblemon.battle.cant.throatchop": "ด้วยเอฟเฟกต์ของท่าสับคอจึงกันไม่ให้%1$sใช้ท่าบางท่า!",
+  "cobblemon.battle.activate.confusion": "%1$sสับสนตัวเอง!",
  "cobblemon.battle.activate.gravity": "%1$sไม่สามารถลอยอยู่ในอากาศได้เนื่องจากแรงโน้มถ่วงหนักขึ้น!",
-  "cobblemon.battle.activate.misty_terrain": "%1$sล้อมรอบตัวเองด้วยหมอกที่คุ้มกัน!",
-  "cobblemon.battle.activate.psychic_terrain": "%1$sล้อมรอบตัวเองด้วยไซโคฟีลด์!",
-  "cobblemon.battle.activate.heal_bell": "กระดิ่งถูกตี!",
+  "cobblemon.battle.activate.mistyterrain": "%1$sล้อมรอบตัวเองด้วยหมอกที่คุ้มกัน!",
+  "cobblemon.battle.activate.psychicterrain": "%1$sล้อมรอบตัวเองด้วยไซโคฟีลด์!",
+  "cobblemon.battle.activate.healbell": "กระดิ่งถูกตี!",
  "cobblemon.battle.activate.aromatherapy": "กลิ่นหอมโชยไปทั่วบริเวณ!",
  "cobblemon.battle.activate.trapped": "ต่อไปนี้%1$sไม่สามารถหลบหนีได้!",
-  "cobblemon.battle.set_hp.pain_split": "ผู้ต่อสู้ทั้งสองแบ่งความเจ็บปวด!",
-  "cobblemon.battle.speed_boost_ability": "ความสามารถเร่งความเร็วของ%1$sได้ทำงาน!",
+  "cobblemon.battle.activate.bind": "%1$sถูกบีบโดย%2$s!",
+  "cobblemon.battle.activate.wrap": "%1$sถูกรัดโดย%2$s!",
+  "cobblemon.battle.activate.struggle": "%1$sไม่มีท่าเหลืออยู่เลย!",
+  "cobblemon.battle.activate.courtchange": "%1$sสลับเปลี่ยนเอฟเฟกต์การต่อสู้ที่ส่งผลต่อสนามของทั้งสองฝ่าย!",
+  "cobblemon.battle.activate.guardsplit": "%1$sแบ่งปันพลังป้องกัน และพลังป้องกันพิเศษกับเป้าหมาย!",
+  "cobblemon.battle.activate.spite": "ได้ลด PP ท่า%2$sของ%1$sเป็นจำนวน%3$s!",
+  "cobblemon.battle.activate.lockon": "%1$sได้เล็งไปที่%2$s!",
+  "cobblemon.battle.activate.protosynthesis": "แสงแดดจ้าอย่างรุนแรงทำให้ความสามารถสังเคราะห์พลังโบราณของ%1$sทำงาน!",
+  "cobblemon.battle.activate.bide": "%1$sได้สะสมพลังงาน!",
+  "cobblemon.battle.activate.protect": "%1$sป้องกันตัวเอง!",
+  "cobblemon.battle.activate.magnitude": "แมกนิจูด %1$s!",
+  "cobblemon.battle.activate.destinybond": "%1$sกำจัดผู้โจมตีลงไปด้วยกัน!",
+  "cobblemon.battle.activate.synchronize": "[ความสามารถประสานเวลาของ%1$s]",
+  "cobblemon.battle.activate.endure": "%1$sทนการถูกโจมตี!",
+  "cobblemon.battle.activate.attract": "%1$sตกหลุมรักกับ%2$s!",
+  "cobblemon.battle.activate.firespin": "%1$sติดอยู่ในวงล้อไฟ!",
+  "cobblemon.battle.activate.trick": "%1$sได้เปลี่ยนไอเทมกับเป้าหมาย!",
+  "cobblemon.battle.activate.quickclaw": "%1$sสามารถใช้ท่าได้เร็วขึ้นกว่าปกติ ต้องขอบคุณกรงเล็บแห่งการเริ่มต้นก่อน!",
+  "cobblemon.battle.activate.focusband": "%1$sได้ทนตัวเองเอาไว้โดยใช้%2$s!",
+  "cobblemon.battle.activate.forewarn": "%2$sของ%1$sได้ถูกเปิดเผย!",
+  "cobblemon.battle.activate.disguise": "มันได้ปลอมตัวเพื่อเป็นตัวล่อโจมตี!",
+  "cobblemon.battle.activate.liquidooze": "%1$sได้ดูดสลัดจ์ลิควิด!",
+  "cobblemon.battle.activate.whirlpool": "%1$sติดอยู่ในกระแสน้ำวน!",
+  "cobblemon.battle.activate.clamp": "%2$sหนีบ%1$sเอาไว้!",
+  "cobblemon.battle.prepare.bounce": "%1$sเด้งขึ้นสูง!",
+  "cobblemon.battle.prepare.dig": "%1$sมุดเข้าไปในดิน!",
+  "cobblemon.battle.prepare.dive": "%1$sได้ซ่อนตัวอยู่ใต้น้ำ!",
+  "cobblemon.battle.prepare.fly": "%1$sบินขึ้นสูง!",
+  "cobblemon.battle.prepare.freezeshock": "%1$sซ่อนตัวด้วยแสงเยือกแข็ง!",
+  "cobblemon.battle.prepare.geomancy": "%1$sดูดพลัง!",
+  "cobblemon.battle.prepare.iceburn": "%1$sซ่อนตัวด้วยลมเยือกเย็น!",
+  "cobblemon.battle.prepare.meteorbeam": "%1$sล้นไปด้วยพลังอวกาศ!",
+  "cobblemon.battle.prepare.phantomforce": "%1$sหายตัวไปทันที!",
+  "cobblemon.battle.prepare.razorwind": "%1$sตีลมกรดอย่างเร็ว!",
+  "cobblemon.battle.prepare.skullbash": "%1$sซุกหัวของตัวเอง!",
+  "cobblemon.battle.prepare.skyattack": "%1$sซ่อนตัวด้วยแสงจ้า!",
+  "cobblemon.battle.prepare.skydrop": "%1$sจับเป้าหมายขึ้นไปบนท้องฟ้า!",
+  "cobblemon.battle.prepare.solarbeam": "%1$sได้รวบรวมแสง!",
+  "cobblemon.battle.swapboost.generic": "%1$sสลับการเพิ่มค่าพลังกับ%2$s!",
+  "cobblemon.battle.singleturn.protect": "%1$sป้องกันตัวเอง!",
+  "cobblemon.battle.singleturn.endure": "%1$sรั้งตัวเอง!",
+  "cobblemon.battle.singleturn.craftyshield": "ทริคการ์ดได้ป้องกันทีมของ%1$s!",
+  "cobblemon.battle.singleturn.powder": "%1$sปกคลุมไปด้วยผง!",
+  "cobblemon.battle.singleturn.followme": "%1$sกลายเป็นจุดสนใจ!",
+  "cobblemon.battle.singleturn.snatch": "%1$sรอให้เป้าหมายใช้ท่า!",
+  "cobblemon.battle.singleturn.quickguard": "ฟาสท์การ์ดได้ป้องกันทีมของ%1$s!",
+  "cobblemon.battle.singleturn.wideguard": "ไวด์การ์ดได้ป้องกันทีมของ%1$s!",
+  "cobblemon.battle.singleturn.roost": "(%1$sเสียประเภทบินไปในเทิร์นนี้)",
+  "cobblemon.battle.singleturn.matblock": "%1$sตั้งใจพลิกเสื่อเพื่อกันการโจมตีที่โจมตีเข้ามา",
+  "cobblemon.battle.singleturn.maxguard": "%1$sป้องกันตัวเอง!",
+  "cobblemon.battle.singleturn.instruct": "%1$sทำตามคำสั่งของ%2$s",
+  "cobblemon.battle.singleturn.focuspunch": "%1$sตั้งสมาธิ!",
+  "cobblemon.battle.singleturn.electrify": "ท่าของ%1$sถูกกระตุ้นไฟฟ้า!",
+  "cobblemon.battle.singleturn.beakblast": "%1$sเริ่มอุ่นจะงอยปากของตัวเอง!",
+  "cobblemon.battle.singleturn.helpinghand": "%2$sพร้อมที่จะช่วยเหลือ%1$s!",
+  "cobblemon.battle.singleturn.magiccoat": "%1$sได้หุ้มตัวเองด้วยเมจิกโคท!",
+  "cobblemon.battle.singleturn.ragepowder": "%1$sกลายเป็นจุดสนใจ!",
+  "cobblemon.battle.singleturn.shelltrap": "%1$sได้วางแทรปเชลล์!",
+  "cobblemon.battle.singleturn.spotlight": "%1$sกลายเป็นจุดสนใจ!",
+  "cobblemon.battle.singlemove.destinybond": "%1$sหวังกำจัดผู้โจมตีลงไปด้วยกัน!",
+  "cobblemon.battle.singlemove.glaiverush": "%1$sโยนตัวเองโดยการโจมตีอย่างประมาท!",
+  "cobblemon.battle.singlemove.grudge": "%1$sต้องการเป้าหมายแบกรับความขัดข้องใจ!",
+  "cobblemon.battle.singlemove.rage": "%1$sเข้าสู่ความพิโรธ!",
+  "cobblemon.battle.damage.wrap": "%1$sเจ็บจากการรัด!",
+  "cobblemon.battle.damage.confusion": "%1$sสับสนตัวเองเลยทำลายตัวเอง!",
+  "cobblemon.battle.damage.leechseed": "HP ของ%1$sถูกดูดโดยเมล็ดกาฝาก!",
+  "cobblemon.battle.damage.sandstorm": "%1$sถูกพายุทรายพัด",
+  "cobblemon.battle.damage.hail": "ลูกเห็บตกใส่%1$s",
+  "cobblemon.battle.damage.stealthrock": "หินแหลมแทงเข้าไปใน%1$s!",
+  "cobblemon.battle.damage.spikes": "%1$sเจ็บจากลูกศรแท่ง!",
+  "cobblemon.battle.damage.recoil": "%1$sได้รับแดเมจจากการเจ็บตัว!",
+  "cobblemon.battle.damage.item": "%1$sเจ็บจาก%2$sของมัน!",
+  "cobblemon.battle.damage.lifeorb": "%1$sสูญเสีย HP ไปบางส่วน!",
+  "cobblemon.battle.damage.rockyhelmet": "%1$sเจ็บจากหมวกกันน็อกขรุขระของ%2$s!",
+  "cobblemon.battle.damage.generic": "%1$sเจ็บตัว!",
+  "cobblemon.battle.damage.pokemonmimikyubusted": "ตัวปลอมของ%1$sได้ถูกทำลาย!",
+  "cobblemon.battle.damage.whirlpool": "%1$sเจ็บจากน้ำวน!",
+  "cobblemon.battle.damage.clamp": "%1$sเจ็บจากการหนีบด้วยเปลือก!",
+  "cobblemon.battle.damage.curse": "%1$s ได้รับผลจากการแช่ง!",
+  "cobblemon.battle.end.bind": "%1$sไม่ถูกบีบอีกต่อไป!",
+  "cobblemon.battle.end.wrap": "%1$sถูกปล่อยจากการรัด!",
+  "cobblemon.battle.end.disable": "ท่าของ%1$sไม่ถูกห้ามใช้อีกต่อไป!",
+  "cobblemon.battle.end.protosynthesis": "เอฟเฟกต์ความสามารถสังเคราะห์พลังโบราณของ%1$sหยุดทำงาน!",
+  "cobblemon.battle.end.taunt": "%1$sได้สลัดการยั่วยุ!",
+  "cobblemon.battle.end.firespin": "%1$sถูกปล่อยจากวงล้อไฟ!",
+  "cobblemon.battle.end.bide": "%1$sปลดปล่อยพลังงานออกมา!",
+  "cobblemon.battle.end.confusion": "%1$sตั้งสติขึ้นมาได้!",
+  "cobblemon.battle.end.whirlpool": "%1$sถูกปล่อยจากน้ำวน!",
+  "cobblemon.battle.end.clamp": "%1$sถูกปล่อยจากการหนีบด้วยเปลือก!",
+  "cobblemon.battle.end.dynamax": "%1$sกลับมาสู่ปกติ!",
+  "cobblemon.battle.sethp.painsplit": "ผู้ต่อสู้ทั้งสองแบ่งความเจ็บปวด!",
+  "cobblemon.battle.ability.sturdy": "%1$sทนการถูกโจมตี!",
+  "cobblemon.battle.ability.unnerve": "%1$sทำให้ฝ่ายตรงข้ามกลัวจนกินผลไม้ไม่ได้!",
+  "cobblemon.battle.ability.anticipation": "%1$sสะดุ้งกับลางบอกเหตุ!",
+  "cobblemon.battle.ability.airlock": "เอฟเฟกต์ของสภาพอากาศได้หายไป",
+  "cobblemon.battle.ability.generic": "ความสามารถ%2$sของ%1$sได้ทำงาน!",
+  "cobblemon.battle.ability.magicbounce": "%1$sได้สะท้อน%2$sกลับไป!",
  "cobblemon.battle.errors.busy": "%1$sไม่ว่าง!",
  "cobblemon.battle.error.in_battle": "%1$sกำลังอยู่ในการต่อสู้",
  "cobblemon.battle.error.in_battle.personal": "คุณกำลังอยู่ในการต่อสู้!",
  "cobblemon.battle.error.no_pokemon": "คุณไม่มีโปเกมอนที่ใช้งานได้!",
+  "cobblemon.battle.error.no_pokemon_opponent": "คู่ต่อสู้ของคุณไม่มีโปเกมอนที่ใช้งานได้!",
  "cobblemon.battle.error.insufficient_pokemon": "%1$sมีโปเกมอน %2 ตัว แต่ต้องมี %3 ตัว",
  "cobblemon.battle.error.insufficient_pokemon.personal": "คุณมีโปเกมอนที่ใช้งานได้ %1 ตัวแต่คุณต้องมี %2 ตัว",
+  "cobblemon.battle.error.pokemon_is_trapped": "[ตัวเลือกที่เลือกไม่ได้] เปลี่ยนตัวไม่ได้: โปเกมอนที่ใช้งานถูกดักไว้",
  "cobblemon.battle.immune": "แต่มันไม่มีผลกับ%1$s!",
  "cobblemon.battle.missed": "แต่มันพลาด",
  "cobblemon.battle.hit_count": "ตี %1$s ครั้ง!",
  "cobblemon.battle.hit_count_singular": "ตี 1 ครั้ง!",
-  "cobblemon.battle.item.air_balloon.start": "%1$sได้ลอยตัวอยู่ในอากาศด้วยลูกโป่งของมัน!",
-  "cobblemon.battle.item.recycle_or_pickup.start": "%1$sได้พบ%2$s 1 ชิ้น!",
-  "cobblemon.battle.item.frisk.start": "%1$sได้เช็ค%2$s แล้วเจอ%3$s!",
-  "cobblemon.battle.item.take_item.start": "%1$sได้ขโมย%3$sของ%2$s!",
-  "cobblemon.battle.item.harvest.start": "%1$sได้เก็บเกี่ยว%2$s 1 ลูก!",
-  "cobblemon.battle.item.bestow.start": "%1$sได้รับ%2$sจาก%3$s!",
-  "cobblemon.battle.item.tricked.start": "%1$sได้เปลี่ยนไอเทมกับเป้าหมาย!",
-  "cobblemon.battle.item.eat.end": "%1$sได้กิน%2$s!",
-  "cobblemon.battle.item.fling.end": "%1$sขว้าง%2$sทิ้ง!",
-  "cobblemon.battle.item.knock_off.end": "%1$sตบ%3$sของ%2$sทิ้ง!",
-  "cobblemon.battle.item.gem.end": "%1$sได้เพิ่มพลัง%2$s!",
-  "cobblemon.battle.item.incinerate.end": "%2$sของ%1$sถูกไหม้ไป!",
-  "cobblemon.battle.item.air_balloon.end": "ลูกโป่งของ%1$sแตก!",
-  "cobblemon.battle.item.hung_on.end": "%1$sได้ทนตัวเองเอาไว้โดยใช้%2$s!",
-  "cobblemon.battle.item.red_card.end": "%1$sได้ชูใบแดงใส่%2$s!",
-  "cobblemon.battle.item.steal_eat.end": "%1$sได้ขโมยและกิน%3$sของ%2$s!",
-  "cobblemon.battle.item.berry_juice.end": "น้ำเบอร์รี่ของ%1$sได้ทำงาน!",
-  "cobblemon.battle.item.used_its.end": "%1$sได้ใช้%2$s!",
-  "cobblemon.battle.item.mental_herb.end": "%1$sสลัดจากผลทางจิตใจเนื่องจากสมุนไพรทางจิต!",
-  "cobblemon.battle.item.power_herb.end": "%1$sได้ชาร์จเต็มแล้วเนื่องจากสมุนไพรอันทรงพลัง!",
-  "cobblemon.battle.item.mirror_herb.end": "%1$sได้คัดลอกการเปลี่ยนแปลงค่าพลังโดยใช้สมุนไพรแห่งการคัดลอก!",
-  "cobblemon.battle.item.white_herb.end": "%1$sได้รับค่าพลังที่ลดไปกับคืนมาโดยใช้สมุนไพรสีขาว!",
-  "cobblemon.battle.item.quick_claw.end": "%1$sสามารถใช้ท่าได้เร็วขึ้นกว่าปกติ ต้องขอบคุณกรงเล็บแห่งการเริ่มต้นก่อน!",
-  "cobblemon.battle.heal.z_effect": "ฟื้นฟู HP ของ%1$sด้วย Z-เพาเวอร์!",
+  "cobblemon.battle.item.airballoon": "%1$sได้ลอยตัวอยู่ในอากาศด้วย%2$sของมัน!",
+  "cobblemon.battle.item.recycle": "%1$sได้พบ%2$s 1 ชิ้น!",
+  "cobblemon.battle.item.frisk": "%3$sได้เช็ค%1$s แล้วเจอ%2$s!",
+  "cobblemon.battle.item.thief": "%1$sได้ขโมย%2$sของ%3$s!",
+  "cobblemon.battle.item.harvest": "%1$sได้เก็บเกี่ยว%2$s 1 ลูก!",
+  "cobblemon.battle.item.bestow": "%1$sได้รับ%2$sจาก%3$s!",
+  "cobblemon.battle.item.trick": "%1$sได้รับ%2$sมา 1 ชิ้น",
+  "cobblemon.battle.item.eat": "%1$sได้กิน%2$sของตัวเอง",
+  "cobblemon.battle.enditem.eat": "%1$sได้กิน%2$sของมัน!",
+  "cobblemon.battle.enditem.fling": "%1$sขว้าง%2$sของมันทิ้ง!",
+  "cobblemon.battle.enditem.knockoff": "%3$sได้ตบ%2$sของ%1$sทิ้ง!",
+  "cobblemon.battle.enditem.gem": "%2$sได้เพิ่มพลัง%1$s!",
+  "cobblemon.battle.enditem.incinerate": "%2$sของ%1$sได้ถูกไหม้ทิ้ง!",
+  "cobblemon.battle.enditem.airballoon": "ลูกโป่งของ%1$sแตก!",
+  "cobblemon.battle.enditem.redcard": "%1$sได้ชูใบแดงใส่%3$s!",
+  "cobblemon.battle.enditem.pluck": "%3$sได้ขโมยและกิน%2$sของ%1$s!",
+  "cobblemon.battle.enditem.berryjuice": "น้ำเบอร์รี่ของ%1$sได้ทำงาน!",
+  "cobblemon.battle.enditem.generic": "%1$sได้ใช้%2$sของมัน!",
+  "cobblemon.battle.enditem.mentalherb": "%1$sสลัดจากผลทางจิตใจเนื่องจากสมุนไพรทางจิต!",
+  "cobblemon.battle.enditem.powerherb": "%1$sได้ชาร์จเต็มแล้วเนื่องจากสมุนไพรอันทรงพลัง!",
+  "cobblemon.battle.enditem.mirrorherb": "%1$sได้คัดลอกการเปลี่ยนแปลงค่าพลังโดยใช้สมุนไพรแห่งการคัดลอก!",
+  "cobblemon.battle.enditem.whiteherb": "%1$sได้รับค่าพลังที่ลดไปกับคืนมาโดยใช้สมุนไพรสีขาว!",
+  "cobblemon.battle.heal.zeffect": "ฟื้นฟู HP ของ%1$sด้วย Z-เพาเวอร์!",
  "cobblemon.battle.heal.wish": "พรของ%1$sเป็นจริง!",
  "cobblemon.battle.heal.drain": "%1$sถูกดูด HP!",
-  "cobblemon.battle.heal.healing_wish": "พรการรักษาเป็นจริงสำหรับ%1$s!",
-  "cobblemon.battle.heal.revival_blessing": "%1$sฟื้นขึ้นมาและพร้อมต่อสู้อีกครั้ง!",
-  "cobblemon.battle.heal.aqua_ring": "ผ้าคลุมน้ำได้ฟื้นฟู HP ของ%1$s!",
+  "cobblemon.battle.heal.healingwish": "พรการรักษาเป็นจริงสำหรับ%1$s!",
+  "cobblemon.battle.heal.revivalblessing": "%1$sฟื้นขึ้นมาและพร้อมต่อสู้อีกครั้ง!",
+  "cobblemon.battle.heal.aquaring": "ผ้าคลุมน้ำได้ฟื้นฟู HP ของ%1$s!",
  "cobblemon.battle.heal.ingrain": "%1$sได้ดูดซึมสารอาหารจากรากของมัน!",
-  "cobblemon.battle.heal.grassy_terrain": "ฟื้นฟู HP ของ%1$s",
-  "cobblemon.battle.heal.leftovers": "%1$sฟื้นฟู HP เล็กน้อยโดยกินอาหารเหลือของมัน!",
+  "cobblemon.battle.heal.grassyterrain": "ฟื้นฟู HP ของ%1$s",
+  "cobblemon.battle.heal.leftovers": "%1$sฟื้นฟู HP เล็กน้อยโดยใช้%2$sของมัน!",
+  "cobblemon.battle.heal.item": "%1$sฟื้นฟู HP โดยใช้%2$sของมัน!",
+  "cobblemon.battle.heal.raindish": "ฟื้นฟู HP ของ%1$sจากความสามารถจานรองน้ำฝน!",
  "cobblemon.battle.heal.generic": "ฟื้นฟู HP ของ%1$s",
+  "cobblemon.battle.heal.bagitempotion": "คุณได้ฟื้นฟู HP ของ%1$s",
+  "cobblemon.battle.curestatus.naturalcure": "%1$sได้รักษาสภาวะผิดปกติด้วยความสามารถฟื้นตัวตามธรรมชาติ!",
+  "cobblemon.battle.bagitem.use": "%1$sได้ใช้%2$sใส่%3$s!",
+  "cobblemon.battle.bagitem.cannot": "คุณไม่สามารถใช้ไอเทมได้ในตอนนี้",
+  "cobblemon.battle.bagitem.invalid": "ไอเทมนี้ไม่ทำงาน",
+  "cobblemon.battle.zpower": "%1$sได้ล้อมรอบตัวเองด้วยพลัง-Z!",
+  "cobblemon.battle.zbroken": "%1$sไม่สามารถป้องกันตัวเองได้อย่างเต็มที่ ทำให้ได้รับบาดเจ็บ!",
+  "cobblemon.battle.terastallize": "%1$sได้เทรัสตัลเป็นประเภท%2$s!",
+  "cobblemon.battle.detailschange.mega": "%1$sได้ตอบสนองต่อคีย์สโตน!",
+  "cobblemon.battle.mega": "%1$sได้วิวัฒนาการเมก้า!",
  "cobblemon.experience.gained": "%1$sได้รับค่าประสบการณ์ %2$s",
  "cobblemon.experience.level_up": "ตอนนี้%1$sเลเวล %2$s แล้ว!",
  "cobblemon.experience.learned_move": "%1$sได้เรียนท่า%2$sแล้ว",
@@ -556,16 +1024,19 @@
  "cobblemon.move.category.status": "สถานะ",
  "cobblemon.status.sleep.apply": "%1$sได้หลับลง!",
  "cobblemon.status.sleep.is": "%1$sกำลังนอนอยู่",
-  "cobblemon.status.sleep.woke": "%1$sได้ตื่นขึ้นมา!",
+  "cobblemon.status.sleep.cure": "%1$sได้ตื่นขึ้นมา!",
  "cobblemon.status.paralysis.apply": "ร่างกายของ%1$sชา!",
  "cobblemon.status.paralysis.is": "ร่างกายของ%1$sชา เลยขยับตัวไม่ได้",
+  "cobblemon.status.paralysis.cure": "%1$sได้หายจากการชาแล้ว!",
  "cobblemon.status.poison.apply": "%1$sติดพิษ!",
+  "cobblemon.status.poison.cure": "%1$sได้หายจากการติดพิษแล้ว!",
  "cobblemon.status.poisonbadly.apply": "%1$sติดพิษร้ายแรง!",
-  "cobblemon.status.poison.hurt": "%1$sเจ็บจากพิษ",
+  "cobblemon.status.poison.hurt": "%1$sเจ็บจากพิษ!",
  "cobblemon.status.burn.apply": "%1$sถูกเผาไหม้!",
  "cobblemon.status.burn.hurt": "เปลวไฟไหม้ร่างกายของ%1$s!",
+  "cobblemon.status.burn.cure": "%1$sได้หายจากการถูกเผาไหม้แล้ว!",
  "cobblemon.status.frozen.apply": "%1$sถูกแช่แข็ง!",
-  "cobblemon.status.frozen.thawed": "น้ำแข็งที่แช่แข็ง%1$sได้ละลายออกมา!",
+  "cobblemon.status.frozen.cure": "น้ำแข็งที่แช่แข็ง%1$sได้ละลายออกมา!",
  "cobblemon.status.frozen.is": "%1$sขยับตัวไม่ได้!",
  "block.cobblemon.dawn_stone_ore": "แร่หินแห่งการเริ่มต้น",
  "block.cobblemon.dusk_stone_ore": "แร่หินความมืด",
@@ -588,12 +1059,49 @@
  "block.cobblemon.deepslate_thunder_stone_ore": "แร่หินสายฟ้าในหินชนวนลึก",
  "block.cobblemon.deepslate_water_stone_ore": "แร่หินน้ำในหินชนวนลึก",
  "block.cobblemon.dripstone_moon_stone_ore": "แร่หินพระจันทร์ในหินหยด",
+  "block.cobblemon.pasture": "บล็อกทุ่งเลี้ยงสัตว์",
  "gamerule.doPokemonSpawning": "ให้โปเกมอนเกิด",
+  "gamerule.doShinyStarters": "โปเกมอนเริ่มต้นจะมีสีแตกต่าง",
  "cobblemon.command.checkspawns.invalid-bucket": "บัคเก็ตการเกิดผิด",
  "cobblemon.command.checkspawns.spawns": "เกิด",
  "cobblemon.command.checkspawns.nothing": "ไม่มีอะไรที่สามารถเกิดได้ในขณะนี้",
-  "cobblemon.leftovers.created": "คุณได้ทึ้งอาหารเหลือเอาไว้",
- "cobblemon.move.pound": "ปัด",
+  "cobblemon.interaction.ev.add": "EV %2$sของ%1$sเพิ่มขึ้น %3$s แต้ม!",
+  "cobblemon.interaction.ev.deduct": "EV %2$sของ%1$sลดลง %3$s แต้ม!",
+  "cobblemon.interaction.pp.restore": "คุณได้ฟื้นฟู PP ของ%1$s",
+  "cobblemon.interaction.friendsip.add": "%1$sใกล้ชิดกับคุณมากขึ้น!",
+  "cobblemon.interaction.status.cure": "%1$sได้หายจากสภาวะผิดปกติ!",
+  "cobblemon.interaction.hp.heal": "%1$sได้ฟื้นฟู HP ของตัวเองอย่างเล็กน้อย!",
+  "tag.item.cobblemon.apricorn_logs": "ท่อนไม้บงงุริ",
+  "tag.item.cobblemon.apricorn_sprouts": "ต้นกล้าบงงุริ",
+  "tag.item.cobblemon.apricorns": "บงงุริ",
+  "tag.item.cobblemon.azalea_tree": "ต้นกุหลาบพันปี",
+  "tag.item.cobblemon.berries": "ผลไม้",
+  "tag.item.cobblemon.cobblemon_seeds": "เมล็ด",
+  "tag.item.cobblemon.evolution_items": "ไอเทมวิวัฒนาการ",
+  "tag.item.cobblemon.evolution_stones": "หินวิวัฒนาการ",
+  "tag.item.cobblemon.experience_candies": "ลูกอมประสบการณ์",
+  "tag.item.cobblemon.held.destiny_knot": "ด้ายแดง",
+  "tag.item.cobblemon.held.everstone": "หินที่ไม่เปลี่ยนแปลง",
+  "tag.item.cobblemon.held.experience_share": "อุปกรณ์ช่วยเรียนรู้",
+  "tag.item.cobblemon.held.is_held_item": "ไอเทมที่ถือ",
+  "tag.item.cobblemon.held.lucky_egg": "ไข่แห่งความสุข",
+  "tag.item.cobblemon.held.power_anklet": "พาวเวอร์แองเกิ้ล",
+  "tag.item.cobblemon.held.power_band": "พาวเวอร์แบนด์",
+  "tag.item.cobblemon.held.power_belt": "พาวเวอร์เบลท์",
+  "tag.item.cobblemon.held.power_bracer": "พาวเวอร์ริสท์",
+  "tag.item.cobblemon.held.power_lens": "พาวเวอร์เลนส์",
+  "tag.item.cobblemon.held.power_weight": "พาวเวอร์เวท",
+  "tag.item.cobblemon.herbs": "สมุนไพร",
+  "tag.item.cobblemon.mint_leaf": "ใบมินต์",
+  "tag.item.cobblemon.mints": "มินต์",
+  "tag.item.cobblemon.mutated_berries": "ผลไม้กลายพันธุ์",
+  "tag.item.cobblemon.plants": "พืช",
+  "tag.item.cobblemon.poke_balls": "มอนสเตอร์บอล",
+  "tag.item.cobblemon.protein_ingredients": "วัตถุดิบโปรตีน",
+  "tag.item.cobblemon.zinc_ingredients": "วัตถุดิบซิงค์",
+  "tag.item.cobblemon.seeds": "เมล็ด",
+
+  "cobblemon.move.pound": "ปัด",
  "cobblemon.move.pound.desc": "ปัดเป้าหมายด้วยหางยาว ขาหน้าหรือสิ่งที่คล้ายกัน",
  "cobblemon.move.karatechop": "คาราเต้ช็อป",
  "cobblemon.move.karatechop.desc": "ผู้ใช้โจมตีเป้าหมายโดยการช็อป ท่านี้ติดคริติคอลได้ง่ายขึ้น",
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "cobblemon:item/keyitems/photodex"
+  }
+}
@@ -0,0 +1,40 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "adorn:cobblemon/apricorn_bench"
+    ]
+  },
+  "criteria": {
+    "has_slab": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": ["cobblemon:apricorn_slab"]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "adorn:cobblemon/apricorn_bench"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_slab",
+      "has_the_recipe"
+    ]
+  ],
+  "fabric:load_conditions": [{
+    "condition": "fabric:all_mods_loaded",
+    "values": ["adorn"]
+  }],
+  "conditions": [{
+    "type": "forge:mod_loaded",
+    "modid": "adorn"
+  }]
+}
--- a/Show More
+++ b/Show More