Merge remote-tracking branch 'Generations/master'

common/src/main/generated/resources/assets/generations_core/lang/en_us.json

@@ -1371,15 +1371,31 @@
   "block.generations_core.z_crystal_ore": "Z Crystal Ore",
   "block.generations_core.zapdos_doll": "Zapdos Doll",
   "block.generations_core.zeraora_doll": "Zeraora Doll",
+  "cobblemon.move.alluringvoice": "Alluring Voice",
+  "cobblemon.move.alluringvoice.desc": "The user attacks with its angelic voice, and also confuses the target if its stats were boosted during the turn.",
+  "cobblemon.move.alluringvoice.name": "Alluring Voice",
   "cobblemon.move.dragoncheer": "Dragon Cheer",
   "cobblemon.move.dragoncheer.desc": "The user cheers a draconic cry to raise its allies critical hit chance. This rouses Dragon types more.",
   "cobblemon.move.dragoncheer.name": "Dragon Cheer",
   "cobblemon.move.ficklebeam": "Fickle Beam",
   "cobblemon.move.ficklebeam.desc": "Shoots a beam of light to deal damage. Sometimes all the user's heads shoot beams in unison, doubling the power.",
   "cobblemon.move.ficklebeam.name": "Fickle Beam",
+  "cobblemon.move.hardpress": "Hard Press",
+  "cobblemon.move.hardpress.desc": "The target is crushed with an arm, a claw, or the like to inflict damage. The more HP the target has left, the greater the power.",
+  "cobblemon.move.hardpress.name": "Hard Press",
+  "cobblemon.move.psychicnoise": "Psychic Noise",
+  "cobblemon.move.psychicnoise.desc": "The user attacks with unpleasant sound waves, preventing the target from recovering HP through moves, abilities, or held items for two turns.",
+  "cobblemon.move.psychicnoise.name": "Psychic Noise",
   "cobblemon.move.syrupbomb": "Syrup Bomb",
   "cobblemon.move.syrupbomb.desc": "Spews an explosion of sticky syrup onto the target and causes their Speed to drop each turn for three turns.",
   "cobblemon.move.syrupbomb.name": "Syrup Bomb",
+  "cobblemon.move.temperfale.desc": "Spurred by desperation, the user attacks the target. This power is doubled if the previous move failed.",
+  "cobblemon.move.temperflare": "Temper Flare",
+  "cobblemon.move.temperflare.name": "Temper Flare",
+  "cobblemon.move.upperhand": "Upper Hand",
+  "cobblemon.move.upperhand.desc": "The user strikes with the heel of their palm, causing the target to flinch. Fails if the target is not readying a priority move.",
+  "cobblemon.move.upperhand.name": "Upper Hand",
+  "cobblemon.species.ponytagalar.name": "Galarian Ponyta",
   "container.box": "Box",
   "container.charge_stone_blast_furnace": "Charge Stone Blast Furnace",
   "container.charge_stone_furnace": "Charge Stone Furnace",
@@ -3269,5 +3285,63 @@
   "move.learned": "%s has learned %s.",
   "move.newmove1": "1, 2, and... Ta da!",
   "move.newmove2": "%s forgot %s!",
-  "move.newmove3": "...and learned %s!"
+  "move.newmove3": "...and learned %s!",
+  "painting.generations_core.blue_poster.author.author": "Pokemon",
+  "painting.generations_core.blue_poster.title.title": "Blue Poster",
+  "painting.generations_core.blue_poster_sprite.author": "Pokemon",
+  "painting.generations_core.blue_poster_sprite.title": "Blue Poster SPrite",
+  "painting.generations_core.blue_scroll.author": "Pokemon",
+  "painting.generations_core.blue_scroll.title": "Blue Scroll",
+  "painting.generations_core.clefairy_poster_sprite.author": "Pokemon",
+  "painting.generations_core.clefairy_poster_sprite.title": "Clefairy Poster",
+  "painting.generations_core.cute_poster.author": "Pokemon",
+  "painting.generations_core.cute_poster.title": "Cute Poster",
+  "painting.generations_core.cute_poster_sprite.author": "Pokemon",
+  "painting.generations_core.cute_poster_sprite.title": "Cute Poster Sprite",
+  "painting.generations_core.dads_scroll.author": "Pokemon",
+  "painting.generations_core.dads_scroll.title": "Dads Scroll",
+  "painting.generations_core.green_poster.author": "Pokemon",
+  "painting.generations_core.green_poster.title": "Green Poster",
+  "painting.generations_core.green_poster_sprite.author": "Pokemon",
+  "painting.generations_core.green_poster_sprite.title": "Green Poster Sprite",
+  "painting.generations_core.green_scroll.author": "Pokemon",
+  "painting.generations_core.green_scroll.title": "Green Scroll",
+  "painting.generations_core.jigglypuff_poster_sprite.author": "Pokemon",
+  "painting.generations_core.jigglypuff_poster_sprite.title": "Jigglypuff",
+  "painting.generations_core.kiss_poster_sprite.author": "Pokemon",
+  "painting.generations_core.kiss_poster_sprite.title": "Kiss Poster Sprite",
+  "painting.generations_core.long_poster.author": "Pokemon",
+  "painting.generations_core.long_poster.title": "Long Poster",
+  "painting.generations_core.long_poster_sprite.author": "Pokemon",
+  "painting.generations_core.long_poster_sprite.title": "Long Poster Sprite",
+  "painting.generations_core.national_award.author": "Pokemon",
+  "painting.generations_core.national_award.title": "National Award",
+  "painting.generations_core.pika_poster.author": "Pokemon",
+  "painting.generations_core.pika_poster.title": "Pika Poster",
+  "painting.generations_core.pika_poster_sprite.author": "Pokemon",
+  "painting.generations_core.pika_poster_sprite.title": "Pika Poster Sprite",
+  "painting.generations_core.pikachu_poster_sprite.author": "Pokemon",
+  "painting.generations_core.pikachu_poster_sprite.title": "Pikachu Poster Sprite",
+  "painting.generations_core.poke_ball_poster.author": "Pokemon",
+  "painting.generations_core.poke_ball_poster.title": "Poke Ball Poster",
+  "painting.generations_core.red_poster.author": "Pokemon",
+  "painting.generations_core.red_poster.title": "Red Poster",
+  "painting.generations_core.red_poster_sprite.author": "Pokemon",
+  "painting.generations_core.red_poster_sprite.title": "Red Poster Sprite",
+  "painting.generations_core.red_scroll.author": "Pokemon",
+  "painting.generations_core.red_scroll.title": "Red Scroll",
+  "painting.generations_core.regional_award.author": "Pokemon",
+  "painting.generations_core.regional_award.title": "Regional Award",
+  "painting.generations_core.sea_poster.author": "Pokemon",
+  "painting.generations_core.sea_poster.title": "Sea Poster",
+  "painting.generations_core.sea_poster_sprite.author": "Pokemon",
+  "painting.generations_core.sea_poster_sprite.title": "Sea Poster Sprite",
+  "painting.generations_core.sky_poster.author": "Pokemon",
+  "painting.generations_core.sky_poster.title": "Sky Poster",
+  "painting.generations_core.sky_poster_sprite.author": "Pokemon",
+  "painting.generations_core.sky_poster_sprite.title": "Sky Poster Sprite",
+  "painting.generations_core.time_travel_award.author": "Pokemon",
+  "painting.generations_core.time_travel_award.title": "Time Travel Award",
+  "painting.generations_core.town_map_sprite.author": "Pokemon",
+  "painting.generations_core.town_map_sprite.title": "Town Map Sprite"
 }