Merge branch 'master' into master2

2025-11-19 20:28:00 +00:00 · 2024-10-02 18:48:53 +08:00
parent 1f5b90d998 3df291c1f5
commit fdca506d20
63 changed files with 256 additions and 254 deletions
--- a/forge-gui/res/editions/30th
+++ b/forge-gui/res/editions/30th
@@ -6,7 +6,7 @@ Type=Promo
 ScryfallCode=P30A
 [cards]
-1 U Serra Angel @Kev Walker
+1 R Serra Angel @Kev Walker
 2 R Ball Lightning @Trevor Claxton
 3 R Fyndhorn Elves @Igor Kieryluk
 4 R Wall of Roots @Matt Stewart
@@ -22,7 +22,7 @@ ScryfallCode=P30A
 14 R Niv-Mizzet, the Firemind @Daarken
 15 R Tarmogoyf @Ryan Barger
 16 R Glen Elendra Archmage @Warren Mahy
-17 U Acidic Slime @Karl Kopinski
+17 R Acidic Slime @Karl Kopinski
 18 R Terastodon @Lars Grant-West
 19 R Hornet Queen @Martina Pilcerova
 20 R Harvester of Souls @Thomas M. Baxa
--- a/forge-gui/res/editions/Alchemy
+++ b/forge-gui/res/editions/Alchemy
@@ -20,7 +20,7 @@ ScryfallCode=YOTJ
 12 U Impetuous Lootmonger @Inkognit
 13 R Sapphire Collector @Francis Tneh
 14 U Switchgrass Grazer @Leanna Crossan
-15 C Wagon Wrecker @Wero Gallo
+15 R Wagon Wrecker @Wero Gallo
 16 R Blooming Cactusfolk @David Szabo
 17 M Jessie Zane, Fangbringer @Francisco Miyara
 18 R Jet Collector @Francis Tneh
--- a/forge-gui/res/editions/Antiquities.txt
+++ b/forge-gui/res/editions/Antiquities.txt
@@ -99,10 +99,10 @@ ScryfallCode=ATQ
 82b R Strip Mine @Daniel Gelon
 82c R Strip Mine @Daniel Gelon
 82d R Strip Mine @Daniel Gelon
-83a C Urza's Mine @Anson Maddocks
+83a U Urza's Mine @Anson Maddocks
 83b U Urza's Mine @Anson Maddocks
 83c C Urza's Mine @Anson Maddocks
-83d U Urza's Mine @Anson Maddocks
+83d C Urza's Mine @Anson Maddocks
 84a C Urza's Power Plant @Mark Tedin
 84b U Urza's Power Plant @Mark Tedin
 84c C Urza's Power Plant @Mark Tedin
--- a/forge-gui/res/editions/Arabian
+++ b/forge-gui/res/editions/Arabian
@@ -97,7 +97,7 @@ ScryfallCode=ARN
 70 U Bazaar of Baghdad @Jeff A. Menges
 71 U City of Brass @Mark Tedin
 72 C Desert @Jesper Myrfors
-73 U Diamond Valley @Brian Snõddy
+73 R Diamond Valley @Brian Snõddy
 74 R Elephant Graveyard @Rob Alexander
 75 R Island of Wak-Wak @Douglas Shuler
 76 U Library of Alexandria @Mark Poole
--- a/forge-gui/res/editions/Astral
+++ b/forge-gui/res/editions/Astral
@@ -3,6 +3,7 @@ Code=PAST
 Date=1997-04-01
 Name=Astral Cards
 Type=Funny
 ScryfallCode=PAST
 [cards]
 1 C Aswan Jaguar @Pat Lewis
--- a/forge-gui/res/editions/Bloomburrow
+++ b/forge-gui/res/editions/Bloomburrow
@@ -139,7 +139,7 @@ ScryfallCode=BLC
 131 R Exotic Orchard @Ron Spears
 132 U Reliquary Tower @Jesper Ejsing
 133 R Swarmyard @Volkan Baǵa
-134 U Angel of the Ruins @Viko Menezes
+134 R Angel of the Ruins @Viko Menezes
 135 U Baird, Steward of Argive @Christine Choi
 136 R Blade Splicer @Greg Staples
 137 R Boss's Chauffeur @Yangtian Li
@@ -150,7 +150,7 @@ ScryfallCode=BLC
 142 R Jazal Goldmane @Aaron Miller
 143 R Loran of the Third Path @Steven Belledin
 144 M Luminous Broodmoth @Lie Setiawan
-145 R Mangara, the Diplomat @Howard Lyon
+145 M Mangara, the Diplomat @Howard Lyon
 146 R Martial Coup @Greg Staples
 147 U Path to Exile @Raf Sarmento
 148 R Promise of Loyalty @Sara Winters
@@ -203,7 +203,7 @@ ScryfallCode=BLC
 195 R Devilish Valet @Bud Cook
 196 R Etali, Primal Storm @Raymond Swanland
 197 R Gratuitous Violence @Christopher Moeller
-198 R Inferno Titan @Kev Walker
+198 M Inferno Titan @Kev Walker
 199 R Outpost Siege @Daarken
 200 R Rain of Riches @Evyn Fong
 201 R Rose Room Treasurer @David Sladek
@@ -227,7 +227,7 @@ ScryfallCode=BLC
 219 U Garruk's Uprising @Wisnu Tan
 220 R Ghalta, Primal Hunger @Chase Stone
 221 R Gilded Goose @Lindsey Look
-222 U Goreclaw, Terror of Qal Sisma @Svetlin Velinov
+222 R Goreclaw, Terror of Qal Sisma @Svetlin Velinov
 223 R Greater Good @Mathias Kollros
 224 M Grothama, All-Devouring @Mark Behm
 225 R Jolrael, Mwonvuli Recluse @Izzy
@@ -238,7 +238,7 @@ ScryfallCode=BLC
 230 R Managorger Hydra @Lucas Graciano
 231 R Path of Discovery @Howard Lyon
 232 M Primeval Bounty @Christine Choi
-233 R Rampaging Baloths @Steve Prescott
+233 M Rampaging Baloths @Steve Prescott
 234 C Rampant Growth @Steven Belledin
 235 R Rishkar, Peema Renegade @Todd Lockwood
 236 C Sakura-Tribe Elder @Anastasia Ovchinnikova
@@ -277,13 +277,13 @@ ScryfallCode=BLC
 269 U Fellwar Stone @John Avon
 270 R Ghirapur Orrery @Kirsten Zirngibl
 271 R Gilded Lotus @Volkan Baǵa
-272 C Golgari Signet @Raoul Vitale
+272 U Golgari Signet @Raoul Vitale
-273 C Gruul Signet @Efrem Palacios
+273 U Gruul Signet @Efrem Palacios
 274 U Haywire Mite @Izzy
 275 U Hedron Archive @Craig J Spearing
 276 R Helm of the Host @Igor Kieryluk
 277 R Idol of Oblivion @Piotr Dura
-278 C Izzet Signet @Raoul Vitale
+278 U Izzet Signet @Raoul Vitale
 279 R Maskwood Nexus @Jason A. Engle
 280 U Mind Stone @Adam Rex
 281 C Ornithopter of Paradise @Raoul Vitale
@@ -294,7 +294,7 @@ ScryfallCode=BLC
 286 U Swiftfoot Boots @Svetlin Velinov
 287 U Talisman of Impulse @Mike Dringenberg
 288 U Talisman of Resilience @Lindsey Look
-289 U Thought Vessel @rk post
+289 C Thought Vessel @rk post
 290 U Thran Dynamo @Ron Spears
 291 R Adarkar Wastes @Piotr Dura
 292 U Barren Moor @Heather Hudson
@@ -313,7 +313,7 @@ ScryfallCode=BLC
 305 C Forgotten Cave @Tony Szczudlo
 306 R Game Trail @Adam Paquette
 307 R Glacial Fortress @Franz Vohwinkel
-308 C Golgari Rot Farm @John Avon
+308 U Golgari Rot Farm @John Avon
 309 R Grim Backwoods @Vincent Proce
 310 C Gruul Turf @John Avon
 311 C Haunted Mire @Bruce Brenneise
--- a/forge-gui/res/editions/Celebration
+++ b/forge-gui/res/editions/Celebration
@@ -6,7 +6,7 @@ Type=Funny
 ScryfallCode=PCEL
 [cards]
-1 M 1996 World Champion @Christopher Rush
+1 R 1996 World Champion @Christopher Rush
 2 R Shichifukujin Dragon @Christopher Rush
 3 R Proposal @Quinton Hoover
 4 R Splendid Genesis @Monique Thirifay
--- a/forge-gui/res/editions/Coldsnap
+++ b/forge-gui/res/editions/Coldsnap
@@ -13,7 +13,7 @@ ScryfallCode=CST
 20 C Disenchant @Brian Snõddy
 25 U Browse @Phil Foglio
 30b C Lat-Nam's Legacy @Tom Wänerstrand
-34 C Kjeldoran Elite Guard @Melissa A. Benson
+34 U Kjeldoran Elite Guard @Melissa A. Benson
 37 U Storm Elemental @John Matson
 42 U Viscerid Drone @Heather Hudson
 43 U Balduvian Dead @Mike Kimble
--- a/forge-gui/res/editions/Commander
+++ b/forge-gui/res/editions/Commander
@@ -213,7 +213,7 @@ ScryfallCode=C18
 204 U Dreamstone Hedron @Eric Deschamps
 205 R Duplicant @Marco Nelor
 206 U Hedron Archive @Craig J Spearing
-207 U Izzet Signet @Raoul Vitale
+207 C Izzet Signet @Raoul Vitale
 208 U Magnifying Glass @Dan Scott
 209 R Mimic Vat @Matt Cavotta
 210 C Mind Stone @Adam Rex
--- a/forge-gui/res/editions/Commander
+++ b/forge-gui/res/editions/Commander
@@ -129,7 +129,7 @@ ScryfallCode=C19
 120 R Hex @Michael Sutfin
 121 R In Garruk's Wake @Chase Stone
 122 C Murderous Compulsion @David Palumbo
-123 C Nightshade Assassin @Darren Tan
+123 U Nightshade Assassin @Darren Tan
 124 M Ob Nixilis Reignited @Chris Rahn
 125 R Overseer of the Damned @rk post
 126 U Plaguecrafter @Anna Steinbauer
--- a/forge-gui/res/editions/Commander
+++ b/forge-gui/res/editions/Commander
@@ -234,7 +234,7 @@ ScryfallCode=C20
 226 U Nyx Weaver @Jack Wang
 227 R Prophetic Bolt @Slawomir Maniak
 228 U Putrefy @Igor Kieryluk
-229 R Rashmi, Eternities Crafter @Magali Villeneuve
+229 M Rashmi, Eternities Crafter @Magali Villeneuve
 230 U Temur Charm @Mathias Kollros
 231 U Terminate @Lucas Graciano
 232 U Trygon Predator @Jack Wang
--- a/forge-gui/res/editions/Commander
+++ b/forge-gui/res/editions/Commander
@@ -158,7 +158,7 @@ ScryfallCode=C21
 150 U Parasitic Impetus @Mila Pesic
 151 U Reckless Spite @Karl Kopinski
 152 R Sangromancer @Igor Kieryluk
-153 U Sanguine Bond @Jaime Jones
+153 R Sanguine Bond @Jaime Jones
 154 U Silversmote Ghoul @Bryan Sola
 155 U Suffer the Past @Trevor Claxton
 156 R Taste of Death @Chris Rallis
@@ -320,7 +320,7 @@ ScryfallCode=C21
 312 U Rogue's Passage @Christine Choi
 313 U Sapseep Forest @Aleksi Briclot
 314 R Scavenger Grounds @Steven Belledin
-315 C Secluded Steppe @Heather Hudson
+315 U Secluded Steppe @Heather Hudson
 316 R Shivan Reef @Rob Alexander
 317 U Simic Growth Chamber @John Avon
 318 R Slayers' Stronghold @Karl Kopinski
--- a/forge-gui/res/editions/Commander
+++ b/forge-gui/res/editions/Commander
@@ -54,7 +54,7 @@ ScryfallCode=CM2
 46 R Minds Aglow @Yeong-Hao Han
 47 C Mulldrifter @Eric Fortune
 48 R Riddlekeeper @Steve Prescott
-49 U Slipstream Eel @Mark Tedin
+49 C Slipstream Eel @Mark Tedin
 50 U Spell Crumple @Dan Scott
 51 U Tezzeret's Gambit @Karl Kopinski
 52 U Thrummingbird @Efrem Palacios
--- a/forge-gui/res/editions/Commander
+++ b/forge-gui/res/editions/Commander
@@ -6,7 +6,7 @@ Type=Collector_Edition
 ScryfallCode=CC1
 [cards]
-1 R Freyalise, Llanowar's Fury @Kieran Yanner
+1 M Freyalise, Llanowar's Fury @Kieran Yanner
 2 M Omnath, Locus of Mana @Chase Stone
 3 R Bane of Progress @Grzegorz Rutkowski
 4 R Seedborn Muse @Forrest Imel
--- a/forge-gui/res/editions/Commander
+++ b/forge-gui/res/editions/Commander
@@ -9,7 +9,7 @@ DoublePick=Always
 ScryfallCode=CMR
 [cards]
-1 C The Prismatic Piper @Seb McKinnon
+1 S The Prismatic Piper @Seb McKinnon
 2 M Akroma, Vision of Ixidor @Chris Rahn
 3 R Akroma's Will @Antonio José Manzanedo
 4 U Alharu, Solemn Ritualist @Chris Rallis
@@ -487,7 +487,7 @@ ScryfallCode=CMR
 474 U Swiftfoot Boots @Svetlin Velinov
 475 R Sword of Vengeance @Dan Scott
 476 U Blighted Woodland @Jason Felix
-477 C Boros Garrison @John Avon
+477 U Boros Garrison @John Avon
 478 C Boros Guildgate @Noah Bradley
 479 C Command Tower @Ryan Yee
 480 U Coral Atoll @John Avon
@@ -560,7 +560,7 @@ ScryfallCode=CMR
 543 M Zedruu the Greathearted @Mark Zug
 544 M Zur the Enchanter @Josu Hernaiz
 545 M Ramos, Dragon Engine @Joseph Meehan
-546 C The Prismatic Piper @Seb McKinnon
+546 S The Prismatic Piper @Seb McKinnon
 547 M Akroma, Vision of Ixidor @Chris Rahn
 548 U Alharu, Solemn Ritualist @Chris Rallis
 549 U Ardenn, Intrepid Archaeologist @Jason Rainville
--- a/forge-gui/res/editions/Commander
+++ b/forge-gui/res/editions/Commander
@@ -242,7 +242,7 @@ ScryfallCode=CMM
 234 C Impulsive Pilferer @Jakub Kasper
 235 R Inferno Titan @Kev Walker
 236 M Insurrection @Mark Zug
-237 R Kazuul, Tyrant of the Cliffs @Paul Bonner
+237 U Kazuul, Tyrant of the Cliffs @Paul Bonner
 238 R Krenko, Mob Boss @Karl Kopinski
 239 C Living Lightning @Caio Monteiro
 240 U Loyal Apprentice @Joe Slucher
@@ -266,7 +266,7 @@ ScryfallCode=CMM
 258 U Squee, Goblin Nabob @Greg Staples
 259 R Star of Extinction @Chris Rahn
 260 U Storm-Kiln Artist @Manuel Castañón
-261 R Subira, Tulzidi Caravanner @Leesha Hannigan
+261 U Subira, Tulzidi Caravanner @Leesha Hannigan
 262 C Sulfurous Blast @Jeff Miracola
 263 R Tempt with Vengeance @Ryan Barger
 264 C Temur Battle Rage @Jaime Jones
--- a/forge-gui/res/editions/Commander
+++ b/forge-gui/res/editions/Commander
@@ -32,7 +32,7 @@ A23 U Fact or Fiction @Terese Nielsen
 A24 U Hinder @Wayne Reynolds
 A25 C Looter il-Kor @Mike Dringenberg
 A26 C Man-o'-War @Jon J Muth
-A27 C Merfolk Looter @Ron Spencer
+A27 U Merfolk Looter @Ron Spencer
 A28 C Mulldrifter @Eric Fortune
 A29 U Overwhelming Intellect @Alex Horley-Orlandelli
 A30 U Raven Familiar @Edward P. Beard, Jr.
@@ -54,7 +54,7 @@ A45 U Nezumi Graverobber @Jim Nelson
 A46 R Phyrexian Arena @Pete Venters
 A47 C Reaping the Graves @Ron Spencer
 A48 U Shriekmaw @Steve Prescott
-A49 U Stinkweed Imp @Edward P. Beard, Jr.
+A49 C Stinkweed Imp @Edward P. Beard, Jr.
 A50 C Terror @Ron Spencer
 A51 C Twisted Abomination @Daren Bader
 A52 C Anarchist @Brom
--- a/forge-gui/res/editions/Conflux
+++ b/forge-gui/res/editions/Conflux
@@ -6,5 +6,5 @@ Type=Promo
 ScryfallCode=PCON
 [cards]
-117★ R Malfegor @Karl Kopinski
+117★ M Malfegor @Karl Kopinski
 140★ R Obelisk of Alara @John Avon
--- a/forge-gui/res/editions/Double
+++ b/forge-gui/res/editions/Double
@@ -82,7 +82,7 @@ ScryfallCode=2X2
 69 M Bitterblossom @Rebecca Guay
 70 U Blood Artist @LA Draws
 71 C Bloodflow Connoisseur @Slawomir Maniak
-72 U Carrier Thrall @Lius Lasahido
+72 C Carrier Thrall @Lius Lasahido
 73 R Damnation @Kev Walker
 74 C Disfigure @Justin Sweet
 75 C Eyeblight's Ending @Ron Spears
@@ -128,7 +128,7 @@ ScryfallCode=2X2
 115 U Labyrinth Champion @Chase Stone
 116 C Lava Coil @Wesley Burt
 117 U Lightning Bolt @Christopher Moeller
-118 U Living Lightning @Caio Monteiro
+118 C Living Lightning @Caio Monteiro
 119 C Monastery Swiftspear @Steve Argyle
 120 C Pirate's Pillage @Wayne Reynolds
 121 C Purphoros's Emissary @Sam Burley
--- a/forge-gui/res/editions/Duel
+++ b/forge-gui/res/editions/Duel
@@ -15,7 +15,7 @@ ScryfallCode=DVD
 7 U Serra Advocate @Matthew D. Wilson
 8 U Sustainer of the Realm @Mark Zug
 9 U Angel of Mercy @Volkan Baǵa
-10 R Serra Angel @Greg Staples
+10 U Serra Angel @Greg Staples
 11 R Twilight Shepherd @Jason Chan
 12 R Luminous Angel @Jason Chan
 13 R Reya Dawnbringer @Matthew D. Wilson
@@ -47,7 +47,7 @@ ScryfallCode=DVD
 39 U Souldrinker @Dermot Power
 40 U Abyssal Specter @Michael Sutfin
 41 C Cackling Imp @Matt Thompson
-42 R Fallen Angel @Matthew D. Wilson
+42 U Fallen Angel @Matthew D. Wilson
 43 R Reiver Demon @Brom
 44 R Kuro, Pitlord @Jon Foster
 45 C Dark Ritual @Clint Langley
--- a/forge-gui/res/editions/Duel
+++ b/forge-gui/res/editions/Duel
@@ -75,7 +75,7 @@ ScryfallCode=TD2
 67 U Contagion Clasp @Anthony Palumbo
 68 U Mortarpod @Eric Deschamps
 69 U Spawning Pit @Tony Szczudlo
-70 U Exhume @Carl Critchlow
+70 C Exhume @Carl Critchlow
 71 R Phyrexian Altar @Ron Spears
 72 C Morbid Plunder @Mike Bierek
 73 U Putrefy @Jim Nelson
--- a/forge-gui/res/editions/Dungeons
+++ b/forge-gui/res/editions/Dungeons
@@ -142,7 +142,7 @@ ScryfallCode=AFC
 134 R Opportunistic Dragon @Chris Rahn
 135 R Outpost Siege @Daarken
 136 C Rile @Igor Kieryluk
-137 R Scourge of Valkas @Lucas Graciano
+137 M Scourge of Valkas @Lucas Graciano
 138 U Shiny Impetus @Svetlin Velinov
 139 R Shivan Hellkite @Kev Walker
 140 R Skyline Despot @Lucas Graciano
@@ -177,7 +177,7 @@ ScryfallCode=AFC
 169 C Return to Nature @Alayna Danner
 170 R Rishkar's Expertise @Magali Villeneuve
 171 R Shamanic Revelation @Cynthia Sheppard
-172 U Utopia Sprawl @Ron Spears
+172 C Utopia Sprawl @Ron Spears
 173 R Verdant Embrace @Stephen Tappin
 174 C Wild Growth @Tony Szczudlo
 175 M Ashen Rider @Chris Rahn
@@ -212,7 +212,7 @@ ScryfallCode=AFC
 204 R Dragon's Hoard @Adam Paquette
 205 C Explorer's Scope @Vincent Proce
 206 U Fellwar Stone @John Avon
-207 U Gruul Signet @Efrem Palacios
+207 C Gruul Signet @Efrem Palacios
 208 U Heirloom Blade @Carmen Sinek
 209 R Masterwork of Ingenuity @Ulrich Brunin
 210 U Meteor Golem @Lake Hurwitz
@@ -326,7 +326,7 @@ ScryfallCode=AFC
 318 R Hurl Through Hell @Olena Richards
 319 M Karazikar, the Eye Tyrant @Jason A. Engle
 320 M Klauth, Unrivaled Ancient @Andrew Mar
-321 C Klauth's Will @Olivier Bernard
+321 R Klauth's Will @Olivier Bernard
 322 R Midnight Pathlighter @PINDURSKI
 323 M Nihiloor @Chris Rallis
 324 M Prosper, Tome-Bound @Yongjae Choi
--- a/forge-gui/res/editions/Duskmourn
+++ b/forge-gui/res/editions/Duskmourn
@@ -119,7 +119,7 @@ ScryfallCode=DSC
 111 U Archetype of Imagination @Robbie Trevino
 112 R Body of Knowledge @Clint Cearley
 113 C Brainstorm @Willian Murai
-114 C Counterspell @Zack Stella
+114 U Counterspell @Zack Stella
 115 R Dig Through Time @Ryan Yee
 116 M Dream Eater @Daarken
 117 R Extravagant Replication @Pauline Voss
@@ -189,7 +189,7 @@ ScryfallCode=DSC
 181 C Greater Tanuki @Ilse Gort
 182 U Harmonize @Dan Murayama Scott
 183 C Harrow @Rob Alexander
-184 M Hornet Queen @Jonathan Kuo
+184 R Hornet Queen @Jonathan Kuo
 185 M Hydra Omnivore @Svetlin Velinov
 186 R Inscription of Abundance @Zoltan Boros
 187 M Ishkanah, Grafwidow @Christine Choi
@@ -284,7 +284,7 @@ ScryfallCode=DSC
 276 R Flooded Grove @Dave Kendall
 277 R Foreboding Ruins @Adam Paquette
 278 C Geothermal Bog @Gabor Szikszai
-279 C Golgari Rot Farm @John Avon
+279 U Golgari Rot Farm @John Avon
 280 R Graven Cairns @Anthony S. Waters
 281 R Grim Backwoods @Vincent Proce
 282 C Halimar Depths @Volkan Baǵa
--- a/forge-gui/res/editions/Duskmourn
+++ b/forge-gui/res/editions/Duskmourn
@@ -210,7 +210,7 @@ ScryfallCode=DSK
 202 M Tyvar, the Pummeler @Olivier Bernard
 203 U Under the Skin @Fernando Falcone
 204 R Valgavoth's Onslaught @Lie Setiawan
-205 M Walk-in Closet @Miklós Ligeti
+205 M Walk-In Closet @Miklós Ligeti
 206 C Wary Watchdog @Olivier Bernard
 207 U Wickerfolk Thresher @WolfSkullJack
 208 U Arabella, Abandoned Doll @J.P. Targete
@@ -394,7 +394,7 @@ ScryfallCode=DSK
 338 M Funeral Room @Alexandre Chaudret
 339 R Unholy Annex @Alexis Ziritt
 340 M Charred Foyer @Oliver Barrett
-341 M Walk-in Closet @Bastien Grivet
+341 M Walk-In Closet @Bastien Grivet
 342 R Restricted Office @Scott Buoncristiano
 343 R Roaring Furnace @Toni Infante
 344 M Abhorrent Oculus @Igor Krstic
--- a/forge-gui/res/editions/Game
+++ b/forge-gui/res/editions/Game
@@ -12,6 +12,6 @@ ScryfallCode=GDY
 4 R Touch the Spirit Realm @Mila Pesic
 5 R Workshop Warchief @Maxime Minard
 6 M Shivan Devastator @Aldo Domínguez
-7 U Recruitment Officer @Zoltan Boros
+7 R Recruitment Officer @Zoltan Boros
 8 R Braids, Arisen Nightmare @Anastasia Balakchina
 9 M Surge Engine @Volkan Baga
--- a/forge-gui/res/editions/Game
+++ b/forge-gui/res/editions/Game
@@ -30,7 +30,7 @@ ScryfallCode=GN3
 22 U Angler Drake @Svetlin Velinov
 23 R Angler Turtle @Alex Konstad
 24 U Brineborn Cutthroat @Caio Monteiro
-25 C Counterspell @Zack Stella
+25 U Counterspell @Zack Stella
 26 R Diluvian Primordial @Stephan Martiniere
 27 U Fact or Fiction @Matt Cavotta
 28 U Fog Bank @Howard Lyon
@@ -52,17 +52,17 @@ ScryfallCode=GN3
 44 C Bushmeat Poacher @Randy Vargas
 45 R Demon of Loathing @Tomasz Jedruszek
 46 R Demonic Embrace @Sidharth Chaturvedi
-47 U Doom Blade @Chippy
+47 C Doom Blade @Chippy
 48 C Doomed Dissenter @Tony Foti
 49 C Dusk Legion Zealot @Winona Nelson
-50 U Fleshbag Marauder @Mark Zug
+50 C Fleshbag Marauder @Mark Zug
 51 C Gavony Unhallowed @Christopher Moeller
 52 U Gifted Aetherborn @Ryan Yee
 53 R Gravewaker @Daniel Ljunggren
 54 R Liliana's Mastery @Kieran Yanner
 55 U Lord of the Accursed @Grzegorz Rutkowski
 56 C Maalfeld Twins @Mike Sass
-57 C Moan of the Unhallowed @Nils Hamm
+57 U Moan of the Unhallowed @Nils Hamm
 58 R Priest of the Blood Rite @David Palumbo
 59 U Ravenous Chupacabra @Daarken
 60 U Reassembling Skeleton @Austin Hsu
--- a/forge-gui/res/editions/Global
+++ b/forge-gui/res/editions/Global
@@ -41,7 +41,7 @@ ScryfallCode=GS1
 33 C Breath of Fire @Xin-Yu Liu
 34 C Aggressive Instinct @Wolk Sheep
 35 C Confidence from Strength @Shinchuen Chen
-36 M Journey for the Elixir @Qiu De En
+36 R Journey for the Elixir @Qiu De En
 37 C Cleansing Screech @Tingting Yeh
 38 C Timber Gorge @Babyson Chen & Uzhen Lin
 39 L Mountain @Gaga Zeng
--- a/forge-gui/res/editions/Grand
+++ b/forge-gui/res/editions/Grand
@@ -15,7 +15,7 @@ ScryfallCode=PGPX
 2012a R Goblin Guide @Steve Prescott
 2012b R Lotus Cobra @Terese Nielsen
 2013a M Primeval Titan @Peter Mohrbacher
-2013b R All Is Dust @Vincent Proce
+2013b M All Is Dust @Vincent Proce
 2014 M Batterskull @Igor Kieryluk
 2015 M Griselbrand @Jaime Jones
 2016 R Stoneforge Mystic @Johannes Voss
--- a/forge-gui/res/editions/Guildpact
+++ b/forge-gui/res/editions/Guildpact
@@ -7,4 +7,4 @@ ScryfallCode=PGPT
 [cards]
 142★ R Djinn Illuminatus @Michael Sutfin
-144★ R Gruul Guildmage @Paolo Parente
+144★ U Gruul Guildmage @Paolo Parente
--- a/forge-gui/res/editions/Historic
+++ b/forge-gui/res/editions/Historic
@@ -17,7 +17,7 @@ ScryfallCode=HA5
 9 U Whirler Rogue @Winona Nelson
 10 M Sheoldred, Whispering One @Jana Schirmer & Johannes Voss
 11 C Vault Skirge @Brad Rigney
-12 U Ancient Grudge @Ryan Yee
+12 C Ancient Grudge @Ryan Yee
 13 R Dragonstorm @Kev Walker
 14 U Trash for Treasure @Lars Grant-West
 15 M Urabrask the Hidden @Brad Rigney
--- a/forge-gui/res/editions/Historic
+++ b/forge-gui/res/editions/Historic
@@ -14,7 +14,7 @@ ScryfallCode=HA6
 6 M Go-Shintai of Life's Origin @Alexander Mokhov
 7 M Tarmogoyf @Filip Burburan
 8 R Glimpse the Unthinkable @Brandon Kitkouski
-9 M Chalice of the Void @Mark Zug
+9 R Chalice of the Void @Mark Zug
 10 R Retrofitter Foundry @Dmitry Burmak
 11 C Darkmoss Bridge @Raoul Vitale
 12 C Drossforge Bridge @Raoul Vitale
--- a/forge-gui/res/editions/Innistrad
+++ b/forge-gui/res/editions/Innistrad
@@ -101,7 +101,7 @@ ScryfallCode=VOC
 93 R Mentor of the Meek @Jana Schirmer & Johannes Voss
 94 R Mirror Entity @Zoltan Boros & Gabor Szikszai
 95 R Oyobi, Who Split the Heavens @Christopher Moeller
-96 U Promise of Bunrei @Stephen Tappin
+96 R Promise of Bunrei @Stephen Tappin
 97 R Remorseful Cleric @Grzegorz Rutkowski
 98 U Spectral Shepherd @Johann Bodin
 99 U Swords to Plowshares @Jesper Ejsing
@@ -185,7 +185,7 @@ ScryfallCode=VOC
 177 C Path of Ancestry @Alayna Danner
 178 R Port Town @Kamila Szutenberg
 179 R Prairie Stream @Adam Paquette
-180 U Rakdos Carnarium @John Avon
+180 C Rakdos Carnarium @John Avon
 181 R Shadowblood Ridge @Sam White
 182 R Skycloud Expanse @Sam White
 183 R Smoldering Marsh @Adam Paquette
--- a/forge-gui/res/editions/Judge
+++ b/forge-gui/res/editions/Judge
@@ -7,7 +7,7 @@ ScryfallCode=PJ21
 [cards]
 1 M Morophon, the Boundless @Svetlin Velinov
-2 M K'rrik, Son of Yawgmoth @Daniel Ljunggren
+2 R K'rrik, Son of Yawgmoth @Daniel Ljunggren
 3 M Edgar Markov @Martina Fackova
 4 M Ezuri, Claw of Progress @Livia Prima
 5 M The Gitrog Monster @Nils Hamm
--- a/forge-gui/res/editions/Jumpstart.txt
+++ b/forge-gui/res/editions/Jumpstart.txt
@@ -481,7 +481,7 @@ ScryfallCode=JMP
 473 C Marauder's Axe @Mitchell Malloy
 474 U Meteor Golem @Lake Hurwitz
 475 C Myr Sire @Jaime Jones
-476 U Perilous Myr @Jason Felix
+476 C Perilous Myr @Jason Felix
 477 C Pirate's Cutlass @John Stanko
 478 C Prophetic Prism @John Avon
 479 U Rogue's Gloves @Cyril Van Der Haegen
--- a/forge-gui/res/editions/Khans
+++ b/forge-gui/res/editions/Khans
@@ -306,7 +306,7 @@ ScryfallCode=KTK
 211y R Villainous Wealth @Josu Solano
 218y U Cranial Archive @Igor Krstic
 236y U Mystic Monastery @Josu Solano
-237y C Nomad Outpost @Kamila Szutenberg
+237y U Nomad Outpost @Kamila Szutenberg
 [tokens]
 w_3_4_bird_flying
--- a/forge-gui/res/editions/Legacy
+++ b/forge-gui/res/editions/Legacy
@@ -9,27 +9,27 @@ ScryfallCode=OLGC
 2011 R Force of Will @Matt Stewart
 2012 R Brainstorm @Chris Rahn
 2013 U Wasteland @Steven Belledin
-2014 M Gaea's Cradle @Filip Burburan
+2014 S Gaea's Cradle @Filip Burburan
-2015 M Tundra @Raoul Vitale
+2015 S Tundra @Raoul Vitale
-2016EU M Underground Sea @Filip Burburan
+2016EU S Underground Sea @Filip Burburan
-2016NA M Badlands @Filip Burburan
+2016NA S Badlands @Filip Burburan
-2017EU M Taiga @Mark Poole
+2017EU S Taiga @Mark Poole
-2017NA M Savannah @Mark Poole
+2017NA S Savannah @Mark Poole
-2018 M Scrubland @Mark Poole
+2018 S Scrubland @Mark Poole
-2018A M Plateau @Mark Poole
+2018A S Plateau @Mark Poole
-2018NA M Volcanic Island @Mark Poole
+2018NA S Volcanic Island @Mark Poole
 2019 M Tropical Island @Mark Poole
-2019A M Bayou @Raoul Vitale
+2019A S Bayou @Raoul Vitale
-2019NA M City of Traitors @Ralph Horsley
+2019NA S City of Traitors @Ralph Horsley
 2020A M Karakas @Rob Alexander
 2020B M Rishadan Port @Chris Seaman
 2020C M Maze of Ith @Milivoj Ćeran
 2021A M Wasteland @Mark Tedin
 2021B M Bayou @Sidharth Chaturvedi
 2021C M Sylvan Library @Raoul Vitale
-2022A M Gaea's Cradle @Ralph Horsley
+2022A S Gaea's Cradle @Ralph Horsley
-2022B M Scrubland @Raoul Vitale
+2022B S Scrubland @Raoul Vitale
-2022C M The Tabernacle at Pendrell Vale @Milivoj Ćeran
+2022C S The Tabernacle at Pendrell Vale @Milivoj Ćeran
 2023 M Lightning Bolt @rk post
 2023A M Volcanic Island @Mark Tedin
 2023EU M Force of Will @Alan Pollack
--- a/forge-gui/res/editions/Legendary
+++ b/forge-gui/res/editions/Legendary
@@ -7,7 +7,7 @@ Type=Online
 ScryfallCode=PZ1
 [cards]
-1 R Bastion Protector @Victor Adame Minguez
+1 U Bastion Protector @Victor Adame Minguez
 2 R Containment Priest @John Stanko
 3 R Dawnbreak Reclaimer @Tyler Jacobson
 4 U Ghostly Prison @Wayne England
@@ -134,7 +134,7 @@ ScryfallCode=PZ1
 125 R Sandstone Oracle @Eric Deschamps
 126 R Scroll Rack @Heather Hudson
 127 R Scytheclaw @James Paick
-128 U Seal of the Guildpact @Franz Vohwinkel
+128 R Seal of the Guildpact @Franz Vohwinkel
 129 U Sol Ring @Mike Bierek
 130 U Swiftfoot Boots @Svetlin Velinov
 131 U Thought Vessel @rk post
--- a/forge-gui/res/editions/M19
+++ b/forge-gui/res/editions/M19
@@ -7,8 +7,8 @@ Type=Promo
 ScryfallCode=g18
 [cards]
-GP1 S Angelic Guardian @Sara Winters
+GP1 R Angelic Guardian @Sara Winters
-GP2 S Angler Turtle @Alex Konstad
+GP2 R Angler Turtle @Alex Konstad
-GP3 S Vengeant Vampire @Mitchell Malloy
+GP3 R Vengeant Vampire @Mitchell Malloy
-GP4 S Immortal Phoenix @Daarken
+GP4 R Immortal Phoenix @Daarken
-GP5 S Rampaging Brontodon @Lars Grant-West
+GP5 R Rampaging Brontodon @Lars Grant-West
--- a/forge-gui/res/editions/Magic
+++ b/forge-gui/res/editions/Magic
@@ -8,7 +8,7 @@ ScryfallCode=CP1
 [cards]
 1 R Prognostic Sphinx @Jesper Ejsing
 2 R Fated Intervention @Eric Deschamps
-3 R Font of Fertility @Jung Park
+3 C Font of Fertility @Jung Park
 4 R Hydra Broodmaster @Vincent Proce
 5 R Prophet of Kruphix @Anastasia Ovchinnikova
 6 R Temple of Mystery @Adam Paquette
--- a/forge-gui/res/editions/Magic
+++ b/forge-gui/res/editions/Magic
@@ -29,8 +29,8 @@ B20 C Lava Spike @Mark Tedin
 B21 C Lightning Bolt @Christopher Moeller
 B22 U Magma Jet @Justin Sweet
 B23 U Price of Progress @Richard Kane Ferguson
-B24 C Pyroblast @Kaja Foglio
+B24 U Pyroblast @Kaja Foglio
-B25 C Pyrostatic Pillar @Pete Venters
+B25 U Pyrostatic Pillar @Pete Venters
 B26 C Rift Bolt @Michael Sutfin
 B27 U Aether Vial @Greg Hildebrandt
 B28 C Bonesplitter @Darrell Riche
--- a/forge-gui/res/editions/Magic
+++ b/forge-gui/res/editions/Magic
@@ -7,8 +7,8 @@ CardLang=ja
 ScryfallCode=PMPS07
 [cards]
-1 R Plains @John Avon
+1 L Plains @John Avon
-2 R Island @John Avon
+2 L Island @John Avon
-3 R Swamp @John Avon
+3 L Swamp @John Avon
-4 R Mountain @John Avon
+4 L Mountain @John Avon
-5 R Forest @John Avon
+5 L Forest @John Avon
--- a/forge-gui/res/editions/Magic
+++ b/forge-gui/res/editions/Magic
@@ -7,9 +7,9 @@ CardLang=ja
 ScryfallCode=PMPS08
 [cards]
-1 R Plains @John Avon
+1 L Plains @John Avon
-2 R Island @John Avon
+2 L Island @John Avon
-3 R Swamp @John Avon
+3 L Swamp @John Avon
-4 R Mountain @John Avon
+4 L Mountain @John Avon
-5 R Forest @John Avon
+5 L Forest @John Avon
 A1 R Jaya Ballard, Task Mage @Matt Cavotta
--- a/forge-gui/res/editions/Magic
+++ b/forge-gui/res/editions/Magic
@@ -7,8 +7,8 @@ CardLang=ja
 ScryfallCode=PMPS09
 [cards]
-1 R Plains @Rob Alexander
+1 L Plains @Rob Alexander
-2 R Island @Rob Alexander
+2 L Island @Rob Alexander
-3 R Swamp @Rob Alexander
+3 L Swamp @Rob Alexander
-4 R Mountain @Rob Alexander
+4 L Mountain @Rob Alexander
-5 R Forest @Rob Alexander
+5 L Forest @Rob Alexander
--- a/forge-gui/res/editions/Magic
+++ b/forge-gui/res/editions/Magic
@@ -7,8 +7,8 @@ CardLang=ja
 ScryfallCode=PMPS10
 [cards]
-1 R Plains @John Avon
+1 L Plains @John Avon
-2 R Island @John Avon
+2 L Island @John Avon
-3 R Swamp @John Avon
+3 L Swamp @John Avon
-4 R Mountain @John Avon
+4 L Mountain @John Avon
-5 R Forest @John Avon
+5 L Forest @John Avon
--- a/forge-gui/res/editions/Magic
+++ b/forge-gui/res/editions/Magic
@@ -7,8 +7,8 @@ CardLang=ja
 ScryfallCode=PMPS11
 [cards]
-1 R Plains @Adam Paquette
+1 L Plains @Adam Paquette
-2 R Island @Adam Paquette
+2 L Island @Adam Paquette
-3 R Swamp @Adam Paquette
+3 L Swamp @Adam Paquette
-4 R Mountain @Adam Paquette
+4 L Mountain @Adam Paquette
-5 R Forest @Adam Paquette
+5 L Forest @Adam Paquette
--- a/forge-gui/res/editions/Masterpiece
+++ b/forge-gui/res/editions/Masterpiece
@@ -6,60 +6,60 @@ Type=Collector_Edition
 ScryfallCode=mp2
 [cards]
-1 M Austere Command @Richard Wright
+1 S Austere Command @Richard Wright
-2 M Aven Mindcensor @Jose Cabrera
+2 S Aven Mindcensor @Jose Cabrera
-3 M Containment Priest @Igor Kieryluk
+3 S Containment Priest @Igor Kieryluk
-4 M Loyal Retainers @Bastien L. Deharme
+4 S Loyal Retainers @Bastien L. Deharme
-5 M Oketra the True @Bastien L. Deharme
+5 S Oketra the True @Bastien L. Deharme
-6 M Worship @Cliff Childs
+6 S Worship @Cliff Childs
-7 M Wrath of God @Titus Lunter
+7 S Wrath of God @Titus Lunter
-8 M Consecrated Sphinx @Lius Lasahido
+8 S Consecrated Sphinx @Lius Lasahido
-9 M Counterbalance @Joseph Meehan
+9 S Counterbalance @Joseph Meehan
-10 M Counterspell @Chase Stone
+10 S Counterspell @Chase Stone
-11 M Cryptic Command @Richard Wright
+11 S Cryptic Command @Richard Wright
-12 M Daze @Richard Wright
+12 S Daze @Richard Wright
-13 M Divert @Igor Kieryluk
+13 S Divert @Igor Kieryluk
-14 M Force of Will @Jaime Jones
+14 S Force of Will @Jaime Jones
-15 M Kefnet the Mindful @Jose Cabrera
+15 S Kefnet the Mindful @Jose Cabrera
-16 M Pact of Negation @Titus Lunter
+16 S Pact of Negation @Titus Lunter
-17 M Spell Pierce @Joseph Meehan
+17 S Spell Pierce @Joseph Meehan
-18 M Stifle @Cliff Childs
+18 S Stifle @Cliff Childs
-19 M Attrition @Jose Cabrera
+19 S Attrition @Jose Cabrera
-20 M Bontu the Glorified @Daniel Ljunggren
+20 S Bontu the Glorified @Daniel Ljunggren
-21 M Dark Ritual @Richard Wright
+21 S Dark Ritual @Richard Wright
-22 M Diabolic Intent @Joseph Meehan
+22 S Diabolic Intent @Joseph Meehan
-23 M Entomb @Eytan Zana
+23 S Entomb @Eytan Zana
-24 M Mind Twist @Igor Kieryluk
+24 S Mind Twist @Igor Kieryluk
-25 M Aggravated Assault @Greg Opalinski
+25 S Aggravated Assault @Greg Opalinski
-26 M Chain Lightning @Igor Kieryluk
+26 S Chain Lightning @Igor Kieryluk
-27 M Hazoret the Fervent @Joseph Meehan
+27 S Hazoret the Fervent @Joseph Meehan
-28 M Rhonas the Indomitable @Jack Wang
+28 S Rhonas the Indomitable @Jack Wang
-29 M Maelstrom Pulse @Igor Kieryluk
+29 S Maelstrom Pulse @Igor Kieryluk
-30 M Vindicate @Igor Kieryluk
+30 S Vindicate @Igor Kieryluk
-31 M Armageddon @Florian de Gesincourt
+31 S Armageddon @Florian de Gesincourt
-32 M Capsize @Cliff Childs
+32 S Capsize @Cliff Childs
-33 M Forbid @Richard Wright
+33 S Forbid @Richard Wright
-34 M Omniscience @Josh Hass
+34 S Omniscience @Josh Hass
-35 M Opposition @Svetlin Velinov
+35 S Opposition @Svetlin Velinov
-36 M Sunder @Titus Lunter
+36 S Sunder @Titus Lunter
-37 M Threads of Disloyalty @Yongjae Choi
+37 S Threads of Disloyalty @Yongjae Choi
-38 M Avatar of Woe @Igor Kieryluk
+38 S Avatar of Woe @Igor Kieryluk
-39 M Damnation @Zack Stella
+39 S Damnation @Zack Stella
-40 M Desolation Angel @Bastien L. Deharme
+40 S Desolation Angel @Bastien L. Deharme
-41 M Diabolic Edict @Daarken
+41 S Diabolic Edict @Daarken
-42 M Doomsday @Jaime Jones
+42 S Doomsday @Jaime Jones
-43 M No Mercy @Jonas De Ro
+43 S No Mercy @Jonas De Ro
-44 M Slaughter Pact @Josh Hass
+44 S Slaughter Pact @Josh Hass
-45 M Thoughtseize @James Ryman
+45 S Thoughtseize @James Ryman
-46 M Blood Moon @Christine Choi
+46 S Blood Moon @Christine Choi
-47 M Boil @Philip Straub
+47 S Boil @Philip Straub
-48 M Shatterstorm @Johann Bodin
+48 S Shatterstorm @Johann Bodin
-49 M Through the Breach @Darek Zabrocki
+49 S Through the Breach @Darek Zabrocki
-50 M Choke @Florian de Gesincourt
+50 S Choke @Florian de Gesincourt
-51 M The Locust God @Grzegorz Rutkowski
+51 S The Locust God @Grzegorz Rutkowski
-52 M Lord of Extinction @Jason A. Engle
+52 S Lord of Extinction @Jason A. Engle
-53 M The Scarab God @Grzegorz Rutkowski
+53 S The Scarab God @Grzegorz Rutkowski
-54 M The Scorpion God @Grzegorz Rutkowski
+54 S The Scorpion God @Grzegorz Rutkowski
 [tokens]
 w_1_1_warrior_vigilance
--- a/forge-gui/res/editions/Masterpiece
+++ b/forge-gui/res/editions/Masterpiece
@@ -7,60 +7,60 @@ Type=Collector_Edition
 ScryfallCode=mps
 [cards]
-1 M Cataclysmic Gearhulk @Jason Rainville
+1 S Cataclysmic Gearhulk @Jason Rainville
-2 M Torrential Gearhulk @Jakub Kasper
+2 S Torrential Gearhulk @Jakub Kasper
-3 M Noxious Gearhulk @Vincent Proce
+3 S Noxious Gearhulk @Vincent Proce
-4 M Combustible Gearhulk @Greg Opalinski
+4 S Combustible Gearhulk @Greg Opalinski
-5 M Verdurous Gearhulk @Zack Stella
+5 S Verdurous Gearhulk @Zack Stella
-6 M Aether Vial @Raoul Vitale
+6 S Aether Vial @Raoul Vitale
-7 M Champion's Helm @Lindsey Look
+7 S Champion's Helm @Lindsey Look
-8 M Chromatic Lantern @Yeong-Hao Han
+8 S Chromatic Lantern @Yeong-Hao Han
-9 M Chrome Mox @Kieran Yanner
+9 S Chrome Mox @Kieran Yanner
-10 M Cloudstone Curio @Noah Bradley
+10 S Cloudstone Curio @Noah Bradley
-11 M Crucible of Worlds @Chris Rahn
+11 S Crucible of Worlds @Chris Rahn
-12 M Gauntlet of Power @John Severin Brassell
+12 S Gauntlet of Power @John Severin Brassell
-13 M Hangarback Walker @Adam Paquette
+13 S Hangarback Walker @Adam Paquette
-14 M Lightning Greaves @Slawomir Maniak
+14 S Lightning Greaves @Slawomir Maniak
-15 M Lotus Petal @Slawomir Maniak
+15 S Lotus Petal @Slawomir Maniak
-16 M Mana Crypt @Volkan Baǵa
+16 S Mana Crypt @Volkan Baǵa
-17 M Mana Vault @Kirsten Zirngibl
+17 S Mana Vault @Kirsten Zirngibl
-18 M Mind's Eye @David Gaillet
+18 S Mind's Eye @David Gaillet
-19 M Mox Opal @Chris Rahn
+19 S Mox Opal @Chris Rahn
-20 M Painter's Servant @Magali Villeneuve
+20 S Painter's Servant @Magali Villeneuve
-21 M Rings of Brighthearth @Yeong-Hao Han
+21 S Rings of Brighthearth @Yeong-Hao Han
-22 M Scroll Rack @Jason A. Engle
+22 S Scroll Rack @Jason A. Engle
-23 M Sculpting Steel @Magali Villeneuve
+23 S Sculpting Steel @Magali Villeneuve
-24 M Sol Ring @Volkan Baǵa
+24 S Sol Ring @Volkan Baǵa
-25 M Solemn Simulacrum @Daarken
+25 S Solemn Simulacrum @Daarken
-26 M Static Orb @Tommy Arnold
+26 S Static Orb @Tommy Arnold
-27 M Steel Overseer @Adam Paquette
+27 S Steel Overseer @Adam Paquette
-28 M Sword of Feast and Famine @Steven Belledin
+28 S Sword of Feast and Famine @Steven Belledin
-29 M Sword of Fire and Ice @Volkan Baǵa
+29 S Sword of Fire and Ice @Volkan Baǵa
-30 M Sword of Light and Shadow @Matt Stewart
+30 S Sword of Light and Shadow @Matt Stewart
-31 M Arcbound Ravager @Daarken
+31 S Arcbound Ravager @Daarken
-32 M Black Vise @Igor Kieryluk
+32 S Black Vise @Igor Kieryluk
-33 M Chalice of the Void @Kieran Yanner
+33 S Chalice of the Void @Kieran Yanner
-34 M Defense Grid @Jonas De Ro
+34 S Defense Grid @Jonas De Ro
-35 M Duplicant @Slawomir Maniak
+35 S Duplicant @Slawomir Maniak
-36 M Engineered Explosives @James Paick
+36 S Engineered Explosives @James Paick
-37 M Ensnaring Bridge @Florian de Gesincourt
+37 S Ensnaring Bridge @Florian de Gesincourt
-38 M Extraplanar Lens @Noah Bradley
+38 S Extraplanar Lens @Noah Bradley
-39 M Grindstone @Johann Bodin
+39 S Grindstone @Johann Bodin
-40 M Meekstone @Steve Argyle
+40 S Meekstone @Steve Argyle
-41 M Oblivion Stone @Yeong-Hao Han
+41 S Oblivion Stone @Yeong-Hao Han
-42 M Ornithopter @Howard Lyon
+42 S Ornithopter @Howard Lyon
-43 M Paradox Engine @Vincent Proce
+43 S Paradox Engine @Vincent Proce
-44 M Pithing Needle @Joseph Meehan
+44 S Pithing Needle @Joseph Meehan
-45 M Planar Bridge @Raymond Swanland
+45 S Planar Bridge @Raymond Swanland
-46 M Platinum Angel @Victor Adame Minguez
+46 S Platinum Angel @Victor Adame Minguez
-47 M Sphere of Resistance @Richard Wright
+47 S Sphere of Resistance @Richard Wright
-48 M Staff of Domination @Zezhou Chen
+48 S Staff of Domination @Zezhou Chen
-49 M Sundering Titan @Lius Lasahido
+49 S Sundering Titan @Lius Lasahido
-50 M Sword of Body and Mind @Mark Zug
+50 S Sword of Body and Mind @Mark Zug
-51 M Sword of War and Peace @Filip Burburan
+51 S Sword of War and Peace @Filip Burburan
-52 M Trinisphere @Daniel Ljunggren
+52 S Trinisphere @Daniel Ljunggren
-53 M Vedalken Shackles @Svetlin Velinov
+53 S Vedalken Shackles @Svetlin Velinov
-54 M Wurmcoil Engine @Aleksi Briclot
+54 S Wurmcoil Engine @Aleksi Briclot
 [tokens]
 g_2_2_wolf
--- a/forge-gui/res/editions/Masters
+++ b/forge-gui/res/editions/Masters
@@ -18,7 +18,7 @@ ScryfallCode=A25
 5 M Armageddon @Chris Rahn
 6 C Auramancer @Rebecca Guay
 7 C Cloudshift @Howard Lyon
-8 C Congregate @Mark Zug
+8 U Congregate @Mark Zug
 9 R Darien, King of Kjeldor @Michael Phillippi
 10 C Dauntless Cathar @Zack Stella
 11 R Decree of Justice @Adam Rex
@@ -212,7 +212,7 @@ ScryfallCode=A25
 199 U Boros Charm @Zoltan Boros
 200 R Brion Stoutarm @Zoltan Boros & Gabor Szikszai
 201 U Cloudblazer @Dan Scott
-202 M Conflux @Karl Kopinski
+202 R Conflux @Karl Kopinski
 203 R Eladamri's Call @Kev Walker
 204 M Gisela, Blade of Goldnight @Jason Chan
 205 R Grenzo, Dungeon Warden @Lucas Graciano
--- a/forge-gui/res/editions/Outlaws
+++ b/forge-gui/res/editions/Outlaws
@@ -107,7 +107,7 @@ ScryfallCode=OTC
 99 R Haughty Djinn @Mike Jordana
 100 R Midnight Clock @Alexander Forssberg
 101 M Mind's Dilation @Iain McCaig
-102 U Murmuring Mystic @Mark Winters
+102 C Murmuring Mystic @Mark Winters
 103 R Octavia, Living Thesis @Simon Dominic
 104 C Opt @Dan Murayama Scott
 105 C Ponder @Dan Murayama Scott
@@ -174,7 +174,7 @@ ScryfallCode=OTC
 166 M Finale of Promise @Jaime Jones
 167 U Glittering Stockpile @Brock Grossman
 168 R Grenzo, Havoc Raiser @Svetlin Velinov
-169 C Guttersnipe @Andrey Kuzinskiy
+169 U Guttersnipe @Andrey Kuzinskiy
 170 U Humble Defector @Slawomir Maniak
 171 C Impulsive Pilferer @Nicholas Gregory
 172 R Laurine, the Diversion @Andrey Kuzinskiy
@@ -266,7 +266,7 @@ ScryfallCode=OTC
 258 R Idol of Oblivion @Piotr Dura
 259 C Izzet Signet @Raoul Vitale
 260 U Lightning Greaves @Jeremy Jarvis
-261 C Orzhov Signet @Martina Pilcerova
+261 U Orzhov Signet @Martina Pilcerova
 262 R Perennial Behemoth @Wayne Reynolds
 263 U Perpetual Timepiece @Cliff Childs
 264 U Prismatic Lens @Alan Pollack
@@ -293,7 +293,7 @@ ScryfallCode=OTC
 285 C Desert of the Indomitable @James Paick
 286 C Desert of the True @Jung Park
 287 R Desolate Mire @Rockey Chen
-288 C Dimir Aqueduct @John Avon
+288 U Dimir Aqueduct @John Avon
 289 R Dragonskull Summit @Jon Foster
 290 R Drowned Catacomb @Jung Park
 291 U Dunes of the Dead @E. M. Gist
--- a/forge-gui/res/editions/Phyrexia
+++ b/forge-gui/res/editions/Phyrexia
@@ -109,7 +109,7 @@ ScryfallCode=ONC
 101 R Legion Warboss @Alex Konstad
 102 U Loyal Apprentice @Joe Slucher
 103 R Siege-Gang Commander @Aaron Miller
-104 S Beast Within @Dave Allsop
+104 U Beast Within @Dave Allsop
 105 C Blight Mamba @Drew Baker
 106 U Carrion Call @Adrian Smith
 107 C Cultivate @Anthony Palumbo
--- a/forge-gui/res/editions/Planeshift.txt
+++ b/forge-gui/res/editions/Planeshift.txt
@@ -85,8 +85,8 @@ ScryfallCode=PLS
 71 C Singe @John Avon
 72 C Slingshot Goblin @Jeff Easley
 73 U Strafe @Jim Nelson
 74 S Tahngarth, Talruum Hero @Dave Dorman
 74 R Tahngarth, Talruum Hero @Dave Dorman
 74★ R Tahngarth, Talruum Hero @Dave Dorman
 75 U Thunderscape Battlemage @Mike Ploog
 76 C Thunderscape Familiar @Daren Bader
 77 U Alpha Kavu @Matt Cavotta
@@ -120,7 +120,7 @@ ScryfallCode=PLS
 105 U Dromar's Charm @David Martin
 106 R Eladamri's Call @Kev Walker
 107 R Ertai, the Corrupted @Mark Tedin
-107 S Ertai, the Corrupted @Mark Tedin
+107★ R Ertai, the Corrupted @Mark Tedin
 108 U Fleetfoot Panther @Mark Brill
 109 C Gerrard's Command @Roger Raupp
 110 C Horned Kavu @Michael Sutfin
@@ -147,7 +147,7 @@ ScryfallCode=PLS
 131 R Draco @Sam Wood
 132 U Mana Cylix @Donato Giancola
 133 R Skyship Weatherlight @Mark Tedin
-133 S Skyship Weatherlight @Mark Tedin
+133★ R Skyship Weatherlight @Mark Tedin
 134 U Star Compass @Donato Giancola
 135 U Stratadon @Brian Snõddy
 136 U Crosis's Catacombs @Edward P. Beard, Jr.
--- a/forge-gui/res/editions/Ravnica
+++ b/forge-gui/res/editions/Ravnica
@@ -70,7 +70,7 @@ ScryfallCode=CLU
 62 U Glorifier of Dusk @Viktor Titov
 63 C Gods Willing @Mark Winters
 64 C Law-Rune Enforcer @Eric Deschamps
-65 U Martial Impetus @Aaron Miller
+65 C Martial Impetus @Aaron Miller
 66 C Mighty Leap @rk post
 67 U Oust @Mike Bierek
 68 C Parhelion Patrol @Even Amundsen
@@ -97,7 +97,7 @@ ScryfallCode=CLU
 89 C Leapfrog @Aaron Miller
 90 C Owl Familiar @Janine Johnston
 91 C Passwall Adept @John Thacker
-92 U Psychic Impetus @Lindsey Look
+92 C Psychic Impetus @Lindsey Look
 93 U Rapid Hybridization @Jack Wang
 94 C Repeal @Dan Scott
 95 U Rescuer Sphinx @Jesper Ejsing
--- a/forge-gui/res/editions/Saviors
+++ b/forge-gui/res/editions/Saviors
@@ -7,4 +7,4 @@ ScryfallCode=PSOK
 [cards]
 18★ R Kiyomaro, First to Stand @Ittoku
-99★ R Ghost-Lit Raider @Ittoku
+99★ U Ghost-Lit Raider @Ittoku
--- a/forge-gui/res/editions/Sega
+++ b/forge-gui/res/editions/Sega
@@ -3,6 +3,7 @@ Code=PSDG
 Date=2001-06-28
 Name=Sega Dreamcast Cards
 Type=Promo
 ScryfallCode=PSDG
 [cards]
 1 R Arden Angel @Greg Staples
--- a/forge-gui/res/editions/Signature
+++ b/forge-gui/res/editions/Signature
@@ -10,7 +10,7 @@ ScryfallCode=SS3
 2 R Cathartic Reunion @Howard Lyon
 3 R Fiery Confluence @Micah Epstein
 4 M Past in Flames @Josu Hernaiz
-5 M Pyroblast @Yongjae Choi
+5 R Pyroblast @Yongjae Choi
 6 R Pyromancer Ascension @Karl Kopinski
 7 R Rite of Flame @Kieran Yanner
 8 R Young Pyromancer @Cynthia Sheppard
--- a/forge-gui/res/editions/Streets
+++ b/forge-gui/res/editions/Streets
@@ -290,7 +290,7 @@ ScryfallCode=NCC
 282 U Beast Within @Jesper Ejsing
 283 R Beastmaster Ascension @Alex Horley-Orlandelli
 284 R Champion of Lambholt @Christopher Moeller
-285 U Cultivate @Anthony Palumbo
+285 C Cultivate @Anthony Palumbo
 286 U Devoted Druid @Kimonas Theodossiou
 287 U Evolution Sage @Simon Dominic
 288 R Evolutionary Leap @Chris Rahn
@@ -356,7 +356,7 @@ ScryfallCode=NCC
 348 U Primal Empathy @Micah Epstein
 349 M Roalesk, Apex Hybrid @Svetlin Velinov
 350 R Selvala, Explorer Returned @Tyler Jacobson
-351 U Shadowmage Infiltrator @Tomasz Jedruszek
+351 R Shadowmage Infiltrator @Tomasz Jedruszek
 352 R Silent-Blade Oni @Steve Prescott
 353 U Terminate @Lucas Graciano
 354 R Thief of Sanity @Igor Kieryluk
@@ -371,10 +371,10 @@ ScryfallCode=NCC
 363 C Commander's Sphere @Ryan Alexander Lee
 364 R Crystalline Giant @Jason Rainville
 365 C Dimir Signet @Raoul Vitale
-366 C Everflowing Chalice @Steve Argyle
+366 U Everflowing Chalice @Steve Argyle
 367 U Fellwar Stone @John Avon
 368 R Idol of Oblivion @Piotr Dura
-369 U Izzet Signet @Raoul Vitale
+369 C Izzet Signet @Raoul Vitale
 370 R Lifecrafter's Bestiary @Izzy
 371 U Lightning Greaves @Jeremy Jarvis
 372 R Mimic Vat @Donato Giancola
--- a/forge-gui/res/editions/Tenth
+++ b/forge-gui/res/editions/Tenth
@@ -6,6 +6,6 @@ Type=Promo
 ScryfallCode=P10E
 [cards]
-1 R Faerie Conclave @Stephan Martiniere
+1 U Faerie Conclave @Stephan Martiniere
-2 R Treetop Village @Rob Alexander
+2 U Treetop Village @Rob Alexander
 35 R Reya Dawnbringer @Matthew D. Wilson
--- a/forge-gui/res/editions/The
+++ b/forge-gui/res/editions/The
@@ -136,7 +136,7 @@ ScryfallCode=BRC
 130 M Sphinx's Revelation @John Di Giovanni
 131 R Vindicate @Brian Snõddy
 132 C Arcane Signet @Dan Scott
-133 U Azorius Signet @Raoul Vitale
+133 C Azorius Signet @Raoul Vitale
 134 U Chief of the Foundry @Daniel Ljunggren
 135 C Commander's Sphere @Ryan Alexander Lee
 136 U Cranial Plating @Adam Rex
@@ -159,7 +159,7 @@ ScryfallCode=BRC
 153 R Oblivion Stone @Gabor Szikszai
 154 C Orzhov Signet @Martina Pilcerova
 155 C Prophetic Prism @John Avon
-156 U Rakdos Signet @Martina Pilcerova
+156 C Rakdos Signet @Martina Pilcerova
 157 U Relic of Progenitus @Jean-Sébastien Rossbach
 158 U Servo Schematic @Titus Lunter
 159 U Skullclamp @Daniel Ljunggren
--- a/forge-gui/res/editions/The
+++ b/forge-gui/res/editions/The
@@ -520,7 +520,7 @@ ScryfallCode=LTC
 512 R Mordor on the March @Campbell White
 513 R Fell Beast of Mordor @Campbell White
 514 R Minas Morgul, Dark Fortress @Campbell White
-515 R Kenrith, the Returned King @Greg Hildebrandt & Tim Hildebrandt
+515 M Kenrith, the Returned King @Greg Hildebrandt & Tim Hildebrandt
 516 M Ishkanah, Grafwidow @Greg Hildebrandt & Tim Hildebrandt
 517 R Doran, the Siege Tower @Greg Hildebrandt & Tim Hildebrandt
 518 R Hammerheim @Greg Hildebrandt & Tim Hildebrandt
@@ -534,7 +534,7 @@ ScryfallCode=LTC
 526 M Diabolic Intent @Greg Hildebrandt & Tim Hildebrandt
 527 U Elvish Harbinger @Greg Hildebrandt & Tim Hildebrandt
 528 U Explore @Greg Hildebrandt & Tim Hildebrandt
-529 M Seasons Past @Greg Hildebrandt & Tim Hildebrandt
+529 R Seasons Past @Greg Hildebrandt & Tim Hildebrandt
 530 R Second Harvest @Greg Hildebrandt & Tim Hildebrandt
 531 M Sylvan Tutor @Greg Hildebrandt & Tim Hildebrandt
 532 U Tempt with Discovery @Greg Hildebrandt & Tim Hildebrandt
--- a/forge-gui/res/editions/The
+++ b/forge-gui/res/editions/The
@@ -133,7 +133,7 @@ ScryfallCode=LCC
 125 R Akroma's Will @Antonio José Manzanedo
 126 R Austere Command @Anna Steinbauer
 127 U Bellowing Aegisaur @Craig J Spearing
-128 C Generous Gift @Kev Walker
+128 U Generous Gift @Kev Walker
 129 R Kindred Boon @Carlos Palma Cruchaga
 130 R Kinjalli's Sunwing @Simon Dominic
 131 U Majestic Heliopterus @Filip Burburan
@@ -144,7 +144,7 @@ ScryfallCode=LCC
 136 U Return to Dust @Anato Finnstark
 137 U Swords to Plowshares @Jesper Ejsing
 138 R Temple Altisaur @Daarken
-139 R Wakening Sun's Avatar @Tyler Jacobson
+139 M Wakening Sun's Avatar @Tyler Jacobson
 140 R Welcoming Vampire @Lorenzo Mastroianni
 141 R Zetalpa, Primal Dawn @Chris Rallis
 142 U Aetherize @Alexandre Honoré
@@ -219,7 +219,7 @@ ScryfallCode=LCC
 211 M Twilight Prophet @Seb McKinnon
 212 C Village Rites @Igor Kieryluk
 213 C Viscera Seer @John Stanko
-214 U Yahenni, Undying Partisan @Lius Lasahido
+214 R Yahenni, Undying Partisan @Lius Lasahido
 215 R Angrath's Marauders @Victor Adame Minguez
 216 R Blasphemous Act @Daarken
 217 U Breeches, Brazen Plunderer @Svetlin Velinov
@@ -301,7 +301,7 @@ ScryfallCode=LCC
 293 M Vona, Butcher of Magan @Volkan Baǵa
 294 R Vorel of the Hull Clade @Mike Bierek
 295 M Xenagos, God of Revels @Jason Chan
-296 R Zacama, Primal Calamity @Jaime Jones
+296 M Zacama, Primal Calamity @Jaime Jones
 297 R Zara, Renegade Recruiter @Chris Rallis
 298 R Zegana, Utopian Speaker @Slawomir Maniak
 299 C Arcane Signet @Dan Scott
--- a/forge-gui/res/editions/Time
+++ b/forge-gui/res/editions/Time
@@ -280,13 +280,13 @@ ScryfallCode=TSR
 270 R Lotus Bloom @Mark Zug
 271 U Paradise Plume @Wayne England
 272 C Prismatic Lens @Alan Pollack
-273 C Sliversmith @John Avon
+273 U Sliversmith @John Avon
 274 R Stuffy Doll @Dave Allsop
 275 U Calciform Pools @Darrell Riche
 276 U Dreadship Reef @Lars Grant-West
 277 R Dryad Arbor @Eric Fortune
 278 R Flagstones of Trokair @Rob Alexander
-279 C Fungal Reaches @Martina Pilcerova
+279 U Fungal Reaches @Martina Pilcerova
 280 M Gemstone Caverns @Martina Pilcerova
 281 R Kher Keep @Paolo Parente
 282 U Molten Slagheap @Daren Bader
--- a/forge-gui/res/editions/Wilds
+++ b/forge-gui/res/editions/Wilds
@@ -153,7 +153,7 @@ ScryfallCode=WOC
 145 C Arcane Signet @Dan Scott
 146 U Dimir Signet @Raoul Vitale
 147 U Fellwar Stone @John Avon
-148 C Mind Stone @Adam Rex
+148 U Mind Stone @Adam Rex
 149 U Sol Ring @Mike Bierek
 150 U Talisman of Dominance @Mike Dringenberg
 151 C Wayfarer's Bauble @Darrell Riche
--- a/forge-gui/res/editions/Zendikar
+++ b/forge-gui/res/editions/Zendikar
@@ -117,9 +117,9 @@ ScryfallCode=ZNC
 109 C Commander's Sphere @Ryan Alexander Lee
 110 U Dimir Keyrune @Daniel Ljunggren
 111 C Dimir Locket @Zezhou Chen
-112 U Dimir Signet @Raoul Vitale
+112 C Dimir Signet @Raoul Vitale
 113 U Heirloom Blade @Carmen Sinek
-114 C Mind Stone @Adam Rex
+114 U Mind Stone @Adam Rex
 115 R Obelisk of Urd @John Severin Brassell
 116 U Sandstone Oracle @Izzy
 117 C Scaretiller @Jakub Kasper
@@ -127,7 +127,7 @@ ScryfallCode=ZNC
 119 R Seer's Sundial @Franz Vohwinkel
 120 U Sol Ring @Mike Bierek
 121 U Blighted Woodland @Jason Felix
-122 C Boros Garrison @John Avon
+122 U Boros Garrison @John Avon
 123 C Boros Guildgate @Noah Bradley
 124 C Command Tower @Ryan Yee
 125 U Cryptic Caves @Sung Choi
@@ -145,7 +145,7 @@ ScryfallCode=ZNC
 137 R Needle Spires @Jonas De Ro
 138 U Rogue's Passage @Christine Choi
 139 C Selesnya Guildgate @Howard Lyon
-140 C Selesnya Sanctuary @John Avon
+140 U Selesnya Sanctuary @John Avon
 141 U Submerged Boneyard @Cliff Childs
 142 C Terramorphic Expanse @Dan Scott