Skip to content

Commit

Permalink
Merge branch 'master' into master2
Browse files Browse the repository at this point in the history
  • Loading branch information
@kevlahnota
kevlahnota committed Oct 2, 2024
2 parents 1f5b90d + 3df291c commit fdca506
Show file tree
Hide file tree
Showing 63 changed files with 256 additions and 254 deletions.
4 changes: 2 additions & 2 deletions forge-gui/res/editions/30th Anniversary Play Promos.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion forge-gui/res/editions/Alchemy Thunder Junction.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions forge-gui/res/editions/Antiquities.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion forge-gui/res/editions/Arabian Nights.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions forge-gui/res/editions/Astral Cards.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Code=PAST
Date=1997-04-01
Name=Astral Cards
Type=Funny
ScryfallCode=PAST

[cards]
1 C Aswan Jaguar @Pat Lewis
Expand Down
20 changes: 10 additions & 10 deletions forge-gui/res/editions/Bloomburrow Commander.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
273 C Gruul Signet @Efrem Palacios
272 U Golgari Signet @Raoul Vitale
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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion forge-gui/res/editions/Celebration Cards.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion forge-gui/res/editions/Coldsnap Theme Decks.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion forge-gui/res/editions/Commander 2018.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion forge-gui/res/editions/Commander 2019.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion forge-gui/res/editions/Commander 2020.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions forge-gui/res/editions/Commander 2021.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion forge-gui/res/editions/Commander Anthology Vol. II.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion forge-gui/res/editions/Commander Collection Green.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions forge-gui/res/editions/Commander Legends.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions forge-gui/res/editions/Commander Masters.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions forge-gui/res/editions/Commander Theme Decks.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion forge-gui/res/editions/Conflux Promos.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions forge-gui/res/editions/Double Masters 2022.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions forge-gui/res/editions/Duel Decks Anthology Divine vs. Demonic.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion forge-gui/res/editions/Duel Decks Mirrodin Pure vs. New Phyrexia.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions forge-gui/res/editions/Dungeons & Dragons Adventures in the Forgotten Realms Commander.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions forge-gui/res/editions/Duskmourn House of Horror Commander.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit fdca506

Please sign in to comment.