SUPERMERGE2025: consolidate 2025 PR backlog (no regressions, retro-compatible)#1052
SUPERMERGE2025: consolidate 2025 PR backlog (no regressions, retro-compatible)#1052lamplis wants to merge 23 commits intotcgdex:masterfrom
Conversation
🃏 2321 Cards ChangedDetails: 166 new, 2034 modified, 121 with errors, 32 without images ➕ New card: 226.ts➕ New card: 227.ts➕ New card: 226.ts➕ New card: 227.tsAlakazam (base1-1) (found using en)
File: [data/Base/Base Set/1.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/1.ts) Mewtwo (base1-10) (found using en)
File: [data/Base/Base Set/10.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/10.ts) Lightning Energy (base1-100) (found using en)
File: [data/Base/Base Set/100.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/100.ts) Psychic Energy (base1-101) (found using en)
File: [data/Base/Base Set/101.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/101.ts) Water Energy (base1-102) (found using en)
File: [data/Base/Base Set/102.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/102.ts) Nidoking (base1-11) (found using en)
File: [data/Base/Base Set/11.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/11.ts) Ninetales (base1-12) (found using en)
File: [data/Base/Base Set/12.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/12.ts) Poliwrath (base1-13) (found using en)
File: [data/Base/Base Set/13.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/13.ts) Raichu (base1-14) (found using en)
File: [data/Base/Base Set/14.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/14.ts) Venusaur (base1-15) (found using en)
File: [data/Base/Base Set/15.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/15.ts) Zapdos (base1-16) (found using en)
File: [data/Base/Base Set/16.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/16.ts) Beedrill (base1-17) (found using en)
File: [data/Base/Base Set/17.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/17.ts) Dragonair (base1-18) (found using en)
File: [data/Base/Base Set/18.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/18.ts) Dugtrio (base1-19) (found using en)
File: [data/Base/Base Set/19.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/19.ts) Blastoise (base1-2) (found using en)
File: [data/Base/Base Set/2.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/2.ts) Electabuzz (base1-20) (found using en)
File: [data/Base/Base Set/20.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/20.ts) Electrode (base1-21) (found using en)
File: [data/Base/Base Set/21.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/21.ts) Pidgeotto (base1-22) (found using en)
File: [data/Base/Base Set/22.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/22.ts) Arcanine (base1-23) (found using en)
File: [data/Base/Base Set/23.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/23.ts) Charmeleon (base1-24) (found using en)
File: [data/Base/Base Set/24.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/24.ts) Dewgong (base1-25) (found using en)
File: [data/Base/Base Set/25.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/25.ts) Dratini (base1-26) (found using en)
File: [data/Base/Base Set/26.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/26.ts) Farfetch'd (base1-27) (found using en)
File: [data/Base/Base Set/27.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/27.ts) Growlithe (base1-28) (found using en)
File: [data/Base/Base Set/28.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/28.ts) Haunter (base1-29) (found using en)
File: [data/Base/Base Set/29.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/29.ts) Chansey (base1-3) (found using en)
File: [data/Base/Base Set/3.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/3.ts) Ivysaur (base1-30) (found using en)
File: [data/Base/Base Set/30.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/30.ts) Jynx (base1-31) (found using en)
File: [data/Base/Base Set/31.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/31.ts) Kadabra (base1-32) (found using en)
File: [data/Base/Base Set/32.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/32.ts) Kakuna (base1-33) (found using en)
File: [data/Base/Base Set/33.ts](https://github.com/tcgdex/cards-database/blob/8c1a62105d5964c67a8cc7b05c50bddcf2471b5b/data/Base/Base Set/33.ts)
|
lamplis
force-pushed
the
SUPERMERGE2025
branch
from
ee0f86a to
f7c1731
Compare
|
I refreshed the cards-database layer with the Pokédex tooling (scripts/pokedexIdFixer/*, pokemon-species.json) |
lamplis
force-pushed
the
SUPERMERGE2025
branch
from
f7c1731 to
a9a984c
Compare
|
Removed the stray data/Sword & Shield/SVP Black Star Promos/500.ts left over from earlier typo (SVP lives under Scarlet & Violet). The empty file was causing the Windows compiler to try importing ../../undefined; deleting it fixes the GitHub Actions failure. |
|
Gonna merge each one manually, this is WAY easier to validate than merging one PR with 30k changes |
3 participants
Intent
This PR consolidates the 2025 open PR backlog as safely as possible: no regressions, no API breaking changes, and maximum retro‑compatibility (end‑of‑year stabilization for Avior).
What changed (high level)
dexIdcoverage for Pokémon TCG Pocket (additive-only) and corrected one wrong dexId (Caterpie IR).Card.set_numberandSetResume.abbreviation(kept optional where needed).variants_detailed.image+variants_detailed.thirdParty(additive only).Set.releaseDatenullable (prevents runtime failures; no breaking change).PRs merged
Fix: evolve from data #622 — Fix: evolve from data — Fix: evolve from data #622
Comment: PR was outdated/too broad; salvaged only the valuable
evolveFromfixes to avoid regressions.feat: Add
set_numberto the card endpoint #891 — feat: Addset_numberto the card endpoint — feat: Addset_numberto the card endpoint #891Comment: Implemented
set_numberend‑to‑end (compiler + typings) with regression coverage.fix: Wrong types in Spanish #927 — fix: Wrong types in Spanish — fix: Wrong types in Spanish #927
Comment: Applied only the correct Spanish labels (no unrelated churn).
Feat: Add abbreviation to SetResume #928 — Feat: Add abbreviation to SetResume — Feat: Add abbreviation to SetResume #928
Comment: Implemented
SetResume.abbreviationretro‑compatibly (optional where needed).Add japan exclusive stamp promo #969 — Add japan exclusive stamp promo — Add japan exclusive stamp promo #969
Comment: Added JP S‑P promos; also maintained compatibility via legacy path proxies.
feat: add MEP Black Star Promos cards 011-028 #992 — feat: add MEP Black Star Promos cards 011-028 — feat: add MEP Black Star Promos cards 011-028 #992
Comment: Added MEP 011–028 + translations; included external image zip link (see “Pictures” section).
feat: Add Trainer card legality for reprints + fixing some cards with surnames #996 — feat: Add Trainer card legality for reprints + fixing some cards with surnames — feat: Add Trainer card legality for reprints + fixing some cards with surnames #996
Comment: PR was outdated/risky; salvaged the core idea safely by implementing legality propagation post‑compile (no data regressions).
Feat: Add some foils and stamps support #1006 — Feat: Add some foils and stamps support — Feat: Add some foils and stamps support #1006
Comment: Added new stamp/foil support + translations (additive).
Fix: null releaseDate error in graphql #1008 — Fix: null releaseDate error in graphql — Fix: null releaseDate error in graphql #1008
Comment: GraphQL
releaseDateis now nullable (prevents runtime errors).feat: add dexId (Pokédex ID) to cards #1011 — feat: add dexId (Pokédex ID) to cards — feat: add dexId (Pokédex ID) to cards #1011
Comment: Only added dexId, explicitly did not remove anything else.
feat: add McDonald's Collection sets with translations and dexIds #1015 — feat: add McDonald's Collection sets with translations and dexIds — feat: add McDonald's Collection sets with translations and dexIds #1015
Comment: Added McDonald’s 2022–2024 + FR promo sets, normalized naming, filled dexIds.
Feat: Add pricing to variants_detailed #1022 — Feat: Add pricing & image to variants_detailed — Feat: Add pricing to variants_detailed #1022
Comment: Added
variants_detailed.image+ variant‑level pricing in a backward compatible way.feat(pop5): Add French translations for POP Series 5 #1029 — feat(pop5): Add French translations for POP Series 5 — feat(pop5): Add French translations for POP Series 5 #1029
Comment: Added set/card/attack/effect FR translations.
Fix 3PID for SCR 111 #1038 — Fix 3PID for SCR 111 — Fix 3PID for SCR 111 #1038
Comment: Corrected Cardmarket ID.
Fix wrong Cardmarket ID for SV1/154 #1041 — Fix wrong Cardmarket ID for SV1/154 — Fix wrong Cardmarket ID for SV1/154 #1041
Comment: Corrected Cardmarket ID.
Fix Cardmarket ID for SV1/155 #1042 — Fix Cardmarket ID for SV1/155 — Fix Cardmarket ID for SV1/155 #1042
Comment: Corrected Cardmarket ID.
Fix Cardmarket ID for SV1/156 #1043 — Fix Cardmarket ID for SV1/156 — Fix Cardmarket ID for SV1/156 #1043
Comment: Corrected Cardmarket ID.
Fix Cardmarket ID for BST/158 #1044 — Fix Cardmarket ID for BST/158 — Fix Cardmarket ID for BST/158 #1044
Comment: Corrected Cardmarket ID.
feat(data): Add Italian translations for Base Set #1045 — feat(data): Add Italian translations for Base Set — feat(data): Add Italian translations for Base Set #1045
Comment: Integrated IT translations without breaking existing structure.
fix: TEF - 118 variation mistake #1046 — fix: TEF - 118 variation mistake — fix: TEF - 118 variation mistake #1046
Comment: Corrected the variant type.
feat(svp): Add SVP Black Star Promos cards #1047 — feat(svp): Add SVP Black Star Promos cards — feat(svp): Add SVP Black Star Promos cards #1047
Comment: Added SVP 175/176/219–223 and updated set metadata.
fix: correct dexId for 151 Caterpie IR #1051 — fix: correct dexId for 151 Caterpie IR — fix: correct dexId for 151 Caterpie IR #1051
Comment: Corrected dexId.
Follow-up stabilization commit (post-merges): tests + CI hardening + server stability improvements (unit tests + Bruno regressions + workflow reliability).
PRs not merged
feat: add energies and cards pt #686 — feat: add energies and cards pt — feat: add energies and cards pt #686
Reason: high regression risk (large/outdated data rewrite; likely to overwrite modern fields).
fix: Add evolveFrom for Scalet & Violet set #999 — fix: Add evolveFrom for Scalet & Violet set — fix: Add evolveFrom for Scalet & Violet set #999
Reason: overlaps with the targeted evolveFrom salvage approach; better as a smaller dedicated fix PR.
Feat: POC for linking related objects #1002 — Feat: POC for linking related objects — Feat: POC for linking related objects #1002
Reason: “POC”/experimental surface change; excluded from stabilization.
Feat: Improve card lookup by handling leading zeros in IDs #1012 — Feat: Improve card lookup by handling leading zeros in IDs — Feat: Improve card lookup by handling leading zeros in IDs #1012
Reason: core lookup behavior change; needs separate review + targeted tests.
feat: Refactor variant stamp structure to support details #1018 — feat: Refactor variant stamp structure to support details — feat: Refactor variant stamp structure to support details #1018
Reason: breaking/retro‑compat risk (schema/structure refactor).
fix: Remove old server instructions #1025 — fix: Remove old server instructions — fix: Remove old server instructions #1025
Reason: doc-only and not required for end-of-year stability; keep this PR focused.
feat(pop6): Add French translations for POP Series 6 #1030 — feat(pop6): Add French translations for POP Series 6 — feat(pop6): Add French translations for POP Series 6 #1030
Reason: deferred to reduce scope; should land as its own translation PR.
Fix: Update PHL variants #1039 — Fix: Update PHL variants — Fix: Update PHL variants #1039
Reason: variant model churn / regression risk; skipped for stability.
Fix: Update MEG Variants #1040 — Fix: Update MEG Variants — Fix: Update MEG Variants #1040
Reason: variant model churn / regression risk; skipped for stability.
feat(svp): Add SVP Black Star Promos cards #1048 — feat(svp): Add SVP Black Star Promos cards — feat(svp): Add SVP Black Star Promos cards #1048
Reason: duplicate/outdated relative to feat(svp): Add SVP Black Star Promos cards #1047; keeping one avoids conflicts/regressions.
fix(cardmarket): update idReference for Scarlet & Violet #1049 — fix(cardmarket): update idReference for Scarlet & Violet — fix(cardmarket): update idReference for Scarlet & Violet #1049
Reason: draft PR (excluded by policy).
Pictures to upload
From PR #969 (GitHub attachments)
Source: #969
S-P-JP-226(Cramorant) —https://github.com/user-attachments/assets/42c52dab-9cef-48a1-95bf-fa0bcbe70a8eS-P-JP-227(Pikachu) —https://github.com/user-attachments/assets/0ddbd9b8-681c-4fe4-8f78-686e9cb4546cFrom PR #992 (zip archive)
Source: #992
https://drive.google.com/file/d/1RMPO8m0YOrlFw3JZRivDWodcAVYYGblV/view?usp=sharingmep-011…mep-028(18 cards)From PR #1015 / #1047