Merge branch 'beta' into qol/i18n-lazy-loading

2025-08-25 00:39:27 +02:00 · 2024-09-26 07:42:25 -07:00 · 2024-09-26 07:42:25 -07:00 · 3540131e28
commit 3540131e28
parent bf2f4f87c2 af99297e5b
778 changed files with 30127 additions and 256667 deletions
--- a/public/exp-sprites.json
+++ b/public/exp-sprites.json
@ -4633,11 +4633,7 @@
    "690",
    "691",
    "696",
-    "696_3",
-    "696_3",
    "697",
-    "697_3",
-    "697_3",
    "700",
    "704",
    "705_2",
--- a/public/images/pokemon/280.png
+++ b/public/images/pokemon/280.png
--- a/public/images/pokemon/281.png
+++ b/public/images/pokemon/281.png
--- a/public/images/pokemon/282.png
+++ b/public/images/pokemon/282.png
--- a/public/images/pokemon/4145.png
+++ b/public/images/pokemon/4145.png
--- a/public/images/pokemon/4146.png
+++ b/public/images/pokemon/4146.png
--- a/public/images/pokemon/451.json
+++ b/public/images/pokemon/451.json
--- a/public/images/pokemon/451.png
+++ b/public/images/pokemon/451.png
--- a/public/images/pokemon/454.png
+++ b/public/images/pokemon/454.png
--- a/public/images/pokemon/493-fairy.json
+++ b/public/images/pokemon/493-fairy.json
--- a/public/images/pokemon/493-fairy.png
+++ b/public/images/pokemon/493-fairy.png
--- a/public/images/pokemon/582.json
+++ b/public/images/pokemon/582.json
--- a/public/images/pokemon/582.png
+++ b/public/images/pokemon/582.png
--- a/public/images/pokemon/60.png
+++ b/public/images/pokemon/60.png
--- a/public/images/pokemon/62.png
+++ b/public/images/pokemon/62.png
--- a/public/images/pokemon/696.png
+++ b/public/images/pokemon/696.png
--- a/public/images/pokemon/697.png
+++ b/public/images/pokemon/697.png
--- a/public/images/pokemon/773-bug.png
+++ b/public/images/pokemon/773-bug.png
--- a/public/images/pokemon/773-dark.png
+++ b/public/images/pokemon/773-dark.png
--- a/public/images/pokemon/773-dragon.png
+++ b/public/images/pokemon/773-dragon.png
--- a/public/images/pokemon/773-electric.png
+++ b/public/images/pokemon/773-electric.png
--- a/public/images/pokemon/773-fairy.png
+++ b/public/images/pokemon/773-fairy.png
--- a/public/images/pokemon/773-fighting.png
+++ b/public/images/pokemon/773-fighting.png
--- a/public/images/pokemon/773-fire.png
+++ b/public/images/pokemon/773-fire.png
--- a/public/images/pokemon/773-flying.png
+++ b/public/images/pokemon/773-flying.png
--- a/public/images/pokemon/773-ghost.png
+++ b/public/images/pokemon/773-ghost.png
--- a/public/images/pokemon/773-grass.png
+++ b/public/images/pokemon/773-grass.png
--- a/public/images/pokemon/773-ground.png
+++ b/public/images/pokemon/773-ground.png
--- a/public/images/pokemon/773-ice.png
+++ b/public/images/pokemon/773-ice.png
--- a/public/images/pokemon/773-poison.png
+++ b/public/images/pokemon/773-poison.png
--- a/public/images/pokemon/773-psychic.png
+++ b/public/images/pokemon/773-psychic.png
--- a/public/images/pokemon/773-rock.png
+++ b/public/images/pokemon/773-rock.png
--- a/public/images/pokemon/773-steel.png
+++ b/public/images/pokemon/773-steel.png
--- a/public/images/pokemon/773-water.png
+++ b/public/images/pokemon/773-water.png
--- a/public/images/pokemon/773.png
+++ b/public/images/pokemon/773.png
--- a/public/images/pokemon/774-blue.png
+++ b/public/images/pokemon/774-blue.png
--- a/public/images/pokemon/774-green.png
+++ b/public/images/pokemon/774-green.png
--- a/public/images/pokemon/774-indigo.png
+++ b/public/images/pokemon/774-indigo.png
--- a/public/images/pokemon/774-orange.png
+++ b/public/images/pokemon/774-orange.png
--- a/public/images/pokemon/774-red.png
+++ b/public/images/pokemon/774-red.png
--- a/public/images/pokemon/774-violet.png
+++ b/public/images/pokemon/774-violet.png
--- a/public/images/pokemon/774-yellow.png
+++ b/public/images/pokemon/774-yellow.png
--- a/public/images/pokemon/back/280.png
+++ b/public/images/pokemon/back/280.png
--- a/public/images/pokemon/back/281.png
+++ b/public/images/pokemon/back/281.png
--- a/public/images/pokemon/back/282.png
+++ b/public/images/pokemon/back/282.png
--- a/public/images/pokemon/back/4144.png
+++ b/public/images/pokemon/back/4144.png
--- a/public/images/pokemon/back/4145.png
+++ b/public/images/pokemon/back/4145.png
--- a/public/images/pokemon/back/4146.png
+++ b/public/images/pokemon/back/4146.png
--- a/public/images/pokemon/back/451.json
+++ b/public/images/pokemon/back/451.json
--- a/public/images/pokemon/back/451.png
+++ b/public/images/pokemon/back/451.png
--- a/public/images/pokemon/back/493-fairy.json
+++ b/public/images/pokemon/back/493-fairy.json
--- a/public/images/pokemon/back/493-fairy.png
+++ b/public/images/pokemon/back/493-fairy.png
--- a/public/images/pokemon/back/696.png
+++ b/public/images/pokemon/back/696.png
--- a/public/images/pokemon/back/697.png
+++ b/public/images/pokemon/back/697.png
--- a/public/images/pokemon/back/773-bug.png
+++ b/public/images/pokemon/back/773-bug.png
--- a/public/images/pokemon/back/773-dark.png
+++ b/public/images/pokemon/back/773-dark.png
--- a/public/images/pokemon/back/773-dragon.png
+++ b/public/images/pokemon/back/773-dragon.png
--- a/public/images/pokemon/back/773-electric.png
+++ b/public/images/pokemon/back/773-electric.png
--- a/public/images/pokemon/back/773-fairy.png
+++ b/public/images/pokemon/back/773-fairy.png
--- a/public/images/pokemon/back/773-fighting.png
+++ b/public/images/pokemon/back/773-fighting.png
--- a/public/images/pokemon/back/773-fire.png
+++ b/public/images/pokemon/back/773-fire.png
--- a/public/images/pokemon/back/773-flying.png
+++ b/public/images/pokemon/back/773-flying.png
--- a/public/images/pokemon/back/773-ghost.png
+++ b/public/images/pokemon/back/773-ghost.png
--- a/public/images/pokemon/back/773-grass.png
+++ b/public/images/pokemon/back/773-grass.png
--- a/public/images/pokemon/back/773-ground.png
+++ b/public/images/pokemon/back/773-ground.png
--- a/public/images/pokemon/back/773-ice.png
+++ b/public/images/pokemon/back/773-ice.png
--- a/public/images/pokemon/back/773-poison.png
+++ b/public/images/pokemon/back/773-poison.png
--- a/public/images/pokemon/back/773-psychic.png
+++ b/public/images/pokemon/back/773-psychic.png
--- a/public/images/pokemon/back/773-rock.png
+++ b/public/images/pokemon/back/773-rock.png
--- a/public/images/pokemon/back/773-steel.png
+++ b/public/images/pokemon/back/773-steel.png
--- a/public/images/pokemon/back/773-water.png
+++ b/public/images/pokemon/back/773-water.png
--- a/public/images/pokemon/back/773.png
+++ b/public/images/pokemon/back/773.png
--- a/public/images/pokemon/back/774-blue.png
+++ b/public/images/pokemon/back/774-blue.png
--- a/public/images/pokemon/back/774-green.png
+++ b/public/images/pokemon/back/774-green.png
--- a/public/images/pokemon/back/774-indigo.png
+++ b/public/images/pokemon/back/774-indigo.png
--- a/public/images/pokemon/back/774-orange.png
+++ b/public/images/pokemon/back/774-orange.png
--- a/public/images/pokemon/back/774-red.png
+++ b/public/images/pokemon/back/774-red.png
--- a/public/images/pokemon/back/774-violet.png
+++ b/public/images/pokemon/back/774-violet.png
--- a/public/images/pokemon/back/774-yellow.png
+++ b/public/images/pokemon/back/774-yellow.png
--- a/public/images/pokemon/back/shiny/280.png
+++ b/public/images/pokemon/back/shiny/280.png
--- a/public/images/pokemon/back/shiny/281.png
+++ b/public/images/pokemon/back/shiny/281.png
--- a/public/images/pokemon/back/shiny/282.png
+++ b/public/images/pokemon/back/shiny/282.png
--- a/public/images/pokemon/back/shiny/4144.png
+++ b/public/images/pokemon/back/shiny/4144.png
--- a/public/images/pokemon/back/shiny/4145.png
+++ b/public/images/pokemon/back/shiny/4145.png
--- a/public/images/pokemon/back/shiny/4146.png
+++ b/public/images/pokemon/back/shiny/4146.png
--- a/public/images/pokemon/back/shiny/451.json
+++ b/public/images/pokemon/back/shiny/451.json
--- a/public/images/pokemon/back/shiny/451.png
+++ b/public/images/pokemon/back/shiny/451.png
--- a/public/images/pokemon/back/shiny/493-fairy.json
+++ b/public/images/pokemon/back/shiny/493-fairy.json
--- a/public/images/pokemon/back/shiny/493-fairy.png
+++ b/public/images/pokemon/back/shiny/493-fairy.png
--- a/public/images/pokemon/back/shiny/773-bug.png
+++ b/public/images/pokemon/back/shiny/773-bug.png
--- a/public/images/pokemon/back/shiny/773-dark.png
+++ b/public/images/pokemon/back/shiny/773-dark.png
--- a/public/images/pokemon/back/shiny/773-dragon.png
+++ b/public/images/pokemon/back/shiny/773-dragon.png
--- a/public/images/pokemon/back/shiny/773-electric.png
+++ b/public/images/pokemon/back/shiny/773-electric.png
--- a/public/images/pokemon/back/shiny/773-fairy.png
+++ b/public/images/pokemon/back/shiny/773-fairy.png
--- a/public/images/pokemon/back/shiny/773-fighting.png
+++ b/public/images/pokemon/back/shiny/773-fighting.png
--- a/public/images/pokemon/back/shiny/773-fire.png
+++ b/public/images/pokemon/back/shiny/773-fire.png
--- a/public/images/pokemon/back/shiny/773-flying.png
+++ b/public/images/pokemon/back/shiny/773-flying.png
--- a/public/images/pokemon/back/shiny/773-ghost.png
+++ b/public/images/pokemon/back/shiny/773-ghost.png
--- a/public/images/pokemon/back/shiny/773-grass.png
+++ b/public/images/pokemon/back/shiny/773-grass.png
--- a/public/images/pokemon/back/shiny/773-ground.png
+++ b/public/images/pokemon/back/shiny/773-ground.png
--- a/Show More
+++ b/Show More