diff --git a/forge-game/src/main/java/forge/game/GameFormat.java b/forge-game/src/main/java/forge/game/GameFormat.java index 723b32db776..c3fbdbf737f 100644 --- a/forge-game/src/main/java/forge/game/GameFormat.java +++ b/forge-game/src/main/java/forge/game/GameFormat.java @@ -46,7 +46,7 @@ import java.util.Map.Entry; public class GameFormat implements Comparable { private final String name; public enum FormatType {Sanctioned, Casual, Historic, Digital, Custom} - public enum FormatSubType {Rotating, Eternal, Commander, Planechase, Block, Videogame, MTGO, Custom} + public enum FormatSubType {Block, Standard, Extended, Modern, Legacy, Vintage, Commander, Planechase, Videogame, MTGO, Custom} // contains allowed sets, when empty allows all sets private FormatType formatType; diff --git a/forge-gui/res/formats/Amonkhet Block.txt b/forge-gui/res/formats/Block/Amonkhet Block.txt similarity index 87% rename from forge-gui/res/formats/Amonkhet Block.txt rename to forge-gui/res/formats/Block/Amonkhet Block.txt index 98c5390b73a..61f8b45bf3b 100644 --- a/forge-gui/res/formats/Amonkhet Block.txt +++ b/forge-gui/res/formats/Block/Amonkhet Block.txt @@ -2,5 +2,5 @@ Name:Amonkhet Block Type:Historic Subtype:Block -Order:111 +Order:112 Sets:HOU, AKH diff --git a/forge-gui/res/formats/Battle for Zendikar Block.txt b/forge-gui/res/formats/Block/Battle for Zendikar Block.txt similarity index 89% rename from forge-gui/res/formats/Battle for Zendikar Block.txt rename to forge-gui/res/formats/Block/Battle for Zendikar Block.txt index 46664b1c634..cafe11d2e4b 100644 --- a/forge-gui/res/formats/Battle for Zendikar Block.txt +++ b/forge-gui/res/formats/Block/Battle for Zendikar Block.txt @@ -2,5 +2,5 @@ Name:Battle for Zendikar Block Type:Historic Subtype:Block -Order:114 +Order:115 Sets:OGW, BFZ diff --git a/forge-gui/res/formats/Block/Ice Age Block Constructed, Coldsnap.txt b/forge-gui/res/formats/Block/Ice Age Block Constructed, Coldsnap.txt new file mode 100644 index 00000000000..b328003169a --- /dev/null +++ b/forge-gui/res/formats/Block/Ice Age Block Constructed, Coldsnap.txt @@ -0,0 +1,7 @@ +[format] +Name:Ice Age Block Constructed, Coldsnap +Type:Historic +Subtype:Block +Order:390 +Sets:ICE, ALL, CSP +Banned:Amulet of Quoz; Thawing Glaciers; Zuran Orb diff --git a/forge-gui/res/formats/Ice Age Block.txt b/forge-gui/res/formats/Block/Ice Age Block.txt similarity index 92% rename from forge-gui/res/formats/Ice Age Block.txt rename to forge-gui/res/formats/Block/Ice Age Block.txt index e198691a6b4..c01f532dd8b 100644 --- a/forge-gui/res/formats/Ice Age Block.txt +++ b/forge-gui/res/formats/Block/Ice Age Block.txt @@ -2,6 +2,6 @@ Name:Ice Age Block Type:Historic Subtype:Block -Order:134 +Order:135 Sets:CSP, ALL, ICE Banned:Amulet of Quoz; Thawing Glaciers; Zuran Orb diff --git a/forge-gui/res/formats/Ice Age Block Constructed, Coldsnap.txt b/forge-gui/res/formats/Block/Ice Age-Homelands-Alliances Block, Tempest.txt similarity index 57% rename from forge-gui/res/formats/Ice Age Block Constructed, Coldsnap.txt rename to forge-gui/res/formats/Block/Ice Age-Homelands-Alliances Block, Tempest.txt index af32d4d5691..c1f662a8d8f 100644 --- a/forge-gui/res/formats/Ice Age Block Constructed, Coldsnap.txt +++ b/forge-gui/res/formats/Block/Ice Age-Homelands-Alliances Block, Tempest.txt @@ -1,7 +1,7 @@ [format] -Name:Ice Age Block Constructed, Coldsnap +Name:Ice Age-Homelands-Alliances Block, Tempest Type:Historic Subtype:Block -Order:385 -Sets:ICE, ALL, CSP +Order:204 +Sets:ICE, HML, ALL Banned:Amulet of Quoz; Thawing Glaciers; Timmerian Fiends; Zuran Orb diff --git a/forge-gui/res/formats/Time Spiral Block Constructed, Time Spiral.txt b/forge-gui/res/formats/Block/Ice Age-Homelands-Alliances Block, Weatherlight.txt similarity index 56% rename from forge-gui/res/formats/Time Spiral Block Constructed, Time Spiral.txt rename to forge-gui/res/formats/Block/Ice Age-Homelands-Alliances Block, Weatherlight.txt index 72d0b8d461d..5ff4be7f57d 100644 --- a/forge-gui/res/formats/Time Spiral Block Constructed, Time Spiral.txt +++ b/forge-gui/res/formats/Block/Ice Age-Homelands-Alliances Block, Weatherlight.txt @@ -1,7 +1,7 @@ [format] -Name:Time Spiral Block Constructed, Time Spiral +Name:Ice Age-Homelands-Alliances Block, Weatherlight Type:Historic Subtype:Block -Order:390 -Sets:TSP, TSB +Order:197 +Sets:ICE, HML, ALL Banned:Amulet of Quoz; Thawing Glaciers; Timmerian Fiends; Zuran Orb diff --git a/forge-gui/res/formats/Innistrad Block Constructed, April 2012.txt b/forge-gui/res/formats/Block/Innistrad Block Constructed, April 2012.txt similarity index 93% rename from forge-gui/res/formats/Innistrad Block Constructed, April 2012.txt rename to forge-gui/res/formats/Block/Innistrad Block Constructed, April 2012.txt index efe839e82f8..a6b050a3ca0 100644 --- a/forge-gui/res/formats/Innistrad Block Constructed, April 2012.txt +++ b/forge-gui/res/formats/Block/Innistrad Block Constructed, April 2012.txt @@ -2,6 +2,6 @@ Name:Innistrad Block Constructed, April 2012 Type:Historic Subtype:Block -Order:516 +Order:521 Sets:ISD, DKA Banned:Intangible Virtue; Lingering Souls diff --git a/forge-gui/res/formats/Innistrad Block Constructed, Avacyn Restored.txt b/forge-gui/res/formats/Block/Innistrad Block Constructed, Avacyn Restored.txt similarity index 93% rename from forge-gui/res/formats/Innistrad Block Constructed, Avacyn Restored.txt rename to forge-gui/res/formats/Block/Innistrad Block Constructed, Avacyn Restored.txt index 62f08cefecc..7559bb2237b 100644 --- a/forge-gui/res/formats/Innistrad Block Constructed, Avacyn Restored.txt +++ b/forge-gui/res/formats/Block/Innistrad Block Constructed, Avacyn Restored.txt @@ -2,6 +2,6 @@ Name:Innistrad Block Constructed, Avacyn Restored Type:Historic Subtype:Block -Order:517 +Order:522 Sets:ISD, DKA, AVR Banned:Intangible Virtue; Lingering Souls diff --git a/forge-gui/res/formats/Innistrad Block Constructed, Dark Ascension.txt b/forge-gui/res/formats/Block/Innistrad Block Constructed, Dark Ascension.txt similarity index 90% rename from forge-gui/res/formats/Innistrad Block Constructed, Dark Ascension.txt rename to forge-gui/res/formats/Block/Innistrad Block Constructed, Dark Ascension.txt index bcb455627b1..0c56a86ed62 100644 --- a/forge-gui/res/formats/Innistrad Block Constructed, Dark Ascension.txt +++ b/forge-gui/res/formats/Block/Innistrad Block Constructed, Dark Ascension.txt @@ -2,5 +2,5 @@ Name:Innistrad Block Constructed, Dark Ascension Type:Historic Subtype:Block -Order:510 +Order:515 Sets:ISD, DKA diff --git a/forge-gui/res/formats/Innistrad Block Constructed, Innistrad.txt b/forge-gui/res/formats/Block/Innistrad Block Constructed, Innistrad.txt similarity index 90% rename from forge-gui/res/formats/Innistrad Block Constructed, Innistrad.txt rename to forge-gui/res/formats/Block/Innistrad Block Constructed, Innistrad.txt index fc9253e7f92..7fa44c40509 100644 --- a/forge-gui/res/formats/Innistrad Block Constructed, Innistrad.txt +++ b/forge-gui/res/formats/Block/Innistrad Block Constructed, Innistrad.txt @@ -2,5 +2,5 @@ Name:Innistrad Block Constructed, Innistrad Type:Historic Subtype:Block -Order:500 +Order:505 Sets:ISD diff --git a/forge-gui/res/formats/Innistrad-Avacyn Restored Block.txt b/forge-gui/res/formats/Block/Innistrad-Avacyn Restored Block.txt similarity index 93% rename from forge-gui/res/formats/Innistrad-Avacyn Restored Block.txt rename to forge-gui/res/formats/Block/Innistrad-Avacyn Restored Block.txt index c047ec28a93..d6d46e619ef 100644 --- a/forge-gui/res/formats/Innistrad-Avacyn Restored Block.txt +++ b/forge-gui/res/formats/Block/Innistrad-Avacyn Restored Block.txt @@ -2,6 +2,6 @@ Name:Innistrad-Avacyn Restored Block Type:Historic Subtype:Block -Order:118 +Order:119 Sets:ISD, AVR, DKA Banned:Intangible Virtue; Lingering Souls diff --git a/forge-gui/res/formats/Block/Invasion Block Constructed, Apocalypse.txt b/forge-gui/res/formats/Block/Invasion Block Constructed, Apocalypse.txt new file mode 100644 index 00000000000..194c61bf619 --- /dev/null +++ b/forge-gui/res/formats/Block/Invasion Block Constructed, Apocalypse.txt @@ -0,0 +1,10 @@ +[format] +Name:Invasion Block Constructed, Apocalypse +Type:Historic +Subtype:Block +Order:282 +Sets:INV, PLS, APC +[Extended, Apocalypse +Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC +Additional:Badlands; Bayou; Plateau; Savannah; Scrubland; Taiga; Tropical Island; Tundra; Underground Sea; Volcanic Island +Banned:Amulet of Quoz; Dark Ritual; Demonic Consultation; Dream Halls; Earthcraft; Lotus Petal; Mana Vault; Memory Jar; Mind Over Matter; Necropotence; Replenish; Survival of the Fittest; Time Spiral; Timmerian Fiends; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Invasion Block Constructed, Invasion.txt b/forge-gui/res/formats/Block/Invasion Block Constructed, Invasion.txt similarity index 89% rename from forge-gui/res/formats/Invasion Block Constructed, Invasion.txt rename to forge-gui/res/formats/Block/Invasion Block Constructed, Invasion.txt index 5ec98a8b6fc..edb292b6d68 100644 --- a/forge-gui/res/formats/Invasion Block Constructed, Invasion.txt +++ b/forge-gui/res/formats/Block/Invasion Block Constructed, Invasion.txt @@ -2,5 +2,5 @@ Name:Invasion Block Constructed, Invasion Type:Historic Subtype:Block -Order:263 +Order:268 Sets:INV diff --git a/forge-gui/res/formats/Invasion Block Constructed, Planeshift.txt b/forge-gui/res/formats/Block/Invasion Block Constructed, Planeshift.txt similarity index 90% rename from forge-gui/res/formats/Invasion Block Constructed, Planeshift.txt rename to forge-gui/res/formats/Block/Invasion Block Constructed, Planeshift.txt index 4bfd7f96c45..fb57e738db7 100644 --- a/forge-gui/res/formats/Invasion Block Constructed, Planeshift.txt +++ b/forge-gui/res/formats/Block/Invasion Block Constructed, Planeshift.txt @@ -2,5 +2,5 @@ Name:Invasion Block Constructed, Planeshift Type:Historic Subtype:Block -Order:268 +Order:273 Sets:INV, PLS diff --git a/forge-gui/res/formats/Invasion Block.txt b/forge-gui/res/formats/Block/Invasion Block.txt similarity index 88% rename from forge-gui/res/formats/Invasion Block.txt rename to forge-gui/res/formats/Block/Invasion Block.txt index 7f3a7daf11b..b46581418fc 100644 --- a/forge-gui/res/formats/Invasion Block.txt +++ b/forge-gui/res/formats/Block/Invasion Block.txt @@ -2,5 +2,5 @@ Name:Invasion Block Type:Historic Subtype:Block -Order:129 +Order:130 Sets:APC, PLS, INV diff --git a/forge-gui/res/formats/Ixalan Block.txt b/forge-gui/res/formats/Block/Ixalan Block.txt similarity index 87% rename from forge-gui/res/formats/Ixalan Block.txt rename to forge-gui/res/formats/Block/Ixalan Block.txt index a429806a8d2..caaeba30bd6 100644 --- a/forge-gui/res/formats/Ixalan Block.txt +++ b/forge-gui/res/formats/Block/Ixalan Block.txt @@ -2,5 +2,5 @@ Name:Ixalan Block Type:Historic Subtype:Block -Order:110 +Order:111 Sets:XLN, RIX diff --git a/forge-gui/res/formats/Kaladesh Block.txt b/forge-gui/res/formats/Block/Kaladesh Block.txt similarity index 87% rename from forge-gui/res/formats/Kaladesh Block.txt rename to forge-gui/res/formats/Block/Kaladesh Block.txt index 124ab4c1a8c..8d4dc5468ca 100644 --- a/forge-gui/res/formats/Kaladesh Block.txt +++ b/forge-gui/res/formats/Block/Kaladesh Block.txt @@ -2,5 +2,5 @@ Name:Kaladesh Block Type:Historic Subtype:Block -Order:112 +Order:113 Sets:AER, KLD diff --git a/forge-gui/res/formats/Kamigawa Block Constructed, Betrayers of Kamigawa.txt b/forge-gui/res/formats/Block/Kamigawa Block Constructed, Betrayers of Kamigawa.txt similarity index 91% rename from forge-gui/res/formats/Kamigawa Block Constructed, Betrayers of Kamigawa.txt rename to forge-gui/res/formats/Block/Kamigawa Block Constructed, Betrayers of Kamigawa.txt index 69cbf269a87..468ed588359 100644 --- a/forge-gui/res/formats/Kamigawa Block Constructed, Betrayers of Kamigawa.txt +++ b/forge-gui/res/formats/Block/Kamigawa Block Constructed, Betrayers of Kamigawa.txt @@ -2,5 +2,5 @@ Name:Kamigawa Block Constructed, Betrayers of Kamigawa Type:Historic Subtype:Block -Order:351 +Order:356 Sets:CHK, BOK diff --git a/forge-gui/res/formats/Kamigawa Block Constructed, Champions of Kamigawa.txt b/forge-gui/res/formats/Block/Kamigawa Block Constructed, Champions of Kamigawa.txt similarity index 90% rename from forge-gui/res/formats/Kamigawa Block Constructed, Champions of Kamigawa.txt rename to forge-gui/res/formats/Block/Kamigawa Block Constructed, Champions of Kamigawa.txt index d71426159ec..f0fb03f0293 100644 --- a/forge-gui/res/formats/Kamigawa Block Constructed, Champions of Kamigawa.txt +++ b/forge-gui/res/formats/Block/Kamigawa Block Constructed, Champions of Kamigawa.txt @@ -2,5 +2,5 @@ Name:Kamigawa Block Constructed, Champions of Kamigawa Type:Historic Subtype:Block -Order:345 +Order:350 Sets:CHK diff --git a/forge-gui/res/formats/Kamigawa Block Constructed, Saviors of Kamigawa.txt b/forge-gui/res/formats/Block/Kamigawa Block Constructed, Saviors of Kamigawa.txt similarity index 91% rename from forge-gui/res/formats/Kamigawa Block Constructed, Saviors of Kamigawa.txt rename to forge-gui/res/formats/Block/Kamigawa Block Constructed, Saviors of Kamigawa.txt index 7214f83ac1f..9a2180dd2a4 100644 --- a/forge-gui/res/formats/Kamigawa Block Constructed, Saviors of Kamigawa.txt +++ b/forge-gui/res/formats/Block/Kamigawa Block Constructed, Saviors of Kamigawa.txt @@ -2,5 +2,5 @@ Name:Kamigawa Block Constructed, Saviors of Kamigawa Type:Historic Subtype:Block -Order:358 +Order:363 Sets:CHK, BOK, SOK diff --git a/forge-gui/res/formats/Kamigawa Block.txt b/forge-gui/res/formats/Block/Kamigawa Block.txt similarity index 88% rename from forge-gui/res/formats/Kamigawa Block.txt rename to forge-gui/res/formats/Block/Kamigawa Block.txt index b95fbc67cae..d6403d6f0f7 100644 --- a/forge-gui/res/formats/Kamigawa Block.txt +++ b/forge-gui/res/formats/Block/Kamigawa Block.txt @@ -2,5 +2,5 @@ Name:Kamigawa Block Type:Historic Subtype:Block -Order:125 +Order:126 Sets:SOK, BOK, CHK diff --git a/forge-gui/res/formats/Khans of Tarkir Block.txt b/forge-gui/res/formats/Block/Khans of Tarkir Block.txt similarity index 89% rename from forge-gui/res/formats/Khans of Tarkir Block.txt rename to forge-gui/res/formats/Block/Khans of Tarkir Block.txt index f3f8e764fde..a4ea2448a4a 100644 --- a/forge-gui/res/formats/Khans of Tarkir Block.txt +++ b/forge-gui/res/formats/Block/Khans of Tarkir Block.txt @@ -2,5 +2,5 @@ Name:Khans of Tarkir Block Type:Historic Subtype:Block -Order:115 +Order:116 Sets:DTK, FRF, KTK diff --git a/forge-gui/res/formats/Lorwyn Block Constructed, Lorwyn.txt b/forge-gui/res/formats/Block/Lorwyn Block Constructed, Lorwyn.txt similarity index 89% rename from forge-gui/res/formats/Lorwyn Block Constructed, Lorwyn.txt rename to forge-gui/res/formats/Block/Lorwyn Block Constructed, Lorwyn.txt index 5b74dce40fc..3318a0e2bc8 100644 --- a/forge-gui/res/formats/Lorwyn Block Constructed, Lorwyn.txt +++ b/forge-gui/res/formats/Block/Lorwyn Block Constructed, Lorwyn.txt @@ -2,5 +2,5 @@ Name:Lorwyn Block Constructed, Lorwyn Type:Historic Subtype:Block -Order:416 +Order:421 Sets:LRW diff --git a/forge-gui/res/formats/Lorwyn Block Constructed, Morningtide.txt b/forge-gui/res/formats/Block/Lorwyn Block Constructed, Morningtide.txt similarity index 90% rename from forge-gui/res/formats/Lorwyn Block Constructed, Morningtide.txt rename to forge-gui/res/formats/Block/Lorwyn Block Constructed, Morningtide.txt index 65a100e95f2..71b72943c16 100644 --- a/forge-gui/res/formats/Lorwyn Block Constructed, Morningtide.txt +++ b/forge-gui/res/formats/Block/Lorwyn Block Constructed, Morningtide.txt @@ -2,5 +2,5 @@ Name:Lorwyn Block Constructed, Morningtide Type:Historic Subtype:Block -Order:421 +Order:426 Sets:LRW, MOR diff --git a/forge-gui/res/formats/Lorwyn-Shadowmoor Block Constructed, Eventide.txt b/forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block Constructed, Eventide.txt similarity index 91% rename from forge-gui/res/formats/Lorwyn-Shadowmoor Block Constructed, Eventide.txt rename to forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block Constructed, Eventide.txt index 0cca023e7f3..ba6db6ead3d 100644 --- a/forge-gui/res/formats/Lorwyn-Shadowmoor Block Constructed, Eventide.txt +++ b/forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block Constructed, Eventide.txt @@ -2,5 +2,5 @@ Name:Lorwyn-Shadowmoor Block Constructed, Eventide Type:Historic Subtype:Block -Order:432 +Order:437 Sets:LRW, MOR, SHM, EVE diff --git a/forge-gui/res/formats/Lorwyn-Shadowmoor Block Constructed, Shadowmoor.txt b/forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block Constructed, Shadowmoor.txt similarity index 91% rename from forge-gui/res/formats/Lorwyn-Shadowmoor Block Constructed, Shadowmoor.txt rename to forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block Constructed, Shadowmoor.txt index e6e805b4281..17a7b721682 100644 --- a/forge-gui/res/formats/Lorwyn-Shadowmoor Block Constructed, Shadowmoor.txt +++ b/forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block Constructed, Shadowmoor.txt @@ -2,5 +2,5 @@ Name:Lorwyn-Shadowmoor Block Constructed, Shadowmoor Type:Historic Subtype:Block -Order:426 +Order:431 Sets:LRW, MOR, SHM diff --git a/forge-gui/res/formats/Lorwyn-Shadowmoor Block.txt b/forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block.txt similarity index 90% rename from forge-gui/res/formats/Lorwyn-Shadowmoor Block.txt rename to forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block.txt index af459bdd52f..35abf4e9483 100644 --- a/forge-gui/res/formats/Lorwyn-Shadowmoor Block.txt +++ b/forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block.txt @@ -2,5 +2,5 @@ Name:Lorwyn-Shadowmoor Block Type:Historic Subtype:Block -Order:122 +Order:123 Sets:EVE, SHM, MOR, LRW diff --git a/forge-gui/res/formats/Masques Block Constructed, Mercadian Masques.txt b/forge-gui/res/formats/Block/Masques Block Constructed, Mercadian Masques.txt similarity index 90% rename from forge-gui/res/formats/Masques Block Constructed, Mercadian Masques.txt rename to forge-gui/res/formats/Block/Masques Block Constructed, Mercadian Masques.txt index b896eb91631..b08c2baf7d7 100644 --- a/forge-gui/res/formats/Masques Block Constructed, Mercadian Masques.txt +++ b/forge-gui/res/formats/Block/Masques Block Constructed, Mercadian Masques.txt @@ -2,5 +2,5 @@ Name:Masques Block Constructed, Mercadian Masques Type:Historic Subtype:Block -Order:245 +Order:250 Sets:MMQ diff --git a/forge-gui/res/formats/Masques Block Constructed, Nemesis.txt b/forge-gui/res/formats/Block/Masques Block Constructed, Nemesis.txt similarity index 90% rename from forge-gui/res/formats/Masques Block Constructed, Nemesis.txt rename to forge-gui/res/formats/Block/Masques Block Constructed, Nemesis.txt index 217ced6f3d0..894c8cca5a4 100644 --- a/forge-gui/res/formats/Masques Block Constructed, Nemesis.txt +++ b/forge-gui/res/formats/Block/Masques Block Constructed, Nemesis.txt @@ -2,5 +2,5 @@ Name:Masques Block Constructed, Nemesis Type:Historic Subtype:Block -Order:250 +Order:255 Sets:MMQ, NMS diff --git a/forge-gui/res/formats/Masques Block Constructed, Prophecy.txt b/forge-gui/res/formats/Block/Masques Block Constructed, Prophecy.txt similarity index 63% rename from forge-gui/res/formats/Masques Block Constructed, Prophecy.txt rename to forge-gui/res/formats/Block/Masques Block Constructed, Prophecy.txt index 06e9ce41d15..e95fe4606b7 100644 --- a/forge-gui/res/formats/Masques Block Constructed, Prophecy.txt +++ b/forge-gui/res/formats/Block/Masques Block Constructed, Prophecy.txt @@ -2,6 +2,6 @@ Name:Masques Block Constructed, Prophecy Type:Historic Subtype:Block -Order:256 +Order:261 Sets:MMQ, NMS, PCY -Banned:Lin Sivvi; Defiant Hero; Rishadan Port +Banned:Lin Sivvi, Defiant Hero; Rishadan Port diff --git a/forge-gui/res/formats/Masques Block.txt b/forge-gui/res/formats/Block/Masques Block.txt similarity index 57% rename from forge-gui/res/formats/Masques Block.txt rename to forge-gui/res/formats/Block/Masques Block.txt index 122c01c6e2d..43da27e6094 100644 --- a/forge-gui/res/formats/Masques Block.txt +++ b/forge-gui/res/formats/Block/Masques Block.txt @@ -2,6 +2,6 @@ Name:Masques Block Type:Historic Subtype:Block -Order:130 +Order:131 Sets:PCY, NMS, MMA -Banned:Lin Sivvi; Defiant Hero; Rishadan Port +Banned:Lin Sivvi, Defiant Hero; Rishadan Port diff --git a/forge-gui/res/formats/Mirage Block.txt b/forge-gui/res/formats/Block/Mirage Block.txt similarity index 91% rename from forge-gui/res/formats/Mirage Block.txt rename to forge-gui/res/formats/Block/Mirage Block.txt index 2363d2a09a5..10c705f59e5 100644 --- a/forge-gui/res/formats/Mirage Block.txt +++ b/forge-gui/res/formats/Block/Mirage Block.txt @@ -2,6 +2,6 @@ Name:Mirage Block Type:Historic Subtype:Block -Order:133 +Order:134 Sets:VIS, WTH, MIR Banned:Squandered Resources diff --git a/forge-gui/res/formats/Block/Mirage-Visions-Weatherlight Block, Tempest.txt b/forge-gui/res/formats/Block/Mirage-Visions-Weatherlight Block, Tempest.txt new file mode 100644 index 00000000000..3c295c846d0 --- /dev/null +++ b/forge-gui/res/formats/Block/Mirage-Visions-Weatherlight Block, Tempest.txt @@ -0,0 +1,7 @@ +[format] +Name:Mirage-Visions-Weatherlight Block, Tempest +Type:Historic +Subtype:Block +Order:205 +Sets:MIR, VIS, WTH +Banned:Squandered Resources diff --git a/forge-gui/res/formats/Block/Mirage-Visions-Weatherlight Block, Weatherlight.txt b/forge-gui/res/formats/Block/Mirage-Visions-Weatherlight Block, Weatherlight.txt new file mode 100644 index 00000000000..9460f4e7d34 --- /dev/null +++ b/forge-gui/res/formats/Block/Mirage-Visions-Weatherlight Block, Weatherlight.txt @@ -0,0 +1,7 @@ +[format] +Name:Mirage-Visions-Weatherlight Block, Weatherlight +Type:Historic +Subtype:Block +Order:198 +Sets:MIR, VIS, WTH +Banned:Squandered Resources diff --git a/forge-gui/res/formats/Mirrodin Block Constructed, Darksteel.txt b/forge-gui/res/formats/Block/Mirrodin Block Constructed, Darksteel.txt similarity index 90% rename from forge-gui/res/formats/Mirrodin Block Constructed, Darksteel.txt rename to forge-gui/res/formats/Block/Mirrodin Block Constructed, Darksteel.txt index 228de4d6e15..815e1c5f6aa 100644 --- a/forge-gui/res/formats/Mirrodin Block Constructed, Darksteel.txt +++ b/forge-gui/res/formats/Block/Mirrodin Block Constructed, Darksteel.txt @@ -2,5 +2,5 @@ Name:Mirrodin Block Constructed, Darksteel Type:Historic Subtype:Block -Order:330 +Order:335 Sets:MRD, DST diff --git a/forge-gui/res/formats/Mirrodin Block Constructed, Fifth Dawn.txt b/forge-gui/res/formats/Block/Mirrodin Block Constructed, Fifth Dawn.txt similarity index 92% rename from forge-gui/res/formats/Mirrodin Block Constructed, Fifth Dawn.txt rename to forge-gui/res/formats/Block/Mirrodin Block Constructed, Fifth Dawn.txt index 087067105a1..3e9f85fea53 100644 --- a/forge-gui/res/formats/Mirrodin Block Constructed, Fifth Dawn.txt +++ b/forge-gui/res/formats/Block/Mirrodin Block Constructed, Fifth Dawn.txt @@ -2,6 +2,6 @@ Name:Mirrodin Block Constructed, Fifth Dawn Type:Historic Subtype:Block -Order:337 +Order:342 Sets:MRD, DST, 5DN Banned:Skullclamp diff --git a/forge-gui/res/formats/Mirrodin Block Constructed, Jun 2004.txt b/forge-gui/res/formats/Block/Mirrodin Block Constructed, Jun 2004.txt similarity index 80% rename from forge-gui/res/formats/Mirrodin Block Constructed, Jun 2004.txt rename to forge-gui/res/formats/Block/Mirrodin Block Constructed, Jun 2004.txt index 51c5f502323..3733b9d4c86 100644 --- a/forge-gui/res/formats/Mirrodin Block Constructed, Jun 2004.txt +++ b/forge-gui/res/formats/Block/Mirrodin Block Constructed, Jun 2004.txt @@ -2,6 +2,6 @@ Name:Mirrodin Block Constructed, Jun 2004 Type:Historic Subtype:Block -Order:335 -Sets:MRD +Order:340 +Sets:MRD, DST Banned:Skullclamp diff --git a/forge-gui/res/formats/Mirrodin Block Constructed, Mar 2006.txt b/forge-gui/res/formats/Block/Mirrodin Block Constructed, Mar 2006.txt similarity index 96% rename from forge-gui/res/formats/Mirrodin Block Constructed, Mar 2006.txt rename to forge-gui/res/formats/Block/Mirrodin Block Constructed, Mar 2006.txt index 3b1359483c3..b0967bb53c6 100644 --- a/forge-gui/res/formats/Mirrodin Block Constructed, Mar 2006.txt +++ b/forge-gui/res/formats/Block/Mirrodin Block Constructed, Mar 2006.txt @@ -2,6 +2,6 @@ Name:Mirrodin Block Constructed, Mar 2006 Type:Historic Subtype:Block -Order:378 +Order:383 Sets:MRD, DST, 5DN Banned:Aether Vial; Ancient Den; Arcbound Ravager; Darksteel Citadel; Disciple of the Vault; Great Furnace; Seat of the Synod; Skullclamp; Tree of Tales; Vault of Whispers diff --git a/forge-gui/res/formats/Mirrodin Block Constructed, Mirrodin.txt b/forge-gui/res/formats/Block/Mirrodin Block Constructed, Mirrodin.txt similarity index 89% rename from forge-gui/res/formats/Mirrodin Block Constructed, Mirrodin.txt rename to forge-gui/res/formats/Block/Mirrodin Block Constructed, Mirrodin.txt index 00422ebaefc..5074008f86f 100644 --- a/forge-gui/res/formats/Mirrodin Block Constructed, Mirrodin.txt +++ b/forge-gui/res/formats/Block/Mirrodin Block Constructed, Mirrodin.txt @@ -2,5 +2,5 @@ Name:Mirrodin Block Constructed, Mirrodin Type:Historic Subtype:Block -Order:322 +Order:327 Sets:MRD diff --git a/forge-gui/res/formats/Mirrodin Block.txt b/forge-gui/res/formats/Block/Mirrodin Block.txt similarity index 96% rename from forge-gui/res/formats/Mirrodin Block.txt rename to forge-gui/res/formats/Block/Mirrodin Block.txt index a9c1db36703..6f3722f065d 100644 --- a/forge-gui/res/formats/Mirrodin Block.txt +++ b/forge-gui/res/formats/Block/Mirrodin Block.txt @@ -2,6 +2,6 @@ Name:Mirrodin Block Type:Historic Subtype:Block -Order:126 +Order:127 Sets:5DN, DST, MRD Banned:Aether Vial; Ancient Den; Arcbound Ravager; Darksteel Citadel; Disciple of the Vault; Great Furnace; Seat of the Synod; Tree of Tales; Vault of Whispers; Skullclamp diff --git a/forge-gui/res/formats/Odyssey Block Constructed, Judgment.txt b/forge-gui/res/formats/Block/Odyssey Block Constructed, Judgment.txt similarity index 90% rename from forge-gui/res/formats/Odyssey Block Constructed, Judgment.txt rename to forge-gui/res/formats/Block/Odyssey Block Constructed, Judgment.txt index d6b963d4f34..b2e542db75d 100644 --- a/forge-gui/res/formats/Odyssey Block Constructed, Judgment.txt +++ b/forge-gui/res/formats/Block/Odyssey Block Constructed, Judgment.txt @@ -2,5 +2,5 @@ Name:Odyssey Block Constructed, Judgment Type:Historic Subtype:Block -Order:293 +Order:298 Sets:ODY, TOR, JUD diff --git a/forge-gui/res/formats/Odyssey Block Constructed, Odyssey.txt b/forge-gui/res/formats/Block/Odyssey Block Constructed, Odyssey.txt similarity index 89% rename from forge-gui/res/formats/Odyssey Block Constructed, Odyssey.txt rename to forge-gui/res/formats/Block/Odyssey Block Constructed, Odyssey.txt index 2f218cacf1c..7bdcb57dd60 100644 --- a/forge-gui/res/formats/Odyssey Block Constructed, Odyssey.txt +++ b/forge-gui/res/formats/Block/Odyssey Block Constructed, Odyssey.txt @@ -2,5 +2,5 @@ Name:Odyssey Block Constructed, Odyssey Type:Historic Subtype:Block -Order:281 +Order:286 Sets:ODY diff --git a/forge-gui/res/formats/Odyssey Block Constructed, Torment.txt b/forge-gui/res/formats/Block/Odyssey Block Constructed, Torment.txt similarity index 90% rename from forge-gui/res/formats/Odyssey Block Constructed, Torment.txt rename to forge-gui/res/formats/Block/Odyssey Block Constructed, Torment.txt index ad6c9b22769..1cfa046c468 100644 --- a/forge-gui/res/formats/Odyssey Block Constructed, Torment.txt +++ b/forge-gui/res/formats/Block/Odyssey Block Constructed, Torment.txt @@ -2,5 +2,5 @@ Name:Odyssey Block Constructed, Torment Type:Historic Subtype:Block -Order:288 +Order:293 Sets:ODY, TOR diff --git a/forge-gui/res/formats/Odyssey Block.txt b/forge-gui/res/formats/Block/Odyssey Block.txt similarity index 88% rename from forge-gui/res/formats/Odyssey Block.txt rename to forge-gui/res/formats/Block/Odyssey Block.txt index a67f8aa72e0..5a1292ea3e5 100644 --- a/forge-gui/res/formats/Odyssey Block.txt +++ b/forge-gui/res/formats/Block/Odyssey Block.txt @@ -2,5 +2,5 @@ Name:Odyssey Block Type:Historic Subtype:Block -Order:128 +Order:129 Sets:JUD, TOR, ODY diff --git a/forge-gui/res/formats/Onslaught Block Constructed, Legions.txt b/forge-gui/res/formats/Block/Onslaught Block Constructed, Legions.txt similarity index 90% rename from forge-gui/res/formats/Onslaught Block Constructed, Legions.txt rename to forge-gui/res/formats/Block/Onslaught Block Constructed, Legions.txt index b62d5da8855..104ebb6acc5 100644 --- a/forge-gui/res/formats/Onslaught Block Constructed, Legions.txt +++ b/forge-gui/res/formats/Block/Onslaught Block Constructed, Legions.txt @@ -2,5 +2,5 @@ Name:Onslaught Block Constructed, Legions Type:Historic Subtype:Block -Order:303 +Order:308 Sets:ONS, LGN diff --git a/forge-gui/res/formats/Onslaught Block Constructed, Onslaught.txt b/forge-gui/res/formats/Block/Onslaught Block Constructed, Onslaught.txt similarity index 90% rename from forge-gui/res/formats/Onslaught Block Constructed, Onslaught.txt rename to forge-gui/res/formats/Block/Onslaught Block Constructed, Onslaught.txt index 8437009ab1b..c5f01df2d7c 100644 --- a/forge-gui/res/formats/Onslaught Block Constructed, Onslaught.txt +++ b/forge-gui/res/formats/Block/Onslaught Block Constructed, Onslaught.txt @@ -2,5 +2,5 @@ Name:Onslaught Block Constructed, Onslaught Type:Historic Subtype:Block -Order:298 +Order:303 Sets:ONS diff --git a/forge-gui/res/formats/Onslaught Block Constructed, Scourge.txt b/forge-gui/res/formats/Block/Onslaught Block Constructed, Scourge.txt similarity index 90% rename from forge-gui/res/formats/Onslaught Block Constructed, Scourge.txt rename to forge-gui/res/formats/Block/Onslaught Block Constructed, Scourge.txt index 70c0f9ee88e..97f3737ba7d 100644 --- a/forge-gui/res/formats/Onslaught Block Constructed, Scourge.txt +++ b/forge-gui/res/formats/Block/Onslaught Block Constructed, Scourge.txt @@ -2,5 +2,5 @@ Name:Onslaught Block Constructed, Scourge Type:Historic Subtype:Block -Order:310 +Order:315 Sets:ONS, LGN, SCG diff --git a/forge-gui/res/formats/Onslaught Block.txt b/forge-gui/res/formats/Block/Onslaught Block.txt similarity index 88% rename from forge-gui/res/formats/Onslaught Block.txt rename to forge-gui/res/formats/Block/Onslaught Block.txt index af0f865785f..4437e82f513 100644 --- a/forge-gui/res/formats/Onslaught Block.txt +++ b/forge-gui/res/formats/Block/Onslaught Block.txt @@ -2,5 +2,5 @@ Name:Onslaught Block Type:Historic Subtype:Block -Order:127 +Order:128 Sets:SCG, LGN, ONS diff --git a/forge-gui/res/formats/Ravnica Block Constructed, Dissension.txt b/forge-gui/res/formats/Block/Ravnica Block Constructed, Dissension.txt similarity index 90% rename from forge-gui/res/formats/Ravnica Block Constructed, Dissension.txt rename to forge-gui/res/formats/Block/Ravnica Block Constructed, Dissension.txt index 2a2fc1b811e..81ab9af096a 100644 --- a/forge-gui/res/formats/Ravnica Block Constructed, Dissension.txt +++ b/forge-gui/res/formats/Block/Ravnica Block Constructed, Dissension.txt @@ -2,5 +2,5 @@ Name:Ravnica Block Constructed, Dissension Type:Historic Subtype:Block -Order:380 +Order:385 Sets:RAV, GPT, DIS diff --git a/forge-gui/res/formats/Ravnica Block Constructed, Guildpact.txt b/forge-gui/res/formats/Block/Ravnica Block Constructed, Guildpact.txt similarity index 90% rename from forge-gui/res/formats/Ravnica Block Constructed, Guildpact.txt rename to forge-gui/res/formats/Block/Ravnica Block Constructed, Guildpact.txt index cd8d9314e76..85d6fdb8ad2 100644 --- a/forge-gui/res/formats/Ravnica Block Constructed, Guildpact.txt +++ b/forge-gui/res/formats/Block/Ravnica Block Constructed, Guildpact.txt @@ -2,5 +2,5 @@ Name:Ravnica Block Constructed, Guildpact Type:Historic Subtype:Block -Order:374 +Order:379 Sets:RAV, GPT diff --git a/forge-gui/res/formats/Block/Ravnica Block Constructed, Ravnica City of Guilds.txt b/forge-gui/res/formats/Block/Ravnica Block Constructed, Ravnica City of Guilds.txt new file mode 100644 index 00000000000..0dad8d7aebb --- /dev/null +++ b/forge-gui/res/formats/Block/Ravnica Block Constructed, Ravnica City of Guilds.txt @@ -0,0 +1,6 @@ +[format] +Name:Ravnica Block Constructed, Ravnica City of Guilds +Type:Historic +Subtype:Block +Order:374 +Sets:RAV diff --git a/forge-gui/res/formats/Ravnica Block.txt b/forge-gui/res/formats/Block/Ravnica Block.txt similarity index 88% rename from forge-gui/res/formats/Ravnica Block.txt rename to forge-gui/res/formats/Block/Ravnica Block.txt index da48026651d..a4b9fda820f 100644 --- a/forge-gui/res/formats/Ravnica Block.txt +++ b/forge-gui/res/formats/Block/Ravnica Block.txt @@ -2,5 +2,5 @@ Name:Ravnica Block Type:Historic Subtype:Block -Order:124 +Order:125 Sets:DIS, GPT, RAV diff --git a/forge-gui/res/formats/Return to Ravnica Block.txt b/forge-gui/res/formats/Block/Return to Ravnica Block.txt similarity index 89% rename from forge-gui/res/formats/Return to Ravnica Block.txt rename to forge-gui/res/formats/Block/Return to Ravnica Block.txt index ae4252fe9ff..679579598da 100644 --- a/forge-gui/res/formats/Return to Ravnica Block.txt +++ b/forge-gui/res/formats/Block/Return to Ravnica Block.txt @@ -2,5 +2,5 @@ Name:Return to Ravnica Block Type:Historic Subtype:Block -Order:117 +Order:118 Sets:DGM, GTC, RTR diff --git a/forge-gui/res/formats/Scars of Mirrodin Block Constructed, Mirrodin Besieged.txt b/forge-gui/res/formats/Block/Scars of Mirrodin Block Constructed, Mirrodin Besieged.txt similarity index 91% rename from forge-gui/res/formats/Scars of Mirrodin Block Constructed, Mirrodin Besieged.txt rename to forge-gui/res/formats/Block/Scars of Mirrodin Block Constructed, Mirrodin Besieged.txt index 59b0e2df9c8..9972d3d4190 100644 --- a/forge-gui/res/formats/Scars of Mirrodin Block Constructed, Mirrodin Besieged.txt +++ b/forge-gui/res/formats/Block/Scars of Mirrodin Block Constructed, Mirrodin Besieged.txt @@ -2,5 +2,5 @@ Name:Scars of Mirrodin Block Constructed, Mirrodin Besieged Type:Historic Subtype:Block -Order:484 +Order:489 Sets:SOM, MBS diff --git a/forge-gui/res/formats/Scars of Mirrodin Block Constructed, New Phyrexia.txt b/forge-gui/res/formats/Block/Scars of Mirrodin Block Constructed, New Phyrexia.txt similarity index 91% rename from forge-gui/res/formats/Scars of Mirrodin Block Constructed, New Phyrexia.txt rename to forge-gui/res/formats/Block/Scars of Mirrodin Block Constructed, New Phyrexia.txt index 102cc10126a..d44d5689fe4 100644 --- a/forge-gui/res/formats/Scars of Mirrodin Block Constructed, New Phyrexia.txt +++ b/forge-gui/res/formats/Block/Scars of Mirrodin Block Constructed, New Phyrexia.txt @@ -2,5 +2,5 @@ Name:Scars of Mirrodin Block Constructed, New Phyrexia Type:Historic Subtype:Block -Order:489 +Order:494 Sets:SOM, MBS, NPH diff --git a/forge-gui/res/formats/Scars of Mirrodin Block Constructed, Scars of Mirrodin.txt b/forge-gui/res/formats/Block/Scars of Mirrodin Block Constructed, Scars of Mirrodin.txt similarity index 91% rename from forge-gui/res/formats/Scars of Mirrodin Block Constructed, Scars of Mirrodin.txt rename to forge-gui/res/formats/Block/Scars of Mirrodin Block Constructed, Scars of Mirrodin.txt index 56a46e8e47c..ba718bfdac9 100644 --- a/forge-gui/res/formats/Scars of Mirrodin Block Constructed, Scars of Mirrodin.txt +++ b/forge-gui/res/formats/Block/Scars of Mirrodin Block Constructed, Scars of Mirrodin.txt @@ -2,5 +2,5 @@ Name:Scars of Mirrodin Block Constructed, Scars of Mirrodin Type:Historic Subtype:Block -Order:478 +Order:483 Sets:SOM diff --git a/forge-gui/res/formats/Scars of Mirrodin Block.txt b/forge-gui/res/formats/Block/Scars of Mirrodin Block.txt similarity index 89% rename from forge-gui/res/formats/Scars of Mirrodin Block.txt rename to forge-gui/res/formats/Block/Scars of Mirrodin Block.txt index 0f9f3836fcc..cdf17911108 100644 --- a/forge-gui/res/formats/Scars of Mirrodin Block.txt +++ b/forge-gui/res/formats/Block/Scars of Mirrodin Block.txt @@ -2,5 +2,5 @@ Name:Scars of Mirrodin Block Type:Historic Subtype:Block -Order:119 +Order:120 Sets:NPH, MBS, SOM diff --git a/forge-gui/res/formats/Shadows over Innistrad Block.txt b/forge-gui/res/formats/Block/Shadows over Innistrad Block.txt similarity index 89% rename from forge-gui/res/formats/Shadows over Innistrad Block.txt rename to forge-gui/res/formats/Block/Shadows over Innistrad Block.txt index 6198d1a7888..813dd282227 100644 --- a/forge-gui/res/formats/Shadows over Innistrad Block.txt +++ b/forge-gui/res/formats/Block/Shadows over Innistrad Block.txt @@ -2,5 +2,5 @@ Name:Shadows over Innistrad Block Type:Historic Subtype:Block -Order:113 +Order:114 Sets:EMN, SOI diff --git a/forge-gui/res/formats/Shards of Alara Block Constructed, Alara Reborn.txt b/forge-gui/res/formats/Block/Shards of Alara Block Constructed, Alara Reborn.txt similarity index 91% rename from forge-gui/res/formats/Shards of Alara Block Constructed, Alara Reborn.txt rename to forge-gui/res/formats/Block/Shards of Alara Block Constructed, Alara Reborn.txt index f9535895a72..7ca87b971f5 100644 --- a/forge-gui/res/formats/Shards of Alara Block Constructed, Alara Reborn.txt +++ b/forge-gui/res/formats/Block/Shards of Alara Block Constructed, Alara Reborn.txt @@ -2,5 +2,5 @@ Name:Shards of Alara Block Constructed, Alara Reborn Type:Historic Subtype:Block -Order:450 +Order:455 Sets:ALA, CFX, ARB diff --git a/forge-gui/res/formats/Shards of Alara Block Constructed, Conflux.txt b/forge-gui/res/formats/Block/Shards of Alara Block Constructed, Conflux.txt similarity index 90% rename from forge-gui/res/formats/Shards of Alara Block Constructed, Conflux.txt rename to forge-gui/res/formats/Block/Shards of Alara Block Constructed, Conflux.txt index cb4c75110b3..1907c72516e 100644 --- a/forge-gui/res/formats/Shards of Alara Block Constructed, Conflux.txt +++ b/forge-gui/res/formats/Block/Shards of Alara Block Constructed, Conflux.txt @@ -2,5 +2,5 @@ Name:Shards of Alara Block Constructed, Conflux Type:Historic Subtype:Block -Order:445 +Order:450 Sets:ALA, CFX diff --git a/forge-gui/res/formats/Shards of Alara Block Constructed, Shards of Alara.txt b/forge-gui/res/formats/Block/Shards of Alara Block Constructed, Shards of Alara.txt similarity index 91% rename from forge-gui/res/formats/Shards of Alara Block Constructed, Shards of Alara.txt rename to forge-gui/res/formats/Block/Shards of Alara Block Constructed, Shards of Alara.txt index 6615315dac4..f14cb4a7005 100644 --- a/forge-gui/res/formats/Shards of Alara Block Constructed, Shards of Alara.txt +++ b/forge-gui/res/formats/Block/Shards of Alara Block Constructed, Shards of Alara.txt @@ -2,5 +2,5 @@ Name:Shards of Alara Block Constructed, Shards of Alara Type:Historic Subtype:Block -Order:440 +Order:445 Sets:ALA diff --git a/forge-gui/res/formats/Shards of Alara Block.txt b/forge-gui/res/formats/Block/Shards of Alara Block.txt similarity index 89% rename from forge-gui/res/formats/Shards of Alara Block.txt rename to forge-gui/res/formats/Block/Shards of Alara Block.txt index 9cfbbdfb3f3..53e8ecfa8fe 100644 --- a/forge-gui/res/formats/Shards of Alara Block.txt +++ b/forge-gui/res/formats/Block/Shards of Alara Block.txt @@ -2,5 +2,5 @@ Name:Shards of Alara Block Type:Historic Subtype:Block -Order:121 +Order:122 Sets:ARB, CFX, ALA diff --git a/forge-gui/res/formats/Tempest Block, Tempest.txt b/forge-gui/res/formats/Block/Tempest Block, Tempest.txt similarity index 88% rename from forge-gui/res/formats/Tempest Block, Tempest.txt rename to forge-gui/res/formats/Block/Tempest Block, Tempest.txt index 9bd4bd896b4..afddcf98b7d 100644 --- a/forge-gui/res/formats/Tempest Block, Tempest.txt +++ b/forge-gui/res/formats/Block/Tempest Block, Tempest.txt @@ -2,5 +2,5 @@ Name:Tempest Block, Tempest Type:Historic Subtype:Block -Order:198 +Order:203 Sets:TMP diff --git a/forge-gui/res/formats/Tempest Block.txt b/forge-gui/res/formats/Block/Tempest Block.txt similarity index 90% rename from forge-gui/res/formats/Tempest Block.txt rename to forge-gui/res/formats/Block/Tempest Block.txt index 379cb205a66..3576fbdd8ad 100644 --- a/forge-gui/res/formats/Tempest Block.txt +++ b/forge-gui/res/formats/Block/Tempest Block.txt @@ -2,6 +2,6 @@ Name:Tempest Block Type:Historic Subtype:Block -Order:132 +Order:133 Sets:EXO, STH, TMP Banned:Cursed Scroll diff --git a/forge-gui/res/formats/Block/Tempest-Stronghold Block, Stronghold.txt b/forge-gui/res/formats/Block/Tempest-Stronghold Block, Stronghold.txt new file mode 100644 index 00000000000..1fa07356336 --- /dev/null +++ b/forge-gui/res/formats/Block/Tempest-Stronghold Block, Stronghold.txt @@ -0,0 +1,6 @@ +[format] +Name:Tempest-Stronghold Block, Stronghold +Type:Historic +Subtype:Block +Order:210 +Sets:TMP, STH diff --git a/forge-gui/res/formats/Block/Tempest-Stronghold-Exodus Block, Exodus.txt b/forge-gui/res/formats/Block/Tempest-Stronghold-Exodus Block, Exodus.txt new file mode 100644 index 00000000000..bde516cb50c --- /dev/null +++ b/forge-gui/res/formats/Block/Tempest-Stronghold-Exodus Block, Exodus.txt @@ -0,0 +1,6 @@ +[format] +Name:Tempest-Stronghold-Exodus Block, Exodus +Type:Historic +Subtype:Block +Order:215 +Sets:TMP, STH, EXO diff --git a/forge-gui/res/formats/Theros Block.txt b/forge-gui/res/formats/Block/Theros Block.txt similarity index 88% rename from forge-gui/res/formats/Theros Block.txt rename to forge-gui/res/formats/Block/Theros Block.txt index 257eb21ea61..6c293080263 100644 --- a/forge-gui/res/formats/Theros Block.txt +++ b/forge-gui/res/formats/Block/Theros Block.txt @@ -2,5 +2,5 @@ Name:Theros Block Type:Historic Subtype:Block -Order:116 +Order:117 Sets:JOU, BNG, THS diff --git a/forge-gui/res/formats/Time Spiral Block Constructed, Future Sight.txt b/forge-gui/res/formats/Block/Time Spiral Block Constructed, Future Sight.txt similarity index 58% rename from forge-gui/res/formats/Time Spiral Block Constructed, Future Sight.txt rename to forge-gui/res/formats/Block/Time Spiral Block Constructed, Future Sight.txt index e76be817836..809f659b2b6 100644 --- a/forge-gui/res/formats/Time Spiral Block Constructed, Future Sight.txt +++ b/forge-gui/res/formats/Block/Time Spiral Block Constructed, Future Sight.txt @@ -2,6 +2,5 @@ Name:Time Spiral Block Constructed, Future Sight Type:Historic Subtype:Block -Order:400 +Order:405 Sets:TSP, TSB, PLC, FUT -Banned:Amulet of Quoz; Thawing Glaciers; Timmerian Fiends; Zuran Orb diff --git a/forge-gui/res/formats/Time Spiral Block Constructed, Planar Chaos.txt b/forge-gui/res/formats/Block/Time Spiral Block Constructed, Planar Chaos.txt similarity index 57% rename from forge-gui/res/formats/Time Spiral Block Constructed, Planar Chaos.txt rename to forge-gui/res/formats/Block/Time Spiral Block Constructed, Planar Chaos.txt index ec79d71eb83..285519d0577 100644 --- a/forge-gui/res/formats/Time Spiral Block Constructed, Planar Chaos.txt +++ b/forge-gui/res/formats/Block/Time Spiral Block Constructed, Planar Chaos.txt @@ -2,6 +2,5 @@ Name:Time Spiral Block Constructed, Planar Chaos Type:Historic Subtype:Block -Order:395 +Order:400 Sets:TSP, TSB, PLC -Banned:Amulet of Quoz; Thawing Glaciers; Timmerian Fiends; Zuran Orb diff --git a/forge-gui/res/formats/Block/Time Spiral Block Constructed, Time Spiral.txt b/forge-gui/res/formats/Block/Time Spiral Block Constructed, Time Spiral.txt new file mode 100644 index 00000000000..01d1e7a4ad9 --- /dev/null +++ b/forge-gui/res/formats/Block/Time Spiral Block Constructed, Time Spiral.txt @@ -0,0 +1,6 @@ +[format] +Name:Time Spiral Block Constructed, Time Spiral +Type:Historic +Subtype:Block +Order:395 +Sets:TSP, TSB diff --git a/forge-gui/res/formats/Time Spiral Block.txt b/forge-gui/res/formats/Block/Time Spiral Block.txt similarity index 89% rename from forge-gui/res/formats/Time Spiral Block.txt rename to forge-gui/res/formats/Block/Time Spiral Block.txt index 7b921e9951d..c0d7b66d34a 100644 --- a/forge-gui/res/formats/Time Spiral Block.txt +++ b/forge-gui/res/formats/Block/Time Spiral Block.txt @@ -2,5 +2,5 @@ Name:Time Spiral Block Type:Historic Subtype:Block -Order:123 +Order:124 Sets:FUT, PLC, TSP, TSB diff --git a/forge-gui/res/formats/Urza Block Constructed, Apr 1999.txt b/forge-gui/res/formats/Block/Urza Block Constructed, Apr 1999.txt similarity index 92% rename from forge-gui/res/formats/Urza Block Constructed, Apr 1999.txt rename to forge-gui/res/formats/Block/Urza Block Constructed, Apr 1999.txt index 8ae11d39bb6..899f7430896 100644 --- a/forge-gui/res/formats/Urza Block Constructed, Apr 1999.txt +++ b/forge-gui/res/formats/Block/Urza Block Constructed, Apr 1999.txt @@ -2,6 +2,6 @@ Name:Urza Block Constructed, Apr 1999 Type:Historic Subtype:Block -Order:226 +Order:231 Sets:USG, ULG Banned:Memory Jar; Time Spiral; Windfall diff --git a/forge-gui/res/formats/Urza Block Constructed, Urza's Destiny.txt b/forge-gui/res/formats/Block/Urza Block Constructed, Urza's Destiny.txt similarity index 95% rename from forge-gui/res/formats/Urza Block Constructed, Urza's Destiny.txt rename to forge-gui/res/formats/Block/Urza Block Constructed, Urza's Destiny.txt index 3501ce4b54e..c8caf1ad73d 100644 --- a/forge-gui/res/formats/Urza Block Constructed, Urza's Destiny.txt +++ b/forge-gui/res/formats/Block/Urza Block Constructed, Urza's Destiny.txt @@ -2,6 +2,6 @@ Name:Urza Block Constructed, Urza's Destiny Type:Historic Subtype:Block -Order:235 +Order:240 Sets:USG, ULG, UDS Banned:Gaea's Cradle; Memory Jar; Serra's Sanctum; Time Spiral; Tolarian Academy; Voltaic Key; Windfall diff --git a/forge-gui/res/formats/Urza Block.txt b/forge-gui/res/formats/Block/Urza Block.txt similarity index 94% rename from forge-gui/res/formats/Urza Block.txt rename to forge-gui/res/formats/Block/Urza Block.txt index 7d6cd650521..227b8f6a43b 100644 --- a/forge-gui/res/formats/Urza Block.txt +++ b/forge-gui/res/formats/Block/Urza Block.txt @@ -2,6 +2,6 @@ Name:Urza Block Type:Historic Subtype:Block -Order:131 +Order:132 Sets:UDS, ULG, USG Banned:Gaea's Cradle; Memory Jar; Serra's Sanctum; Time Spiral; Tolarian Academy; Voltaic Key; Windfall diff --git a/forge-gui/res/formats/Urza's Saga Block, Urza's Saga.txt b/forge-gui/res/formats/Block/Urza's Saga Block, Urza's Saga.txt similarity index 89% rename from forge-gui/res/formats/Urza's Saga Block, Urza's Saga.txt rename to forge-gui/res/formats/Block/Urza's Saga Block, Urza's Saga.txt index 0bac90ee038..6c39f40f1bb 100644 --- a/forge-gui/res/formats/Urza's Saga Block, Urza's Saga.txt +++ b/forge-gui/res/formats/Block/Urza's Saga Block, Urza's Saga.txt @@ -2,5 +2,5 @@ Name:Urza's Saga Block, Urza's Saga Type:Historic Subtype:Block -Order:215 +Order:220 Sets:USG diff --git a/forge-gui/res/formats/Zendikar Block Constructed, Rise of the Eldrazi.txt b/forge-gui/res/formats/Block/Zendikar Block Constructed, Rise of the Eldrazi.txt similarity index 91% rename from forge-gui/res/formats/Zendikar Block Constructed, Rise of the Eldrazi.txt rename to forge-gui/res/formats/Block/Zendikar Block Constructed, Rise of the Eldrazi.txt index 905be7006bf..e33ebae2b3b 100644 --- a/forge-gui/res/formats/Zendikar Block Constructed, Rise of the Eldrazi.txt +++ b/forge-gui/res/formats/Block/Zendikar Block Constructed, Rise of the Eldrazi.txt @@ -2,5 +2,5 @@ Name:Zendikar Block Constructed, Rise of the Eldrazi Type:Historic Subtype:Block -Order:467 +Order:472 Sets:ZEN, WWK, ROE diff --git a/forge-gui/res/formats/Zendikar Block Constructed, Worldwake.txt b/forge-gui/res/formats/Block/Zendikar Block Constructed, Worldwake.txt similarity index 90% rename from forge-gui/res/formats/Zendikar Block Constructed, Worldwake.txt rename to forge-gui/res/formats/Block/Zendikar Block Constructed, Worldwake.txt index 9e98804dfbf..85336d907a6 100644 --- a/forge-gui/res/formats/Zendikar Block Constructed, Worldwake.txt +++ b/forge-gui/res/formats/Block/Zendikar Block Constructed, Worldwake.txt @@ -2,5 +2,5 @@ Name:Zendikar Block Constructed, Worldwake Type:Historic Subtype:Block -Order:462 +Order:467 Sets:ZEN, WWK diff --git a/forge-gui/res/formats/Zendikar Block Constructed, Zendikar.txt b/forge-gui/res/formats/Block/Zendikar Block Constructed, Zendikar.txt similarity index 89% rename from forge-gui/res/formats/Zendikar Block Constructed, Zendikar.txt rename to forge-gui/res/formats/Block/Zendikar Block Constructed, Zendikar.txt index 4c7e512061b..c1b1f190f69 100644 --- a/forge-gui/res/formats/Zendikar Block Constructed, Zendikar.txt +++ b/forge-gui/res/formats/Block/Zendikar Block Constructed, Zendikar.txt @@ -2,5 +2,5 @@ Name:Zendikar Block Constructed, Zendikar Type:Historic Subtype:Block -Order:457 +Order:462 Sets:ZEN diff --git a/forge-gui/res/formats/Zendikar Block.txt b/forge-gui/res/formats/Block/Zendikar Block.txt similarity index 88% rename from forge-gui/res/formats/Zendikar Block.txt rename to forge-gui/res/formats/Block/Zendikar Block.txt index 95ca9e9e7db..e68d8bd9749 100644 --- a/forge-gui/res/formats/Zendikar Block.txt +++ b/forge-gui/res/formats/Block/Zendikar Block.txt @@ -2,5 +2,5 @@ Name:Zendikar Block Type:Historic Subtype:Block -Order:120 +Order:121 Sets:ROE, WWK, ZEN diff --git a/forge-gui/res/formats/Casual/Commander.txt b/forge-gui/res/formats/Casual/Commander.txt new file mode 100644 index 00000000000..7acf4e48b7f --- /dev/null +++ b/forge-gui/res/formats/Casual/Commander.txt @@ -0,0 +1,6 @@ +[format] +Name:Commander +Type:Casual +Subtype:Commander +Order:137 +Banned:Adriana's Valor; Advantageous Proclamation; Ashnod's Coupon; Assemble the Rank and Vile; Backup Plan; Brago's Favor; Double Cross; Double Deal; Double Dip; Double Play; Double Stroke; Double Take; Echoing Boon; Emissary's Ploy; Enter the Dungeon; Hired Heist; Hold the Perimeter; Hymn of the Wilds; Immediate Action; Incendiary Dissent; Iterative Analysis; Magical Hacker; Mox Lotus; Muzzio's Preparations; Natural Unity; Once More with Feeling; Power Play; R&D's Secret Lair; Richard Garfield, Ph.D.; Secret Summoning; Secrets of Paradise; Sentinel Dispatch; Sovereign's Realm; Staying Power; Summoner's Bond; Time Machine; Unexpected Potential; Weight Advantage; Worldknit; Amulet of Quoz; Bronze Tablet; Contract from Below; Darkpact; Demonic Attorney; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends; Ancestral Recall; Balance; Biorhythm; Black Lotus; Braids, Cabal Minion; Chaos Orb; Coalition Victory; Channel; Emrakul, the Aeons Torn; Erayo, Soratami Ascendant; Falling Star; Fastbond; Gifts Ungiven; Griselbrand; Karakas; Leovold, Emissary of Trest; Library of Alexandria; Limited Resources; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Painter's Servant; Panoptic Mirror; Primeval Titan; Prophet of Kruphix; Recurring Nightmare; Rofellos, Llanowar Emissary; Shahrazad; Sundering Titan; Sway of the Stars; Sylvan Primordial; Time Vault; Time Walk; Tinker; Tolarian Academy; Trace Secrets; Upheaval; Worldfire; Yawgmoth's Bargain diff --git a/forge-gui/res/formats/pauper.txt b/forge-gui/res/formats/Casual/pauper.txt similarity index 80% rename from forge-gui/res/formats/pauper.txt rename to forge-gui/res/formats/Casual/pauper.txt index 9dce591ca42..b1d4f6fbba7 100644 --- a/forge-gui/res/formats/pauper.txt +++ b/forge-gui/res/formats/Casual/pauper.txt @@ -3,4 +3,4 @@ Name:Pauper Order:108 Subtype:Custom Type:Casual -Rarities:L, C \ No newline at end of file +Rarities:L, C diff --git a/forge-gui/res/formats/Commander.txt b/forge-gui/res/formats/Commander.txt deleted file mode 100644 index 93b09934f72..00000000000 --- a/forge-gui/res/formats/Commander.txt +++ /dev/null @@ -1,6 +0,0 @@ -[format] -Name:Commander -Type:Casual -Subtype:Commander -Order:106 -Banned:Adriana's Valor; Advantageous Proclamation; Ashnod's Coupon; Assemble the Rank and Vile; Backup Plan; Brago's Favor; Double Cross; Double Deal; Double Dip; Double Play; Double Stroke; Double Take; Echoing Boon; Emissary's Ploy; Enter the Dungeon; Hired Heist; Hold the Perimeter; Hymn of the Wilds; Immediate Action; Incendiary Dissent; Iterative Analysis; Magical Hacker; Mox Lotus; Muzzio's Preparations; Natural Unity; Once More with Feeling; Power Play; RBanned:Adriana's Valor; Advantageous Proclamation; Ashnod's Coupon; Assemble the Rank and Vile; Backup Plan; Brago's Favor; Double Cross; Double Deal; Double Dip; Double Play; Double Stroke; Double Take; Echoing Boon; Emissary's Ploy; Enter the Dungeon; Hired Heist; Hold the Perimeter; Hymn of the Wilds; Immediate Action; Incendiary Dissent; Iterative Analysis; Magical Hacker; Mox Lotus; Muzzio's Preparations; Natural Unity; Once More with Feeling; Power Play; R&D's Secret Lair; Richard Garfield, Ph.D.; Secret Summoning; Secrets of Paradise; Sentinel Dispatch; Sovereign's Realm; Staying Power; Summoner's Bond; Time Machine; Unexpected Potential; Weight Advantage; Worldknit; Amulet of Quoz; Bronze Tablet; Contract from Below; Darkpact; Demonic Attorney; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends; Ancestral Recall; Balance; Biorhythm; Black Lotus; Braids, Cabal Minion; Chaos Orb; Coalition Victory; Channel; Emrakul, the Aeons Torn; Erayo, Soratami Ascendant; Falling Star; Fastbond; Gifts Ungiven; Griselbrand; Karakas; Leovold, Emissary of Trest; Library of Alexandria; Limited Resources; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Painter's Servant; Panoptic Mirror; Primeval Titan; Prophet of Kruphix; Recurring Nightmare; Rofellos, Llanowar Emissary; Shahrazad; Staying Power; Sundering Titan; Sway of the Stars; Sylvan Primordial; Time Machine; Time Vault; Time Walk; Tinker; Tolarian Academy; Trade Secrets; Upheaval; Worldfire; Yawgmoth's Bargain D's Secret Lair; Richard Garfield; Ph.D.; Secret Summoning; Secrets of Paradise; Sentinel Dispatch; Sovereign's Realm; Staying Power; Summoner's Bond; Time Machine; Unexpected Potential; Weight Advantage; Worldknit; Amulet of Quoz; Bronze Tablet; Contract from Below; Darkpact; Demonic Attorney; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends; Ancestral Recall; Balance; Biorhythm; Black Lotus; Braids; Cabal Minion; Chaos Orb; Coalition Victory; Channel; Emrakul; the Aeons Torn; Erayo; Soratami Ascendant; Falling Star; Fastbond; Gifts Ungiven; Griselbrand; Karakas; Leovold; Emissary of Trest; Library of Alexandria; Limited Resources; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Painter's Servant; Panoptic Mirror; Primeval Titan; Prophet of Kruphix; Recurring Nightmare; Rofellos; Llanowar Emissary; Shahrazad; Staying Power; Sundering Titan; Sway of the Stars; Sylvan Primordial; Time Machine; Time Vault; Time Walk; Tinker; Tolarian Academy; Trade Secrets; Upheaval; Worldfire; Yawgmoth's Bargain diff --git a/forge-gui/res/formats/Antiquities.txt b/forge-gui/res/formats/Custom/Antiquities.txt similarity index 97% rename from forge-gui/res/formats/Antiquities.txt rename to forge-gui/res/formats/Custom/Antiquities.txt index 1da37824b22..f202e6d2d49 100644 --- a/forge-gui/res/formats/Antiquities.txt +++ b/forge-gui/res/formats/Custom/Antiquities.txt @@ -2,7 +2,7 @@ Name:Antiquities Type:Historic Subtype:Custom -Order:142 +Order:147 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ Restricted:Ali from Cairo; Ancestral Recall; Berserk; Black Lotus; Braingeyser; Dingus Egg; Gauntlet of Might; Icy Manipulator; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Sol Ring; Timetwister; Time Vault; Time Walk Banned:Contract from Below; Darkpact; Demonic Attorney; Jeweled Bird; Shahrazad diff --git a/forge-gui/res/formats/Arabian Nights.txt b/forge-gui/res/formats/Custom/Arabian Nights.txt similarity index 89% rename from forge-gui/res/formats/Arabian Nights.txt rename to forge-gui/res/formats/Custom/Arabian Nights.txt index 1e0d9ef5812..55b448064c2 100644 --- a/forge-gui/res/formats/Arabian Nights.txt +++ b/forge-gui/res/formats/Custom/Arabian Nights.txt @@ -2,5 +2,5 @@ Name:Arabian Nights Type:Historic Subtype:Custom -Order:139 +Order:144 Sets:LEA, LEB, 2ED, ARN diff --git a/forge-gui/res/formats/Aug 2 1994.txt b/forge-gui/res/formats/Custom/Aug 2 1994.txt similarity index 99% rename from forge-gui/res/formats/Aug 2 1994.txt rename to forge-gui/res/formats/Custom/Aug 2 1994.txt index 2f86feb05e5..c9188f522be 100644 --- a/forge-gui/res/formats/Aug 2 1994.txt +++ b/forge-gui/res/formats/Custom/Aug 2 1994.txt @@ -2,7 +2,7 @@ Name:Aug 2 1994 Type:Historic Subtype:Custom -Order:148 +Order:153 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG Restricted:Adun Oakenshield; Ali from Cairo; Ancestral Recall; Angus Mackenzie; Arcades Sabboth; Axelrod Gunnarson; Ayesha Tanaka; Barktooth Warbeard; Bartel Runeaxe; Berserk; Black Lotus; Boris Devilboon; Braingeyser; Candelabra of Tawnos; Channel; Chaos Orb; Chromium; Copy Artifact; Dakkon Blackblade; Demonic Tutor; Falling Star; Feldon's Cane; Gabriel Angelfire; Gosta Dirk; Gwendlyn Di Corci; Halfdane; Hammerheim; Hazezon Tamar; Hunding Gjornersen; Ivory Tower; Jacques le Vert; Jasmine Boreal; Jedit Ojanen; Jerrard of the Closed Fist; Johan; Karakas; Kasimir the Lone Wolf; Kei Takahashi; Lady Caleria; Lady Evangela; Lady Orca; Library of Alexandria; Livonya Silone; Lord Magnus; Marhault Elsdragon; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Nebuchadnezzar; Nicol Bolas; Palladia-Mors; Pavel Maliki; Pendelhaven; Princess Lucrezia; Ragnar; Ramirez DePietro; Ramses Overdark; Rasputin Dreamweaver; Regrowth; Riven Turnbull; Rohgahh of Kher Keep; Rubinia Soulsinger; Sir Shandlar of Eberyn; Sivitri Scarzam; Sol Ring; Sol'kanar the Swamp King; Stangg; Sunastian Falconer; Tetsuo Umezawa; The Lady of the Mountain; The Tabernacle at Pendrell Vale; Timetwister; Time Walk; Tobias Andrion; Tolaria; Tor Wauki; Torsten Von Ursus; Tuknir Deathlock; Underworld Dreams; Ur-Drago; Urborg; Vaevictis Asmadi; Wheel of Fortune; Xira Arien Banned:Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Jeweled Bird; Shahrazad; Time Vault diff --git a/forge-gui/res/formats/Conspiracy.txt b/forge-gui/res/formats/Custom/Conspiracy.txt similarity index 87% rename from forge-gui/res/formats/Conspiracy.txt rename to forge-gui/res/formats/Custom/Conspiracy.txt index fbe2e873228..08ba8371dbf 100644 --- a/forge-gui/res/formats/Conspiracy.txt +++ b/forge-gui/res/formats/Custom/Conspiracy.txt @@ -2,5 +2,5 @@ Name:Conspiracy Type:Historic Subtype:Custom -Order:186 +Order:138 Sets:CNS, CN2 diff --git a/forge-gui/res/formats/Fallen Empires.txt b/forge-gui/res/formats/Custom/Fallen Empires.txt similarity index 99% rename from forge-gui/res/formats/Fallen Empires.txt rename to forge-gui/res/formats/Custom/Fallen Empires.txt index d8d9d546b31..3134607a92f 100644 --- a/forge-gui/res/formats/Fallen Empires.txt +++ b/forge-gui/res/formats/Custom/Fallen Empires.txt @@ -2,7 +2,7 @@ Name:Fallen Empires Type:Historic Subtype:Custom -Order:151 +Order:156 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM Restricted:Adun Oakenshield; Ali from Cairo; Ancestral Recall; Angus Mackenzie; Arcades Sabboth; Axelrod Gunnarson; Ayesha Tanaka; Barktooth Warbeard; Bartel Runeaxe; Berserk; Black Lotus; Boris Devilboon; Braingeyser; Candelabra of Tawnos; Channel; Chaos Orb; Chromium; Copy Artifact; Dakkon Blackblade; Demonic Tutor; Falling Star; Feldon's Cane; Gabriel Angelfire; Gosta Dirk; Gwendlyn Di Corci; Halfdane; Hammerheim; Hazezon Tamar; Hunding Gjornersen; Ivory Tower; Jacques le Vert; Jasmine Boreal; Jedit Ojanen; Jerrard of the Closed Fist; Johan; Karakas; Kasimir the Lone Wolf; Kei Takahashi; Lady Caleria; Lady Evangela; Lady Orca; Library of Alexandria; Livonya Silone; Lord Magnus; Marhault Elsdragon; Maze of Ith; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Nebuchadnezzar; Nicol Bolas; Palladia-Mors; Pavel Maliki; Pendelhaven; Princess Lucrezia; Ragnar; Ramirez DePietro; Ramses Overdark; Rasputin Dreamweaver; Regrowth; Riven Turnbull; Rohgahh of Kher Keep; Rubinia Soulsinger; Sir Shandlar of Eberyn; Sivitri Scarzam; Sol Ring; Sol'kanar the Swamp King; Stangg; Sunastian Falconer; Tetsuo Umezawa; The Lady of the Mountain; The Tabernacle at Pendrell Vale; Timetwister; Time Walk; Tobias Andrion; Tolaria; Tor Wauki; Torsten Von Ursus; Tuknir Deathlock; Underworld Dreams; Ur-Drago; Urborg; Vaevictis Asmadi; Wheel of Fortune; Xira Arien Banned:Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Jeweled Bird; Shahrazad; Time Vault diff --git a/forge-gui/res/formats/Feb 23 1994.txt b/forge-gui/res/formats/Custom/Feb 23 1994.txt similarity index 97% rename from forge-gui/res/formats/Feb 23 1994.txt rename to forge-gui/res/formats/Custom/Feb 23 1994.txt index 2da3ba9b4d5..5aa7d3bca6c 100644 --- a/forge-gui/res/formats/Feb 23 1994.txt +++ b/forge-gui/res/formats/Custom/Feb 23 1994.txt @@ -2,7 +2,7 @@ Name:Feb 23 1994 Type:Historic Subtype:Custom -Order:141 +Order:146 Sets:LEA, LEB, 2ED, ARN Restricted:Ali from Cairo; Ancestral Recall; Berserk; Black Lotus; Braingeyser; Dingus Egg; Gauntlet of Might; Icy Manipulator; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Sol Ring; Timetwister; Time Vault; Time Walk Banned:Contract from Below; Darkpact; Demonic Attorney; Jeweled Bird; Shahrazad diff --git a/forge-gui/res/formats/Custom/Ice Age-Alliances, Oct 1996.txt b/forge-gui/res/formats/Custom/Ice Age-Alliances, Oct 1996.txt new file mode 100644 index 00000000000..0d0801180b8 --- /dev/null +++ b/forge-gui/res/formats/Custom/Ice Age-Alliances, Oct 1996.txt @@ -0,0 +1,8 @@ +[format] +Name:Ice Age-Alliances, Oct 1996 +Type:Historic +Subtype:Custom +Order:181 +Sets:ICE, ALL +Restricted:Zuran Orb +Banned:Amulet of Quoz diff --git a/forge-gui/res/formats/Ice Age-Only, Oct 1996.txt b/forge-gui/res/formats/Custom/Ice Age-Only, Oct 1996.txt similarity index 92% rename from forge-gui/res/formats/Ice Age-Only, Oct 1996.txt rename to forge-gui/res/formats/Custom/Ice Age-Only, Oct 1996.txt index 69498cc4e1a..e433d46dd8e 100644 --- a/forge-gui/res/formats/Ice Age-Only, Oct 1996.txt +++ b/forge-gui/res/formats/Custom/Ice Age-Only, Oct 1996.txt @@ -2,7 +2,7 @@ Name:Ice Age-Only, Oct 1996 Type:Historic Subtype:Custom -Order:175 +Order:180 Sets:ICE Restricted:Zuran Orb Banned:Amulet of Quoz diff --git a/forge-gui/res/formats/Jan 25 1994.txt b/forge-gui/res/formats/Custom/Jan 25 1994.txt similarity index 97% rename from forge-gui/res/formats/Jan 25 1994.txt rename to forge-gui/res/formats/Custom/Jan 25 1994.txt index 027cb742fdf..6657a5fb7c0 100644 --- a/forge-gui/res/formats/Jan 25 1994.txt +++ b/forge-gui/res/formats/Custom/Jan 25 1994.txt @@ -2,7 +2,7 @@ Name:Jan 25 1994 Type:Historic Subtype:Custom -Order:140 +Order:145 Sets:LEA, LEB, 2ED, ARN Restricted:Ali from Cairo; Ancestral Recall; Berserk; Black Lotus; Braingeyser; Dingus Egg; Gauntlet of Might; Icy Manipulator; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Orcish Oriflamme; Rukh Egg; Sol Ring; Timetwister; Time Vault; Time Walk Banned:Contract from Below; Darkpact; Demonic Attorney; Jeweled Bird; Shahrazad diff --git a/forge-gui/res/formats/Jun 13 1994.txt b/forge-gui/res/formats/Custom/Jun 13 1994.txt similarity index 98% rename from forge-gui/res/formats/Jun 13 1994.txt rename to forge-gui/res/formats/Custom/Jun 13 1994.txt index 53a299e783e..b0bb1cd72d3 100644 --- a/forge-gui/res/formats/Jun 13 1994.txt +++ b/forge-gui/res/formats/Custom/Jun 13 1994.txt @@ -2,7 +2,7 @@ Name:Jun 13 1994 Type:Historic Subtype:Custom -Order:147 +Order:152 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG Restricted:Ali from Cairo; Ancestral Recall; Berserk; Black Lotus; Braingeyser; Candelabra of Tawnos; Channel; Copy Artifact; Demonic Tutor; Feldon's Cane; Ivory Tower; Library of Alexandria; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Regrowth; Sol Ring; Timetwister; Time Walk; Wheel of Fortune Banned:Contract from Below; Darkpact; Demonic Attorney; Jeweled Bird; Shahrazad; Time Vault diff --git a/forge-gui/res/formats/Legends.txt b/forge-gui/res/formats/Custom/Legends.txt similarity index 98% rename from forge-gui/res/formats/Legends.txt rename to forge-gui/res/formats/Custom/Legends.txt index 55aa20ad0be..4eec586dc01 100644 --- a/forge-gui/res/formats/Legends.txt +++ b/forge-gui/res/formats/Custom/Legends.txt @@ -2,7 +2,7 @@ Name:Legends Type:Historic Subtype:Custom -Order:146 +Order:151 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG Restricted:Ali from Cairo; Ancestral Recall; Berserk; Black Lotus; Braingeyser; Candelabra of Tawnos; Channel; Copy Artifact; Demonic Tutor; Feldon's Cane; Ivory Tower; Library of Alexandria; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Regrowth; Sol Ring; Timetwister; Time Walk; Wheel of Fortune Banned:Contract from Below; Darkpact; Demonic Attorney; Jeweled Bird; Shahrazad; Time Vault diff --git a/forge-gui/res/formats/Limited Edition Alpha.txt b/forge-gui/res/formats/Custom/Limited Edition Alpha.txt similarity index 88% rename from forge-gui/res/formats/Limited Edition Alpha.txt rename to forge-gui/res/formats/Custom/Limited Edition Alpha.txt index b8356e14365..211c2be6650 100644 --- a/forge-gui/res/formats/Limited Edition Alpha.txt +++ b/forge-gui/res/formats/Custom/Limited Edition Alpha.txt @@ -2,5 +2,5 @@ Name:Limited Edition Alpha Type:Historic Subtype:Custom -Order:136 +Order:141 Sets:LEA diff --git a/forge-gui/res/formats/Limited Edition Beta.txt b/forge-gui/res/formats/Custom/Limited Edition Beta.txt similarity index 88% rename from forge-gui/res/formats/Limited Edition Beta.txt rename to forge-gui/res/formats/Custom/Limited Edition Beta.txt index 2e258d0dd33..dc162f7105e 100644 --- a/forge-gui/res/formats/Limited Edition Beta.txt +++ b/forge-gui/res/formats/Custom/Limited Edition Beta.txt @@ -2,5 +2,5 @@ Name:Limited Edition Beta Type:Historic Subtype:Custom -Order:137 +Order:142 Sets:LEA, LEB diff --git a/forge-gui/res/formats/Mar 23 1994.txt b/forge-gui/res/formats/Custom/Mar 23 1994.txt similarity index 97% rename from forge-gui/res/formats/Mar 23 1994.txt rename to forge-gui/res/formats/Custom/Mar 23 1994.txt index 49166308401..ca1770bbaf1 100644 --- a/forge-gui/res/formats/Mar 23 1994.txt +++ b/forge-gui/res/formats/Custom/Mar 23 1994.txt @@ -2,7 +2,7 @@ Name:Mar 23 1994 Type:Historic Subtype:Custom -Order:143 +Order:148 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ Restricted:Ali from Cairo; Ancestral Recall; Berserk; Black Lotus; Braingeyser; Channel; Copy Artifact; Demonic Tutor; Dingus Egg; Gauntlet of Might; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Regrowth; Sol Ring; Timetwister; Time Walk; Wheel of Fortune Banned:Contract from Below; Darkpact; Demonic Attorney; Jeweled Bird; Shahrazad; Time Vault diff --git a/forge-gui/res/formats/May 1994.txt b/forge-gui/res/formats/Custom/May 1994.txt similarity index 98% rename from forge-gui/res/formats/May 1994.txt rename to forge-gui/res/formats/Custom/May 1994.txt index 59f1400712a..71f422f2dca 100644 --- a/forge-gui/res/formats/May 1994.txt +++ b/forge-gui/res/formats/Custom/May 1994.txt @@ -2,7 +2,7 @@ Name:May 1994 Type:Historic Subtype:Custom -Order:145 +Order:150 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED Restricted:Ali from Cairo; Ancestral Recall; Berserk; Black Lotus; Braingeyser; Candelabra of Tawnos; Channel; Copy Artifact; Demonic Tutor; Feldon's Cane; Ivory Tower; Library of Alexandria; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Regrowth; Sol Ring; Timetwister; Time Walk; Wheel of Fortune Banned:Contract from Below; Darkpact; Demonic Attorney; Jeweled Bird; Shahrazad; Time Vault diff --git a/forge-gui/res/formats/Oct 10 1994.txt b/forge-gui/res/formats/Custom/Oct 10 1994.txt similarity index 99% rename from forge-gui/res/formats/Oct 10 1994.txt rename to forge-gui/res/formats/Custom/Oct 10 1994.txt index 6ab2f8a4bf0..5c142da6b13 100644 --- a/forge-gui/res/formats/Oct 10 1994.txt +++ b/forge-gui/res/formats/Custom/Oct 10 1994.txt @@ -2,7 +2,7 @@ Name:Oct 10 1994 Type:Historic Subtype:Custom -Order:150 +Order:155 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK Restricted:Adun Oakenshield; Ali from Cairo; Ancestral Recall; Angus Mackenzie; Arcades Sabboth; Axelrod Gunnarson; Ayesha Tanaka; Barktooth Warbeard; Bartel Runeaxe; Berserk; Black Lotus; Boris Devilboon; Braingeyser; Candelabra of Tawnos; Channel; Chaos Orb; Chromium; Copy Artifact; Dakkon Blackblade; Demonic Tutor; Falling Star; Feldon's Cane; Gabriel Angelfire; Gosta Dirk; Gwendlyn Di Corci; Halfdane; Hammerheim; Hazezon Tamar; Hunding Gjornersen; Ivory Tower; Jacques le Vert; Jasmine Boreal; Jedit Ojanen; Jerrard of the Closed Fist; Johan; Karakas; Kasimir the Lone Wolf; Kei Takahashi; Lady Caleria; Lady Evangela; Lady Orca; Library of Alexandria; Livonya Silone; Lord Magnus; Marhault Elsdragon; Maze of Ith; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Nebuchadnezzar; Nicol Bolas; Palladia-Mors; Pavel Maliki; Pendelhaven; Princess Lucrezia; Ragnar; Ramirez DePietro; Ramses Overdark; Rasputin Dreamweaver; Regrowth; Riven Turnbull; Rohgahh of Kher Keep; Rubinia Soulsinger; Sir Shandlar of Eberyn; Sivitri Scarzam; Sol Ring; Sol'kanar the Swamp King; Stangg; Sunastian Falconer; Tetsuo Umezawa; The Lady of the Mountain; The Tabernacle at Pendrell Vale; Timetwister; Time Walk; Tobias Andrion; Tolaria; Tor Wauki; Torsten Von Ursus; Tuknir Deathlock; Underworld Dreams; Ur-Drago; Urborg; Vaevictis Asmadi; Wheel of Fortune; Xira Arien Banned:Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Jeweled Bird; Shahrazad; Time Vault diff --git a/forge-gui/res/formats/Revised Edition.txt b/forge-gui/res/formats/Custom/Revised Edition.txt similarity index 97% rename from forge-gui/res/formats/Revised Edition.txt rename to forge-gui/res/formats/Custom/Revised Edition.txt index e8e51fafc91..b05fbcfd8a6 100644 --- a/forge-gui/res/formats/Revised Edition.txt +++ b/forge-gui/res/formats/Custom/Revised Edition.txt @@ -2,7 +2,7 @@ Name:Revised Edition Type:Historic Subtype:Custom -Order:144 +Order:149 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED Restricted:Ali from Cairo; Ancestral Recall; Berserk; Black Lotus; Braingeyser; Channel; Copy Artifact; Demonic Tutor; Dingus Egg; Gauntlet of Might; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Regrowth; Sol Ring; Timetwister; Time Walk; Wheel of Fortune Banned:Contract from Below; Darkpact; Demonic Attorney; Jeweled Bird; Shahrazad; Time Vault diff --git a/forge-gui/res/formats/The Dark.txt b/forge-gui/res/formats/Custom/The Dark.txt similarity index 99% rename from forge-gui/res/formats/The Dark.txt rename to forge-gui/res/formats/Custom/The Dark.txt index 968d8da8973..6369d1f1f8c 100644 --- a/forge-gui/res/formats/The Dark.txt +++ b/forge-gui/res/formats/Custom/The Dark.txt @@ -2,7 +2,7 @@ Name:The Dark Type:Historic Subtype:Custom -Order:149 +Order:154 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK Restricted:Adun Oakenshield; Ali from Cairo; Ancestral Recall; Angus Mackenzie; Arcades Sabboth; Axelrod Gunnarson; Ayesha Tanaka; Barktooth Warbeard; Bartel Runeaxe; Berserk; Black Lotus; Boris Devilboon; Braingeyser; Candelabra of Tawnos; Channel; Chaos Orb; Chromium; Copy Artifact; Dakkon Blackblade; Demonic Tutor; Falling Star; Feldon's Cane; Gabriel Angelfire; Gosta Dirk; Gwendlyn Di Corci; Halfdane; Hammerheim; Hazezon Tamar; Hunding Gjornersen; Ivory Tower; Jacques le Vert; Jasmine Boreal; Jedit Ojanen; Jerrard of the Closed Fist; Johan; Karakas; Kasimir the Lone Wolf; Kei Takahashi; Lady Caleria; Lady Evangela; Lady Orca; Library of Alexandria; Livonya Silone; Lord Magnus; Marhault Elsdragon; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Nebuchadnezzar; Nicol Bolas; Palladia-Mors; Pavel Maliki; Pendelhaven; Princess Lucrezia; Ragnar; Ramirez DePietro; Ramses Overdark; Rasputin Dreamweaver; Regrowth; Riven Turnbull; Rohgahh of Kher Keep; Rubinia Soulsinger; Sir Shandlar of Eberyn; Sivitri Scarzam; Sol Ring; Sol'kanar the Swamp King; Stangg; Sunastian Falconer; Tetsuo Umezawa; The Lady of the Mountain; The Tabernacle at Pendrell Vale; Timetwister; Time Walk; Tobias Andrion; Tolaria; Tor Wauki; Torsten Von Ursus; Tuknir Deathlock; Underworld Dreams; Ur-Drago; Urborg; Vaevictis Asmadi; Wheel of Fortune; Xira Arien Banned:Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Jeweled Bird; Shahrazad; Time Vault diff --git a/forge-gui/res/formats/Un-Sets.txt b/forge-gui/res/formats/Custom/Un-Sets.txt similarity index 87% rename from forge-gui/res/formats/Un-Sets.txt rename to forge-gui/res/formats/Custom/Un-Sets.txt index 35697fe4d23..9aaf64ca169 100644 --- a/forge-gui/res/formats/Un-Sets.txt +++ b/forge-gui/res/formats/Custom/Un-Sets.txt @@ -2,5 +2,5 @@ Name:Un-Sets Type:Historic Subtype:Custom -Order:135 +Order:136 Sets:UST, UNH, UGL diff --git a/forge-gui/res/formats/Unlimited Edition.txt b/forge-gui/res/formats/Custom/Unlimited Edition.txt similarity index 88% rename from forge-gui/res/formats/Unlimited Edition.txt rename to forge-gui/res/formats/Custom/Unlimited Edition.txt index d6bfa0890a9..2a969ac9610 100644 --- a/forge-gui/res/formats/Unlimited Edition.txt +++ b/forge-gui/res/formats/Custom/Unlimited Edition.txt @@ -2,5 +2,5 @@ Name:Unlimited Edition Type:Historic Subtype:Custom -Order:138 +Order:143 Sets:LEA, LEB, 2ED diff --git a/forge-gui/res/formats/Digital/Duels.txt b/forge-gui/res/formats/Digital/Duels.txt index 07ffd6ae5d0..ec24948d28f 100644 --- a/forge-gui/res/formats/Digital/Duels.txt +++ b/forge-gui/res/formats/Digital/Duels.txt @@ -2,5 +2,5 @@ Name:Duels Type:Digital Subtype:Videogame -Order:190 +Order:140 Sets:ORI, BFZ, OGW, SOI, EMN, KLD, AER, AKH diff --git a/forge-gui/res/formats/Digital/MTGO.txt b/forge-gui/res/formats/Digital/MTGO.txt index 11e2ea15ae5..eb3304e3c38 100644 --- a/forge-gui/res/formats/Digital/MTGO.txt +++ b/forge-gui/res/formats/Digital/MTGO.txt @@ -2,5 +2,5 @@ Name:MTGO Type:Digital Subtype:MTGO -Order:188 +Order:139 Sets:ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, MED, LRW, MOR, SHM, EVE, ME2, ALA, CFX, ARB, M10, TD0, FVE, ME3, ZEN, WWK, ROE, M11, SOM, TD1, MBED, ME4, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, TD2, GTC, DGM, M14, THS, BNG, JOU, VMA, M15, KTK, FRF, DTK, TPR, MM2, ORI, BFZ, OGW, PZ1, OGW, EMA, EMN, PZ2, YMC, AER, MM3, AKH, HOU, XLN diff --git a/forge-gui/res/formats/Digital/MicroProse.txt b/forge-gui/res/formats/Digital/MicroProse.txt index 843092946b9..c277a880211 100644 --- a/forge-gui/res/formats/Digital/MicroProse.txt +++ b/forge-gui/res/formats/Digital/MicroProse.txt @@ -2,7 +2,7 @@ Name:MicroProse Type:Digital Subtype:Videogame -Order:113 +Order:110 Sets:MTG, STA, AST, DOTP, MTG_R, STA_R, DOTP_R Banned:Channel; Mind Twist; Bronze Tablet; Contract from Below; Darkpact; Demonic Attorney; Jeweled Bird; Rebirth; Tempest Efreet Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Demonic Tutor; Fastbond; Fork; Ivory Tower; Library of Alexandria; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Regrowth; Sol Ring; Time Walk; Timetwister; Wheel of Fortune diff --git a/forge-gui/res/formats/Extended, Apr 2000.txt b/forge-gui/res/formats/Extended, Apr 2000.txt deleted file mode 100644 index 809e146ba71..00000000000 --- a/forge-gui/res/formats/Extended, Apr 2000.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Extended, Apr 2000 -Type:Historic -Subtype:Rotating -Order:253 -Sets:3ED, 5ED, 6ED, ICE, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG, UDS, MMQ, NMS -Banned:Aladdin's Lamp; Amulet of Quoz; Animate Artifact; Armageddon Clock; Balance; Basalt Monolith; Black Vise; Black Ward; Blessing; Blue Elemental Blast; Blue Ward; Braingeyser; Brass Man; Celestial Prism; Channel; Chaoslace; Clone; Conservator; Contract from Below; Control Magic; Conversion; Copy Artifact; Creature Bond; Dark Ritual; Darkpact; Deathlace; Demonic Attorney; Demonic Hordes; Demonic Tutor; Dragon Whelp; Dream Halls; Dwarven Weaponsmith; Earth Elemental; Earthbind; Earthcraft; Ebony Horse; El-Hajjaj; Farmstead; Fastbond; Fork; Gaea's Liege; Goblin Balloon Brigade; Granite Gargoyle; Gray Ogre; Green Ward; Guardian Angel; Holy Armor; Hypnotic Specter; Island Fish Jasconius; Ivory Tower; Jandor's Ring; Juggernaut; Jump; Kird Ape; Kormus Bell; Kudzu; Lance; Lifelace; Lightning Bolt; Living Wall; Lotus Petal; Magnetic Mountain; Mahamoti Djinn; Mana Crypt; Mana Vault; Memory Jar; Mijae Djinn; Mind Over Matter; Mind Twist; Mishra's War Machine; Nettling Imp; Northern Paladin; Onulet; Power Leak; Power Surge; Purelace; Rebirth; Reconstruction; Red Elemental Blast; Red Ward; Regrowth; Resurrection; Reverse Polarity; Roc of Kher Ridges; Rock Hydra; Rocket Launcher; Royal Assassin; Sacrifice; Savannah Lions; Scavenging Ghoul; Sedge Troll; Sengir Vampire; Serendib Efreet; Serra Angel; Simulacrum; Siren's Call; Sol Ring; Sunglasses of Urza; The Rack; Thoughtlace; Timber Wolves; Time Spiral; Timmerian Fiends; Tolarian Academy; Tunnel; Uthden Troll; Vesuvan Doppelganger; Veteran Bodyguard; Volcanic Eruption; Wall of Ice; Wall of Water; Wall of Wood; Water Elemental; Web; Wheel of Fortune; White Ward; Will-o'-the-Wisp; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Apr 2001.txt b/forge-gui/res/formats/Extended, Apr 2001.txt deleted file mode 100644 index df07929dd92..00000000000 --- a/forge-gui/res/formats/Extended, Apr 2001.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Extended, Apr 2001 -Type:Historic -Subtype:Rotating -Order:271 -Sets:3ED, 5ED, 6ED, ICE, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG, UDS, MMQ, NMS, PCY, INV, PLS -Banned:Aladdin's Lamp; Amulet of Quoz; Animate Artifact; Armageddon Clock; Balance; Basalt Monolith; Black Vise; Black Ward; Blessing; Blue Elemental Blast; Blue Ward; Braingeyser; Brass Man; Celestial Prism; Channel; Chaoslace; Clone; Conservator; Contract from Below; Control Magic; Conversion; Copy Artifact; Creature Bond; Dark Ritual; Darkpact; Deathlace; Demonic Attorney; Demonic Consultation; Demonic Hordes; Demonic Tutor; Dragon Whelp; Dream Halls; Dwarven Weaponsmith; Earth Elemental; Earthbind; Earthcraft; Ebony Horse; El-Hajjaj; Farmstead; Fastbond; Fork; Gaea's Liege; Goblin Balloon Brigade; Granite Gargoyle; Gray Ogre; Green Ward; Guardian Angel; Holy Armor; Hypnotic Specter; Island Fish Jasconius; Ivory Tower; Jandor's Ring; Juggernaut; Jump; Kird Ape; Kormus Bell; Kudzu; Lance; Lifelace; Lightning Bolt; Living Wall; Lotus Petal; Magnetic Mountain; Mahamoti Djinn; Mana Crypt; Mana Vault; Memory Jar; Mijae Djinn; Mind Over Matter; Mind Twist; Mishra's War Machine; Necropotence; Nettling Imp; Northern Paladin; Onulet; Power Leak; Power Surge; Purelace; Rebirth; Reconstruction; Red Elemental Blast; Red Ward; Regrowth; Replenish; Resurrection; Reverse Polarity; Roc of Kher Ridges; Rock Hydra; Rocket Launcher; Royal Assassin; Sacrifice; Savannah Lions; Scavenging Ghoul; Sedge Troll; Sengir Vampire; Serendib Efreet; Serra Angel; Simulacrum; Siren's Call; Sol Ring; Sunglasses of Urza; Survival of the Fittest; The Rack; Thoughtlace; Timber Wolves; Time Spiral; Timmerian Fiends; Tolarian Academy; Tunnel; Uthden Troll; Vesuvan Doppelganger; Veteran Bodyguard; Volcanic Eruption; Wall of Ice; Wall of Water; Wall of Wood; Water Elemental; Web; Wheel of Fortune; White Ward; Will-o'-the-Wisp; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Aug 1999.txt b/forge-gui/res/formats/Extended, Aug 1999.txt deleted file mode 100644 index 1435cb73a6a..00000000000 --- a/forge-gui/res/formats/Extended, Aug 1999.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Extended, Aug 1999 -Type:Historic -Subtype:Rotating -Order:239 -Sets:3ED, 4ED, CHR, 5ED, 6ED, DRK, ARENA, FEM, ICE, CHR, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG, UDS -Banned:Amulet of Quoz; Balance; Basalt Monolith; Black Vise; Braingeyser; Bronze Tablet; Channel; Clone; Dwarven Weaponsmith; Contract from Below; Copy Artifact; Darkpact; Demonic Attorney; Demonic Tutor; Earthbind; Farmstead; Fastbond; Fork; Granite Gargoyle; Guardian Angel; Hypnotic Specter; Ivory Tower; Jandor's Ring; Jeweled Bird; Juggernaut; Kird Ape; Kudzu; Lance; Living Wall; Mana Crypt; Maze of Ith; Memory Jar; Mijae Djinn; Mind Twist; Nettling Imp; Rebirth; Reconstruction; Regrowth; Resurrection; Reverse Polarity; Roc of Kher Ridges; Rock Hydra; Rocket Launcher; Sacrifice; Sedge Troll; Serendib Efreet; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Timmerian Fiends; Tolarian Academy; Vesuvan Doppelganger; Veteran Bodyguard; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Invasion.txt b/forge-gui/res/formats/Extended, Invasion.txt deleted file mode 100644 index 267696abf74..00000000000 --- a/forge-gui/res/formats/Extended, Invasion.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Extended, Invasion -Type:Historic -Subtype:Rotating -Order:262 -Sets:3ED, 5ED, 6ED, ICE, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG, UDS, MMQ, NMS, PCY, INV -Banned:Aladdin's Lamp; Amulet of Quoz; Animate Artifact; Armageddon Clock; Balance; Basalt Monolith; Black Vise; Black Ward; Blessing; Blue Elemental Blast; Blue Ward; Braingeyser; Brass Man; Celestial Prism; Channel; Chaoslace; Clone; Conservator; Contract from Below; Control Magic; Conversion; Copy Artifact; Creature Bond; Dark Ritual; Darkpact; Deathlace; Demonic Attorney; Demonic Hordes; Demonic Tutor; Dragon Whelp; Dream Halls; Dwarven Weaponsmith; Earth Elemental; Earthbind; Earthcraft; Ebony Horse; El-Hajjaj; Farmstead; Fastbond; Fork; Gaea's Liege; Goblin Balloon Brigade; Granite Gargoyle; Gray Ogre; Green Ward; Guardian Angel; Holy Armor; Hypnotic Specter; Island Fish Jasconius; Ivory Tower; Jandor's Ring; Juggernaut; Jump; Kird Ape; Kormus Bell; Kudzu; Lance; Lifelace; Lightning Bolt; Living Wall; Lotus Petal; Magnetic Mountain; Mahamoti Djinn; Mana Crypt; Mana Vault; Memory Jar; Mijae Djinn; Mind Over Matter; Mind Twist; Mishra's War Machine; Nettling Imp; Northern Paladin; Onulet; Power Leak; Power Surge; Purelace; Rebirth; Reconstruction; Red Elemental Blast; Red Ward; Regrowth; Resurrection; Reverse Polarity; Roc of Kher Ridges; Rock Hydra; Rocket Launcher; Royal Assassin; Sacrifice; Savannah Lions; Scavenging Ghoul; Sedge Troll; Sengir Vampire; Serendib Efreet; Serra Angel; Simulacrum; Siren's Call; Sol Ring; Sunglasses of Urza; The Rack; Thoughtlace; Timber Wolves; Time Spiral; Timmerian Fiends; Tolarian Academy; Tunnel; Uthden Troll; Vesuvan Doppelganger; Veteran Bodyguard; Volcanic Eruption; Wall of Ice; Wall of Water; Wall of Wood; Water Elemental; Web; Wheel of Fortune; White Ward; Will-o'-the-Wisp; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Judgment.txt b/forge-gui/res/formats/Extended, Judgment.txt deleted file mode 100644 index f86cfa7e3b1..00000000000 --- a/forge-gui/res/formats/Extended, Judgment.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Extended, Judgment -Type:Historic -Subtype:Rotating -Order:294 -Sets:3ED, 5ED, 6ED, 7ED, ICE, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG, UDS, MMQ, NMS, PCY, INV, PLS, APC, ODY, TOR, JUD -Banned:Aladdin's Lamp; Amulet of Quoz; Animate Artifact; Armageddon Clock; Balance; Basalt Monolith; Black Vise; Black Ward; Blessing; Blue Elemental Blast; Blue Ward; Braingeyser; Brass Man; Celestial Prism; Channel; Chaoslace; Clone; Conservator; Contract from Below; Control Magic; Conversion; Copy Artifact; Creature Bond; Dark Ritual; Darkpact; Deathlace; Demonic Attorney; Demonic Consultation; Demonic Hordes; Demonic Tutor; Dragon Whelp; Dream Halls; Dwarven Weaponsmith; Earth Elemental; Earthbind; Earthcraft; Ebony Horse; El-Hajjaj; Farmstead; Fastbond; Fork; Gaea's Liege; Goblin Balloon Brigade; Granite Gargoyle; Gray Ogre; Green Ward; Guardian Angel; Holy Armor; Hypnotic Specter; Island Fish Jasconius; Ivory Tower; Jandor's Ring; Juggernaut; Jump; Kird Ape; Kormus Bell; Kudzu; Lance; Lifelace; Lightning Bolt; Living Wall; Lotus Petal; Magnetic Mountain; Mana Crypt; Mana Vault; Memory Jar; Mijae Djinn; Mind Over Matter; Mind Twist; Mishra's War Machine; Necropotence; Nettling Imp; Onulet; Power Leak; Power Surge; Purelace; Rebirth; Reconstruction; Red Elemental Blast; Red Ward; Regrowth; Replenish; Resurrection; Reverse Polarity; Roc of Kher Ridges; Rock Hydra; Rocket Launcher; Royal Assassin; Sacrifice; Savannah Lions; Scavenging Ghoul; Sedge Troll; Serendib Efreet; Simulacrum; Siren's Call; Sol Ring; Sunglasses of Urza; Survival of the Fittest; The Rack; Thoughtlace; Timber Wolves; Time Spiral; Timmerian Fiends; Tolarian Academy; Tunnel; Uthden Troll; Vesuvan Doppelganger; Veteran Bodyguard; Volcanic Eruption; Wall of Ice; Wall of Water; Wall of Wood; Water Elemental; Web; Wheel of Fortune; White Ward; Will-o'-the-Wisp; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Mercadian Masques.txt b/forge-gui/res/formats/Extended, Mercadian Masques.txt deleted file mode 100644 index 9b0ef0df48c..00000000000 --- a/forge-gui/res/formats/Extended, Mercadian Masques.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Extended, Mercadian Masques -Type:Historic -Subtype:Rotating -Order:244 -Sets:3ED, 5ED, 6ED, ICE, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG, UDS, MMQ -Banned:Aladdin's Lamp; Amulet of Quoz; Animate Artifact; Armageddon Clock; Balance; Basalt Monolith; Black Vise; Black Ward; Blessing; Blue Elemental Blast; Blue Ward; Braingeyser; Brass Man; Celestial Prism; Channel; Chaoslace; Clone; Conservator; Contract from Below; Control Magic; Conversion; Copy Artifact; Creature Bond; Darkpact; Deathlace; Demonic Attorney; Demonic Hordes; Demonic Tutor; Dragon Whelp; Dream Halls; Dwarven Weaponsmith; Earth Elemental; Earthbind; Earthcraft; Ebony Horse; El-Hajjaj; Farmstead; Fastbond; Fork; Gaea's Liege; Goblin Balloon Brigade; Granite Gargoyle; Gray Ogre; Green Ward; Guardian Angel; Holy Armor; Hypnotic Specter; Island Fish Jasconius; Ivory Tower; Jandor's Ring; Juggernaut; Jump; Kird Ape; Kormus Bell; Kudzu; Lance; Lifelace; Lightning Bolt; Living Wall; Lotus Petal; Magnetic Mountain; Mahamoti Djinn; Mana Crypt; Memory Jar; Mijae Djinn; Mind Over Matter; Mind Twist; Mishra's War Machine; Nettling Imp; Northern Paladin; Onulet; Power Leak; Power Surge; Purelace; Rebirth; Reconstruction; Red Elemental Blast; Red Ward; Regrowth; Resurrection; Reverse Polarity; Roc of Kher Ridges; Rock Hydra; Rocket Launcher; Royal Assassin; Sacrifice; Savannah Lions; Scavenging Ghoul; Sedge Troll; Sengir Vampire; Serendib Efreet; Serra Angel; Simulacrum; Siren's Call; Sol Ring; Sunglasses of Urza; The Rack; Thoughtlace; Timber Wolves; Time Spiral; Timmerian Fiends; Tolarian Academy; Tunnel; Uthden Troll; Vesuvan Doppelganger; Veteran Bodyguard; Volcanic Eruption; Wall of Ice; Wall of Water; Wall of Wood; Water Elemental; Web; Wheel of Fortune; White Ward; Will-o'-the-Wisp; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Nemesis.txt b/forge-gui/res/formats/Extended, Nemesis.txt deleted file mode 100644 index e9148245bc5..00000000000 --- a/forge-gui/res/formats/Extended, Nemesis.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Extended, Nemesis -Type:Historic -Subtype:Rotating -Order:249 -Sets:3ED, 5ED, 6ED, ICE, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG, UDS, MMQ, NMS -Banned:Aladdin's Lamp; Amulet of Quoz; Animate Artifact; Armageddon Clock; Balance; Basalt Monolith; Black Vise; Black Ward; Blessing; Blue Elemental Blast; Blue Ward; Braingeyser; Brass Man; Celestial Prism; Channel; Chaoslace; Clone; Conservator; Contract from Below; Control Magic; Conversion; Copy Artifact; Creature Bond; Darkpact; Deathlace; Demonic Attorney; Demonic Hordes; Demonic Tutor; Dragon Whelp; Dream Halls; Dwarven Weaponsmith; Earth Elemental; Earthbind; Earthcraft; Ebony Horse; El-Hajjaj; Farmstead; Fastbond; Fork; Gaea's Liege; Goblin Balloon Brigade; Granite Gargoyle; Gray Ogre; Green Ward; Guardian Angel; Holy Armor; Hypnotic Specter; Island Fish Jasconius; Ivory Tower; Jandor's Ring; Juggernaut; Jump; Kird Ape; Kormus Bell; Kudzu; Lance; Lifelace; Lightning Bolt; Living Wall; Lotus Petal; Magnetic Mountain; Mahamoti Djinn; Mana Crypt; Memory Jar; Mijae Djinn; Mind Over Matter; Mind Twist; Mishra's War Machine; Nettling Imp; Northern Paladin; Onulet; Power Leak; Power Surge; Purelace; Rebirth; Reconstruction; Red Elemental Blast; Red Ward; Regrowth; Resurrection; Reverse Polarity; Roc of Kher Ridges; Rock Hydra; Rocket Launcher; Royal Assassin; Sacrifice; Savannah Lions; Scavenging Ghoul; Sedge Troll; Sengir Vampire; Serendib Efreet; Serra Angel; Simulacrum; Siren's Call; Sol Ring; Sunglasses of Urza; The Rack; Thoughtlace; Timber Wolves; Time Spiral; Timmerian Fiends; Tolarian Academy; Tunnel; Uthden Troll; Vesuvan Doppelganger; Veteran Bodyguard; Volcanic Eruption; Wall of Ice; Wall of Water; Wall of Wood; Water Elemental; Web; Wheel of Fortune; White Ward; Will-o'-the-Wisp; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Odyssey.txt b/forge-gui/res/formats/Extended, Odyssey.txt deleted file mode 100644 index 5b4dc3433b1..00000000000 --- a/forge-gui/res/formats/Extended, Odyssey.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Extended, Odyssey -Type:Historic -Subtype:Rotating -Order:282 -Sets:3ED, 5ED, 6ED, 7ED, ICE, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG, UDS, MMQ, NMS, PCY, INV, PLS, APC, ODY -Banned:Aladdin's Lamp; Amulet of Quoz; Animate Artifact; Armageddon Clock; Balance; Basalt Monolith; Black Vise; Black Ward; Blessing; Blue Elemental Blast; Blue Ward; Braingeyser; Brass Man; Celestial Prism; Channel; Chaoslace; Clone; Conservator; Contract from Below; Control Magic; Conversion; Copy Artifact; Creature Bond; Dark Ritual; Darkpact; Deathlace; Demonic Attorney; Demonic Consultation; Demonic Hordes; Demonic Tutor; Dragon Whelp; Dream Halls; Dwarven Weaponsmith; Earth Elemental; Earthbind; Earthcraft; Ebony Horse; El-Hajjaj; Farmstead; Fastbond; Fork; Gaea's Liege; Goblin Balloon Brigade; Granite Gargoyle; Gray Ogre; Green Ward; Guardian Angel; Holy Armor; Hypnotic Specter; Island Fish Jasconius; Ivory Tower; Jandor's Ring; Juggernaut; Jump; Kird Ape; Kormus Bell; Kudzu; Lance; Lifelace; Lightning Bolt; Living Wall; Lotus Petal; Magnetic Mountain; Mana Crypt; Mana Vault; Memory Jar; Mijae Djinn; Mind Over Matter; Mind Twist; Mishra's War Machine; Necropotence; Nettling Imp; Onulet; Power Leak; Power Surge; Purelace; Rebirth; Reconstruction; Red Elemental Blast; Red Ward; Regrowth; Replenish; Resurrection; Reverse Polarity; Roc of Kher Ridges; Rock Hydra; Rocket Launcher; Royal Assassin; Sacrifice; Savannah Lions; Scavenging Ghoul; Sedge Troll; Sengir Vampire; Serendib Efreet; Simulacrum; Siren's Call; Sol Ring; Sunglasses of Urza; Survival of the Fittest; The Rack; Thoughtlace; Timber Wolves; Time Spiral; Timmerian Fiends; Tolarian Academy; Tunnel; Uthden Troll; Vesuvan Doppelganger; Veteran Bodyguard; Volcanic Eruption; Wall of Ice; Wall of Water; Wall of Wood; Water Elemental; Web; Wheel of Fortune; White Ward; Will-o'-the-Wisp; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Planeshift.txt b/forge-gui/res/formats/Extended, Planeshift.txt deleted file mode 100644 index 20ce5c3ddf0..00000000000 --- a/forge-gui/res/formats/Extended, Planeshift.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Extended, Planeshift -Type:Historic -Subtype:Rotating -Order:267 -Sets:3ED, 5ED, 6ED, ICE, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG, UDS, MMQ, NMS, PCY, INV, PLS -Banned:Aladdin's Lamp; Amulet of Quoz; Animate Artifact; Armageddon Clock; Balance; Basalt Monolith; Black Vise; Black Ward; Blessing; Blue Elemental Blast; Blue Ward; Braingeyser; Brass Man; Celestial Prism; Channel; Chaoslace; Clone; Conservator; Contract from Below; Control Magic; Conversion; Copy Artifact; Creature Bond; Dark Ritual; Darkpact; Deathlace; Demonic Attorney; Demonic Hordes; Demonic Tutor; Dragon Whelp; Dream Halls; Dwarven Weaponsmith; Earth Elemental; Earthbind; Earthcraft; Ebony Horse; El-Hajjaj; Farmstead; Fastbond; Fork; Gaea's Liege; Goblin Balloon Brigade; Granite Gargoyle; Gray Ogre; Green Ward; Guardian Angel; Holy Armor; Hypnotic Specter; Island Fish Jasconius; Ivory Tower; Jandor's Ring; Juggernaut; Jump; Kird Ape; Kormus Bell; Kudzu; Lance; Lifelace; Lightning Bolt; Living Wall; Lotus Petal; Magnetic Mountain; Mahamoti Djinn; Mana Crypt; Mana Vault; Memory Jar; Mijae Djinn; Mind Over Matter; Mind Twist; Mishra's War Machine; Nettling Imp; Northern Paladin; Onulet; Power Leak; Power Surge; Purelace; Rebirth; Reconstruction; Red Elemental Blast; Red Ward; Regrowth; Resurrection; Reverse Polarity; Roc of Kher Ridges; Rock Hydra; Rocket Launcher; Royal Assassin; Sacrifice; Savannah Lions; Scavenging Ghoul; Sedge Troll; Sengir Vampire; Serendib Efreet; Serra Angel; Simulacrum; Siren's Call; Sol Ring; Sunglasses of Urza; The Rack; Thoughtlace; Timber Wolves; Time Spiral; Timmerian Fiends; Tolarian Academy; Tunnel; Uthden Troll; Vesuvan Doppelganger; Veteran Bodyguard; Volcanic Eruption; Wall of Ice; Wall of Water; Wall of Wood; Water Elemental; Web; Wheel of Fortune; White Ward; Will-o'-the-Wisp; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Prophecy.txt b/forge-gui/res/formats/Extended, Prophecy.txt deleted file mode 100644 index a74b000e283..00000000000 --- a/forge-gui/res/formats/Extended, Prophecy.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Extended, Prophecy -Type:Historic -Subtype:Rotating -Order:255 -Sets:3ED, 5ED, 6ED, ICE, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG, UDS, MMQ, NMS, PCY -Banned:Aladdin's Lamp; Amulet of Quoz; Animate Artifact; Armageddon Clock; Balance; Basalt Monolith; Black Vise; Black Ward; Blessing; Blue Elemental Blast; Blue Ward; Braingeyser; Brass Man; Celestial Prism; Channel; Chaoslace; Clone; Conservator; Contract from Below; Control Magic; Conversion; Copy Artifact; Creature Bond; Dark Ritual; Darkpact; Deathlace; Demonic Attorney; Demonic Hordes; Demonic Tutor; Dragon Whelp; Dream Halls; Dwarven Weaponsmith; Earth Elemental; Earthbind; Earthcraft; Ebony Horse; El-Hajjaj; Farmstead; Fastbond; Fork; Gaea's Liege; Goblin Balloon Brigade; Granite Gargoyle; Gray Ogre; Green Ward; Guardian Angel; Holy Armor; Hypnotic Specter; Island Fish Jasconius; Ivory Tower; Jandor's Ring; Juggernaut; Jump; Kird Ape; Kormus Bell; Kudzu; Lance; Lifelace; Lightning Bolt; Living Wall; Lotus Petal; Magnetic Mountain; Mahamoti Djinn; Mana Crypt; Mana Vault; Memory Jar; Mijae Djinn; Mind Over Matter; Mind Twist; Mishra's War Machine; Nettling Imp; Northern Paladin; Onulet; Power Leak; Power Surge; Purelace; Rebirth; Reconstruction; Red Elemental Blast; Red Ward; Regrowth; Resurrection; Reverse Polarity; Roc of Kher Ridges; Rock Hydra; Rocket Launcher; Royal Assassin; Sacrifice; Savannah Lions; Scavenging Ghoul; Sedge Troll; Sengir Vampire; Serendib Efreet; Serra Angel; Simulacrum; Siren's Call; Sol Ring; Sunglasses of Urza; The Rack; Thoughtlace; Timber Wolves; Time Spiral; Timmerian Fiends; Tolarian Academy; Tunnel; Uthden Troll; Vesuvan Doppelganger; Veteran Bodyguard; Volcanic Eruption; Wall of Ice; Wall of Water; Wall of Wood; Water Elemental; Web; Wheel of Fortune; White Ward; Will-o'-the-Wisp; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Seventh Edition.txt b/forge-gui/res/formats/Extended, Seventh Edition.txt deleted file mode 100644 index 871cf7a87bc..00000000000 --- a/forge-gui/res/formats/Extended, Seventh Edition.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Extended, Seventh Edition -Type:Historic -Subtype:Rotating -Order:273 -Sets:3ED, 5ED, 6ED, 7ED, ICE, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG, UDS, MMQ, NMS, PCY, INV, PLS -Banned:Aladdin's Lamp; Amulet of Quoz; Animate Artifact; Armageddon Clock; Balance; Basalt Monolith; Black Vise; Black Ward; Blessing; Blue Elemental Blast; Blue Ward; Braingeyser; Brass Man; Celestial Prism; Channel; Chaoslace; Clone; Conservator; Contract from Below; Control Magic; Conversion; Copy Artifact; Creature Bond; Dark Ritual; Darkpact; Deathlace; Demonic Attorney; Demonic Consultation; Demonic Hordes; Demonic Tutor; Dragon Whelp; Dream Halls; Dwarven Weaponsmith; Earth Elemental; Earthbind; Earthcraft; Ebony Horse; El-Hajjaj; Farmstead; Fastbond; Fork; Gaea's Liege; Goblin Balloon Brigade; Granite Gargoyle; Gray Ogre; Green Ward; Guardian Angel; Holy Armor; Hypnotic Specter; Island Fish Jasconius; Ivory Tower; Jandor's Ring; Juggernaut; Jump; Kird Ape; Kormus Bell; Kudzu; Lance; Lifelace; Lightning Bolt; Living Wall; Lotus Petal; Magnetic Mountain; Mana Crypt; Mana Vault; Memory Jar; Mijae Djinn; Mind Over Matter; Mind Twist; Mishra's War Machine; Necropotence; Nettling Imp; Onulet; Power Leak; Power Surge; Purelace; Rebirth; Reconstruction; Red Elemental Blast; Red Ward; Regrowth; Replenish; Resurrection; Reverse Polarity; Roc of Kher Ridges; Rock Hydra; Rocket Launcher; Royal Assassin; Sacrifice; Savannah Lions; Scavenging Ghoul; Sedge Troll; Sengir Vampire; Serendib Efreet; Simulacrum; Siren's Call; Sol Ring; Sunglasses of Urza; Survival of the Fittest; The Rack; Thoughtlace; Timber Wolves; Time Spiral; Timmerian Fiends; Tolarian Academy; Tunnel; Uthden Troll; Vesuvan Doppelganger; Veteran Bodyguard; Volcanic Eruption; Wall of Ice; Wall of Water; Wall of Wood; Water Elemental; Web; Wheel of Fortune; White Ward; Will-o'-the-Wisp; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Torment.txt b/forge-gui/res/formats/Extended, Torment.txt deleted file mode 100644 index 73767e69203..00000000000 --- a/forge-gui/res/formats/Extended, Torment.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Extended, Torment -Type:Historic -Subtype:Rotating -Order:289 -Sets:3ED, 5ED, 6ED, 7ED, ICE, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG, UDS, MMQ, NMS, PCY, INV, PLS, APC, ODY, TOR -Banned:Aladdin's Lamp; Amulet of Quoz; Animate Artifact; Armageddon Clock; Balance; Basalt Monolith; Black Vise; Black Ward; Blessing; Blue Elemental Blast; Blue Ward; Braingeyser; Brass Man; Celestial Prism; Channel; Chaoslace; Clone; Conservator; Contract from Below; Control Magic; Conversion; Copy Artifact; Creature Bond; Dark Ritual; Darkpact; Deathlace; Demonic Attorney; Demonic Consultation; Demonic Hordes; Demonic Tutor; Dragon Whelp; Dream Halls; Dwarven Weaponsmith; Earth Elemental; Earthbind; Earthcraft; Ebony Horse; El-Hajjaj; Farmstead; Fastbond; Fork; Gaea's Liege; Goblin Balloon Brigade; Granite Gargoyle; Gray Ogre; Green Ward; Guardian Angel; Holy Armor; Hypnotic Specter; Island Fish Jasconius; Ivory Tower; Jandor's Ring; Juggernaut; Jump; Kird Ape; Kormus Bell; Kudzu; Lance; Lifelace; Lightning Bolt; Living Wall; Lotus Petal; Magnetic Mountain; Mana Crypt; Mana Vault; Memory Jar; Mijae Djinn; Mind Over Matter; Mind Twist; Mishra's War Machine; Necropotence; Nettling Imp; Onulet; Power Leak; Power Surge; Purelace; Rebirth; Reconstruction; Red Elemental Blast; Red Ward; Regrowth; Replenish; Resurrection; Reverse Polarity; Roc of Kher Ridges; Rock Hydra; Rocket Launcher; Royal Assassin; Sacrifice; Savannah Lions; Scavenging Ghoul; Sedge Troll; Serendib Efreet; Simulacrum; Siren's Call; Sol Ring; Sunglasses of Urza; Survival of the Fittest; The Rack; Thoughtlace; Timber Wolves; Time Spiral; Timmerian Fiends; Tolarian Academy; Tunnel; Uthden Troll; Vesuvan Doppelganger; Veteran Bodyguard; Volcanic Eruption; Wall of Ice; Wall of Water; Wall of Wood; Water Elemental; Web; Wheel of Fortune; White Ward; Will-o'-the-Wisp; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Alara Reborn.txt b/forge-gui/res/formats/Extended/Extended, Alara Reborn.txt similarity index 90% rename from forge-gui/res/formats/Extended, Alara Reborn.txt rename to forge-gui/res/formats/Extended/Extended, Alara Reborn.txt index 216d5598d4f..e2a73297b5f 100644 --- a/forge-gui/res/formats/Extended, Alara Reborn.txt +++ b/forge-gui/res/formats/Extended/Extended, Alara Reborn.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Alara Reborn Type:Historic -Subtype:Rotating -Order:447 +Subtype:Extended +Order:452 Sets:ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB Banned:Aether Vial; Disciple of the Vault; Sensei's Divining Top; Skullclamp diff --git a/forge-gui/res/formats/Extended, Apr 1999.txt b/forge-gui/res/formats/Extended/Extended, Apr 1999.txt similarity index 75% rename from forge-gui/res/formats/Extended, Apr 1999.txt rename to forge-gui/res/formats/Extended/Extended, Apr 1999.txt index 2fa88bbf626..7167eaed5ed 100644 --- a/forge-gui/res/formats/Extended, Apr 1999.txt +++ b/forge-gui/res/formats/Extended/Extended, Apr 1999.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Apr 1999 Type:Historic -Subtype:Rotating -Order:227 -Sets:2ED, 3ED, 4ED, CHR, 5ED, DRK, ARENA, FEM, ICE, CHR, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG +Subtype:Extended +Order:232 +Sets:2ED, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG Banned:Amulet of Quoz; Balance; Black Vise; Bronze Tablet; Channel; Contract from Below; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Hypnotic Specter; Ivory Tower; Jeweled Bird; Kird Ape; Mana Crypt; Maze of Ith; Memory Jar; Mind Twist; Rebirth; Regrowth; Serendib Efreet; Sol Ring; Strip Mine; Tempest Efreet; Timmerian Fiends; Tolarian Academy; Wheel of Fortune; Windfall; Zuran Orb diff --git a/forge-gui/res/formats/Extended/Extended, Apr 2000.txt b/forge-gui/res/formats/Extended/Extended, Apr 2000.txt new file mode 100644 index 00000000000..6ab50b490d4 --- /dev/null +++ b/forge-gui/res/formats/Extended/Extended, Apr 2000.txt @@ -0,0 +1,8 @@ +[format] +Name:Extended, Apr 2000 +Type:Historic +Subtype:Extended +Order:258 +Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS +Additional:Badlands; Bayou; Plateau; Savannah; Scrubland; Taiga; Tropical Island; Tundra; Underground Sea; Volcanic Island +Banned:Amulet of Quoz; Dark Ritual; Dream Halls; Earthcraft; Lotus Petal; Mana Vault; Memory Jar; Mind Over Matter; Time Spiral; Timmerian Fiends; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended/Extended, Apr 2001.txt b/forge-gui/res/formats/Extended/Extended, Apr 2001.txt new file mode 100644 index 00000000000..33f1b114d49 --- /dev/null +++ b/forge-gui/res/formats/Extended/Extended, Apr 2001.txt @@ -0,0 +1,8 @@ +[format] +Name:Extended, Apr 2001 +Type:Historic +Subtype:Extended +Order:276 +Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS +Additional:Badlands; Bayou; Plateau; Savannah; Scrubland; Taiga; Tropical Island; Tundra; Underground Sea; Volcanic Island +Banned:Amulet of Quoz; Dark Ritual; Demonic Consultation; Dream Halls; Earthcraft; Lotus Petal; Mana Vault; Memory Jar; Mind Over Matter; Necropotence; Replenish; Survival of the Fittest; Time Spiral; Timmerian Fiends; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended/Extended, Aug 1999.txt b/forge-gui/res/formats/Extended/Extended, Aug 1999.txt new file mode 100644 index 00000000000..c19086a7035 --- /dev/null +++ b/forge-gui/res/formats/Extended/Extended, Aug 1999.txt @@ -0,0 +1,7 @@ +[format] +Name:Extended, Aug 1999 +Type:Historic +Subtype:Extended +Order:244 +Sets:3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS +Banned:Amulet of Quoz; Balance; Basalt Monolith; Black Vise; Braingeyser; Bronze Tablet; Channel; Clone; Contract from Below; Copy Artifact; Darkpact; Demonic Attorney; Demonic Tutor; Dwarven Weaponsmith; Earthbind; Farmstead; Fork; Granite Gargoyle; Hypnotic Specter; Ivory Tower; Jandor's Ring; Jeweled Bird; Juggernaut; Kird Ape; Kudzu; Lance; Mana Crypt; Maze of Ith; Memory Jar; Mijae Djinn; Mind Twist; Nettling Imp; Rebirth; Reconstruction; Regrowth; Resurrection; Reverse Polarity; Roc of Kher Ridges; Rock Hydra; Rocket Launcher; Sacrifice; Sedge Troll; Serendib Efreet; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Timmerian Fiends; Tolarian Academy; Vesuvan Doppelganger; Veteran Bodyguard; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Avacyn Restored.txt b/forge-gui/res/formats/Extended/Extended, Avacyn Restored.txt similarity index 64% rename from forge-gui/res/formats/Extended, Avacyn Restored.txt rename to forge-gui/res/formats/Extended/Extended, Avacyn Restored.txt index 3d1990525ef..cdf4ed149cd 100644 --- a/forge-gui/res/formats/Extended, Avacyn Restored.txt +++ b/forge-gui/res/formats/Extended/Extended, Avacyn Restored.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Avacyn Restored Type:Historic -Subtype:Rotating -Order:520 +Subtype:Extended +Order:525 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR -Banned:Jace; the Mind Sculptor; Mental Misstep; Ponder; Stoneforge Mystic +Banned:Jace, the Mind Sculptor; Mental Misstep; Ponder; Stoneforge Mystic diff --git a/forge-gui/res/formats/Extended, Betrayers of Kamigawa.txt b/forge-gui/res/formats/Extended/Extended, Betrayers of Kamigawa.txt similarity index 95% rename from forge-gui/res/formats/Extended, Betrayers of Kamigawa.txt rename to forge-gui/res/formats/Extended/Extended, Betrayers of Kamigawa.txt index 0fee94d7249..9d1f4e980bd 100644 --- a/forge-gui/res/formats/Extended, Betrayers of Kamigawa.txt +++ b/forge-gui/res/formats/Extended/Extended, Betrayers of Kamigawa.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Betrayers of Kamigawa Type:Historic -Subtype:Rotating -Order:352 +Subtype:Extended +Order:357 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK Banned:Ancient Tomb; Dark Ritual; Dream Halls; Earthcraft; Entomb; Frantic Search; Goblin Lackey; Goblin Recruiter; Grim Monolith; Hermit Druid; Lotus Petal; Memory Jar; Metalworker; Mind Over Matter; Oath of Druids; Replenish; Skullclamp; Survival of the Fittest; Time Spiral; Tinker; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Extended, Champions of Kamigawa.txt b/forge-gui/res/formats/Extended/Extended, Champions of Kamigawa.txt similarity index 95% rename from forge-gui/res/formats/Extended, Champions of Kamigawa.txt rename to forge-gui/res/formats/Extended/Extended, Champions of Kamigawa.txt index 4203a7cd289..9ddad7b2d97 100644 --- a/forge-gui/res/formats/Extended, Champions of Kamigawa.txt +++ b/forge-gui/res/formats/Extended/Extended, Champions of Kamigawa.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Champions of Kamigawa Type:Historic -Subtype:Rotating -Order:346 +Subtype:Extended +Order:351 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK Banned:Ancient Tomb; Dark Ritual; Dream Halls; Earthcraft; Entomb; Frantic Search; Goblin Lackey; Goblin Recruiter; Grim Monolith; Hermit Druid; Lotus Petal; Memory Jar; Metalworker; Mind Over Matter; Oath of Druids; Replenish; Skullclamp; Survival of the Fittest; Time Spiral; Tinker; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Extended, Coldsnap.txt b/forge-gui/res/formats/Extended/Extended, Coldsnap.txt similarity index 89% rename from forge-gui/res/formats/Extended, Coldsnap.txt rename to forge-gui/res/formats/Extended/Extended, Coldsnap.txt index d0a7d591a13..ac8dfff8328 100644 --- a/forge-gui/res/formats/Extended, Coldsnap.txt +++ b/forge-gui/res/formats/Extended/Extended, Coldsnap.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Coldsnap Type:Historic -Subtype:Rotating -Order:386 +Subtype:Extended +Order:391 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP Banned:Aether Vial; Disciple of the Vault; Entomb; Skullclamp diff --git a/forge-gui/res/formats/Extended, Conflux.txt b/forge-gui/res/formats/Extended/Extended, Conflux.txt similarity index 90% rename from forge-gui/res/formats/Extended, Conflux.txt rename to forge-gui/res/formats/Extended/Extended, Conflux.txt index 73a5e94eb3c..9d60aacc4a6 100644 --- a/forge-gui/res/formats/Extended, Conflux.txt +++ b/forge-gui/res/formats/Extended/Extended, Conflux.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Conflux Type:Historic -Subtype:Rotating -Order:442 +Subtype:Extended +Order:447 Sets:ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX Banned:Aether Vial; Disciple of the Vault; Sensei's Divining Top; Skullclamp diff --git a/forge-gui/res/formats/Extended, Dark Ascension.txt b/forge-gui/res/formats/Extended/Extended, Dark Ascension.txt similarity index 63% rename from forge-gui/res/formats/Extended, Dark Ascension.txt rename to forge-gui/res/formats/Extended/Extended, Dark Ascension.txt index 1a87486b106..ea555592a2e 100644 --- a/forge-gui/res/formats/Extended, Dark Ascension.txt +++ b/forge-gui/res/formats/Extended/Extended, Dark Ascension.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Dark Ascension Type:Historic -Subtype:Rotating -Order:513 +Subtype:Extended +Order:518 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA -Banned:Jace; the Mind Sculptor; Mental Misstep; Ponder; Stoneforge Mystic +Banned:Jace, the Mind Sculptor; Mental Misstep; Ponder; Stoneforge Mystic diff --git a/forge-gui/res/formats/Extended, Darksteel.txt b/forge-gui/res/formats/Extended/Extended, Darksteel.txt similarity index 94% rename from forge-gui/res/formats/Extended, Darksteel.txt rename to forge-gui/res/formats/Extended/Extended, Darksteel.txt index de789b93700..87cda98d7a8 100644 --- a/forge-gui/res/formats/Extended, Darksteel.txt +++ b/forge-gui/res/formats/Extended/Extended, Darksteel.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Darksteel Type:Historic -Subtype:Rotating -Order:331 +Subtype:Extended +Order:336 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST Banned:Ancient Tomb; Dark Ritual; Dream Halls; Earthcraft; Entomb; Frantic Search; Goblin Lackey; Goblin Recruiter; Grim Monolith; Hermit Druid; Lotus Petal; Memory Jar; Mind Over Matter; Oath of Druids; Replenish; Survival of the Fittest; Time Spiral; Tinker; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Extended, Dissension.txt b/forge-gui/res/formats/Extended/Extended, Dissension.txt similarity index 89% rename from forge-gui/res/formats/Extended, Dissension.txt rename to forge-gui/res/formats/Extended/Extended, Dissension.txt index 6d39a216034..37b15181f99 100644 --- a/forge-gui/res/formats/Extended, Dissension.txt +++ b/forge-gui/res/formats/Extended/Extended, Dissension.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Dissension Type:Historic -Subtype:Rotating -Order:381 +Subtype:Extended +Order:386 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS Banned:Aether Vial; Disciple of the Vault; Entomb; Skullclamp diff --git a/forge-gui/res/formats/Extended, Eighth Edition.txt b/forge-gui/res/formats/Extended/Extended, Eighth Edition.txt similarity index 93% rename from forge-gui/res/formats/Extended, Eighth Edition.txt rename to forge-gui/res/formats/Extended/Extended, Eighth Edition.txt index 33f9ebbe2c1..3abe80cadf6 100644 --- a/forge-gui/res/formats/Extended, Eighth Edition.txt +++ b/forge-gui/res/formats/Extended/Extended, Eighth Edition.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Eighth Edition Type:Historic -Subtype:Rotating -Order:317 +Subtype:Extended +Order:322 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED Banned:Dark Ritual; Dream Halls; Earthcraft; Lotus Petal; Memory Jar; Mind Over Matter; Replenish; Survival of the Fittest; Time Spiral; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Extended, Eventide.txt b/forge-gui/res/formats/Extended/Extended, Eventide.txt similarity index 90% rename from forge-gui/res/formats/Extended, Eventide.txt rename to forge-gui/res/formats/Extended/Extended, Eventide.txt index cc26b18851a..2bd24d337f8 100644 --- a/forge-gui/res/formats/Extended, Eventide.txt +++ b/forge-gui/res/formats/Extended/Extended, Eventide.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Eventide Type:Historic -Subtype:Rotating -Order:429 +Subtype:Extended +Order:434 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE Banned:Aether Vial; Disciple of the Vault; Entomb; Skullclamp diff --git a/forge-gui/res/formats/Extended, Exodus.txt b/forge-gui/res/formats/Extended/Extended, Exodus.txt similarity index 75% rename from forge-gui/res/formats/Extended, Exodus.txt rename to forge-gui/res/formats/Extended/Extended, Exodus.txt index 85d0d518be2..048830261b8 100644 --- a/forge-gui/res/formats/Extended, Exodus.txt +++ b/forge-gui/res/formats/Extended/Extended, Exodus.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Exodus Type:Historic -Subtype:Rotating -Order:209 -Sets:2ED, 3ED, 4ED, CHR, 5ED, DRK, ARENA, FEM, ICE, CHR, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO +Subtype:Extended +Order:214 +Sets:2ED, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Hypnotic Specter; Ivory Tower; Jeweled Bird; Kird Ape; Mana Crypt; Maze of Ith; Mind Twist; Rebirth; Regrowth; Serendib Efreet; Sol Ring; Strip Mine; Tempest Efreet; Timmerian Fiends; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Fifth Dawn.txt b/forge-gui/res/formats/Extended/Extended, Fifth Dawn.txt similarity index 94% rename from forge-gui/res/formats/Extended, Fifth Dawn.txt rename to forge-gui/res/formats/Extended/Extended, Fifth Dawn.txt index fda55665218..7a13174f06f 100644 --- a/forge-gui/res/formats/Extended, Fifth Dawn.txt +++ b/forge-gui/res/formats/Extended/Extended, Fifth Dawn.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Fifth Dawn Type:Historic -Subtype:Rotating -Order:338 +Subtype:Extended +Order:343 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN Banned:Ancient Tomb; Dark Ritual; Dream Halls; Earthcraft; Entomb; Frantic Search; Goblin Lackey; Goblin Recruiter; Grim Monolith; Hermit Druid; Lotus Petal; Memory Jar; Mind Over Matter; Oath of Druids; Replenish; Survival of the Fittest; Time Spiral; Tinker; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Extended, Future Sight.txt b/forge-gui/res/formats/Extended/Extended, Future Sight.txt similarity index 90% rename from forge-gui/res/formats/Extended, Future Sight.txt rename to forge-gui/res/formats/Extended/Extended, Future Sight.txt index a99cac1a6d5..8d6c59ec24d 100644 --- a/forge-gui/res/formats/Extended, Future Sight.txt +++ b/forge-gui/res/formats/Extended/Extended, Future Sight.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Future Sight Type:Historic -Subtype:Rotating -Order:401 +Subtype:Extended +Order:406 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT Banned:Aether Vial; Disciple of the Vault; Entomb; Skullclamp diff --git a/forge-gui/res/formats/Extended, Guildpact.txt b/forge-gui/res/formats/Extended/Extended, Guildpact.txt similarity index 88% rename from forge-gui/res/formats/Extended, Guildpact.txt rename to forge-gui/res/formats/Extended/Extended, Guildpact.txt index ae8ac42f12c..614238a8d6b 100644 --- a/forge-gui/res/formats/Extended, Guildpact.txt +++ b/forge-gui/res/formats/Extended/Extended, Guildpact.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Guildpact Type:Historic -Subtype:Rotating -Order:375 +Subtype:Extended +Order:380 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT Banned:Aether Vial; Disciple of the Vault; Entomb; Skullclamp diff --git a/forge-gui/res/formats/Extended, Innistrad.txt b/forge-gui/res/formats/Extended/Extended, Innistrad.txt similarity index 83% rename from forge-gui/res/formats/Extended, Innistrad.txt rename to forge-gui/res/formats/Extended/Extended, Innistrad.txt index 1864f692181..546d59fc049 100644 --- a/forge-gui/res/formats/Extended, Innistrad.txt +++ b/forge-gui/res/formats/Extended/Extended, Innistrad.txt @@ -1,6 +1,6 @@ [format] Name:Extended, Innistrad Type:Historic -Subtype:Rotating -Order:503 +Subtype:Extended +Order:508 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD diff --git a/forge-gui/res/formats/Extended/Extended, Invasion.txt b/forge-gui/res/formats/Extended/Extended, Invasion.txt new file mode 100644 index 00000000000..0cac560cad2 --- /dev/null +++ b/forge-gui/res/formats/Extended/Extended, Invasion.txt @@ -0,0 +1,8 @@ +[format] +Name:Extended, Invasion +Type:Historic +Subtype:Extended +Order:267 +Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV +Additional:Badlands; Bayou; Plateau; Savannah; Scrubland; Taiga; Tropical Island; Tundra; Underground Sea; Volcanic Island +Banned:Amulet of Quoz; Dark Ritual; Dream Halls; Earthcraft; Lotus Petal; Mana Vault; Memory Jar; Mind Over Matter; Time Spiral; Timmerian Fiends; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Jan 1999.txt b/forge-gui/res/formats/Extended/Extended, Jan 1999.txt similarity index 75% rename from forge-gui/res/formats/Extended, Jan 1999.txt rename to forge-gui/res/formats/Extended/Extended, Jan 1999.txt index b6d4dfaca76..92c714b2679 100644 --- a/forge-gui/res/formats/Extended, Jan 1999.txt +++ b/forge-gui/res/formats/Extended/Extended, Jan 1999.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Jan 1999 Type:Historic -Subtype:Rotating -Order:219 -Sets:2ED, 3ED, 4ED, CHR, 5ED, DRK, ARENA, FEM, ICE, CHR, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG +Subtype:Extended +Order:224 +Sets:2ED, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG Banned:Amulet of Quoz; Balance; Black Vise; Bronze Tablet; Channel; Contract from Below; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Hypnotic Specter; Ivory Tower; Jeweled Bird; Kird Ape; Mana Crypt; Maze of Ith; Mind Twist; Rebirth; Regrowth; Serendib Efreet; Sol Ring; Strip Mine; Tempest Efreet; Timmerian Fiends; Tolarian Academy; Wheel of Fortune; Windfall; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Jan 2004.txt b/forge-gui/res/formats/Extended/Extended, Jan 2004.txt similarity index 94% rename from forge-gui/res/formats/Extended, Jan 2004.txt rename to forge-gui/res/formats/Extended/Extended, Jan 2004.txt index 62f06e3fbc8..9facf840584 100644 --- a/forge-gui/res/formats/Extended, Jan 2004.txt +++ b/forge-gui/res/formats/Extended/Extended, Jan 2004.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Jan 2004 Type:Historic -Subtype:Rotating -Order:326 +Subtype:Extended +Order:331 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD Banned:Ancient Tomb; Dark Ritual; Dream Halls; Earthcraft; Entomb; Frantic Search; Goblin Lackey; Goblin Recruiter; Grim Monolith; Hermit Druid; Lotus Petal; Memory Jar; Mind Over Matter; Oath of Druids; Replenish; Survival of the Fittest; Time Spiral; Tinker; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Extended/Extended, Judgment.txt b/forge-gui/res/formats/Extended/Extended, Judgment.txt new file mode 100644 index 00000000000..ddb34bd47c2 --- /dev/null +++ b/forge-gui/res/formats/Extended/Extended, Judgment.txt @@ -0,0 +1,8 @@ +[format] +Name:Extended, Judgment +Type:Historic +Subtype:Extended +Order:299 +Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD +Additional:Badlands; Bayou; Plateau; Savannah; Scrubland; Taiga; Tropical Island; Tundra; Underground Sea; Volcanic Island +Banned:Amulet of Quoz; Dark Ritual; Demonic Consultation; Dream Halls; Earthcraft; Lotus Petal; Mana Vault; Memory Jar; Mind Over Matter; Necropotence; Replenish; Survival of the Fittest; Time Spiral; Timmerian Fiends; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, July 2010.txt b/forge-gui/res/formats/Extended/Extended, July 2010.txt similarity index 86% rename from forge-gui/res/formats/Extended, July 2010.txt rename to forge-gui/res/formats/Extended/Extended, July 2010.txt index da9497bf71c..4bfa210c8e8 100644 --- a/forge-gui/res/formats/Extended, July 2010.txt +++ b/forge-gui/res/formats/Extended/Extended, July 2010.txt @@ -1,7 +1,7 @@ [format] Name:Extended, July 2010 Type:Historic -Subtype:Rotating -Order:472 +Subtype:Extended +Order:477 Sets:TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE Banned:Hypergenesis; Sword of the Meek diff --git a/forge-gui/res/formats/Extended, Legions.txt b/forge-gui/res/formats/Extended/Extended, Legions.txt similarity index 66% rename from forge-gui/res/formats/Extended, Legions.txt rename to forge-gui/res/formats/Extended/Extended, Legions.txt index 958a374098e..63604bb292d 100644 --- a/forge-gui/res/formats/Extended, Legions.txt +++ b/forge-gui/res/formats/Extended/Extended, Legions.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Legions Type:Historic -Subtype:Rotating -Order:304 -Sets:6ED, 7ED, TMP, STH, EXO, USG, ULG, UDS, MMQ, NMS, PCY, INV, PLS, APC, ODY, TOR, JUD, ONS, LGN +Subtype:Extended +Order:309 +Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN Banned:Dark Ritual; Dream Halls; Earthcraft; Lotus Petal; Memory Jar; Mind Over Matter; Replenish; Survival of the Fittest; Time Spiral; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Extended, Lorwyn.txt b/forge-gui/res/formats/Extended/Extended, Lorwyn.txt similarity index 90% rename from forge-gui/res/formats/Extended, Lorwyn.txt rename to forge-gui/res/formats/Extended/Extended, Lorwyn.txt index 99af31315ea..4118968941f 100644 --- a/forge-gui/res/formats/Extended, Lorwyn.txt +++ b/forge-gui/res/formats/Extended/Extended, Lorwyn.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Lorwyn Type:Historic -Subtype:Rotating -Order:413 +Subtype:Extended +Order:418 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW Banned:Aether Vial; Disciple of the Vault; Entomb; Skullclamp diff --git a/forge-gui/res/formats/Extended, Magic 2010.txt b/forge-gui/res/formats/Extended/Extended, Magic 2010.txt similarity index 90% rename from forge-gui/res/formats/Extended, Magic 2010.txt rename to forge-gui/res/formats/Extended/Extended, Magic 2010.txt index 37a109c4427..8da097594b5 100644 --- a/forge-gui/res/formats/Extended, Magic 2010.txt +++ b/forge-gui/res/formats/Extended/Extended, Magic 2010.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Magic 2010 Type:Historic -Subtype:Rotating -Order:453 +Subtype:Extended +Order:458 Sets:ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10 Banned:Aether Vial; Disciple of the Vault; Sensei's Divining Top; Skullclamp diff --git a/forge-gui/res/formats/Extended, Magic 2011.txt b/forge-gui/res/formats/Extended/Extended, Magic 2011.txt similarity index 86% rename from forge-gui/res/formats/Extended, Magic 2011.txt rename to forge-gui/res/formats/Extended/Extended, Magic 2011.txt index 59d8169241f..c97f71ecfd9 100644 --- a/forge-gui/res/formats/Extended, Magic 2011.txt +++ b/forge-gui/res/formats/Extended/Extended, Magic 2011.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Magic 2011 Type:Historic -Subtype:Rotating -Order:475 +Subtype:Extended +Order:480 Sets:TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11 Banned:Hypergenesis; Sword of the Meek diff --git a/forge-gui/res/formats/Extended, Magic 2012.txt b/forge-gui/res/formats/Extended/Extended, Magic 2012.txt similarity index 83% rename from forge-gui/res/formats/Extended, Magic 2012.txt rename to forge-gui/res/formats/Extended/Extended, Magic 2012.txt index 0cdcd344d5d..5656f03e727 100644 --- a/forge-gui/res/formats/Extended, Magic 2012.txt +++ b/forge-gui/res/formats/Extended/Extended, Magic 2012.txt @@ -1,6 +1,6 @@ [format] Name:Extended, Magic 2012 Type:Historic -Subtype:Rotating -Order:496 +Subtype:Extended +Order:501 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12 diff --git a/forge-gui/res/formats/Extended, Magic 2013.txt b/forge-gui/res/formats/Extended/Extended, Magic 2013.txt similarity index 64% rename from forge-gui/res/formats/Extended, Magic 2013.txt rename to forge-gui/res/formats/Extended/Extended, Magic 2013.txt index 14534d34665..37c77bb97cc 100644 --- a/forge-gui/res/formats/Extended, Magic 2013.txt +++ b/forge-gui/res/formats/Extended/Extended, Magic 2013.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Magic 2013 Type:Historic -Subtype:Rotating -Order:526 +Subtype:Extended +Order:531 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13 -Banned:Jace; the Mind Sculptor; Mental Misstep; Ponder; Stoneforge Mystic +Banned:Jace, the Mind Sculptor; Mental Misstep; Ponder; Stoneforge Mystic diff --git a/forge-gui/res/formats/Extended/Extended, Mercadian Masques.txt b/forge-gui/res/formats/Extended/Extended, Mercadian Masques.txt new file mode 100644 index 00000000000..d8e5cd134f2 --- /dev/null +++ b/forge-gui/res/formats/Extended/Extended, Mercadian Masques.txt @@ -0,0 +1,8 @@ +[format] +Name:Extended, Mercadian Masques +Type:Historic +Subtype:Extended +Order:249 +Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ +Additional:Badlands; Bayou; Plateau; Savannah; Scrubland; Taiga; Tropical Island; Tundra; Underground Sea; Volcanic Island +Banned:Amulet of Quoz; Dream Halls; Earthcraft; Lotus Petal; Memory Jar; Mind Over Matter; Time Spiral; Timmerian Fiends; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Mirrodin Besieged.txt b/forge-gui/res/formats/Extended/Extended, Mirrodin Besieged.txt similarity index 82% rename from forge-gui/res/formats/Extended, Mirrodin Besieged.txt rename to forge-gui/res/formats/Extended/Extended, Mirrodin Besieged.txt index 7fd2f2d04f4..2ae104ec513 100644 --- a/forge-gui/res/formats/Extended, Mirrodin Besieged.txt +++ b/forge-gui/res/formats/Extended/Extended, Mirrodin Besieged.txt @@ -1,6 +1,6 @@ [format] Name:Extended, Mirrodin Besieged Type:Historic -Subtype:Rotating -Order:486 +Subtype:Extended +Order:491 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS diff --git a/forge-gui/res/formats/Extended, Mirrodin.txt b/forge-gui/res/formats/Extended/Extended, Mirrodin.txt similarity index 93% rename from forge-gui/res/formats/Extended, Mirrodin.txt rename to forge-gui/res/formats/Extended/Extended, Mirrodin.txt index 777ea561630..0cb14325206 100644 --- a/forge-gui/res/formats/Extended, Mirrodin.txt +++ b/forge-gui/res/formats/Extended/Extended, Mirrodin.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Mirrodin Type:Historic -Subtype:Rotating -Order:323 +Subtype:Extended +Order:328 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD Banned:Dark Ritual; Dream Halls; Earthcraft; Entomb; Frantic Search; Goblin Lackey; Lotus Petal; Memory Jar; Mind Over Matter; Replenish; Survival of the Fittest; Time Spiral; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Extended, Morningtide.txt b/forge-gui/res/formats/Extended/Extended, Morningtide.txt similarity index 90% rename from forge-gui/res/formats/Extended, Morningtide.txt rename to forge-gui/res/formats/Extended/Extended, Morningtide.txt index 7f7caa19ae7..7ce53469898 100644 --- a/forge-gui/res/formats/Extended, Morningtide.txt +++ b/forge-gui/res/formats/Extended/Extended, Morningtide.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Morningtide Type:Historic -Subtype:Rotating -Order:418 +Subtype:Extended +Order:423 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR Banned:Aether Vial; Disciple of the Vault; Entomb; Skullclamp diff --git a/forge-gui/res/formats/Extended/Extended, Nemesis.txt b/forge-gui/res/formats/Extended/Extended, Nemesis.txt new file mode 100644 index 00000000000..bde7cc0cd73 --- /dev/null +++ b/forge-gui/res/formats/Extended/Extended, Nemesis.txt @@ -0,0 +1,8 @@ +[format] +Name:Extended, Nemesis +Type:Historic +Subtype:Extended +Order:254 +Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS +Additional:Badlands; Bayou; Plateau; Savannah; Scrubland; Taiga; Tropical Island; Tundra; Underground Sea; Volcanic Island +Banned:Amulet of Quoz; Dream Halls; Earthcraft; Lotus Petal; Memory Jar; Mind Over Matter; Time Spiral; Timmerian Fiends; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, New Phyrexia.txt b/forge-gui/res/formats/Extended/Extended, New Phyrexia.txt similarity index 82% rename from forge-gui/res/formats/Extended, New Phyrexia.txt rename to forge-gui/res/formats/Extended/Extended, New Phyrexia.txt index 82637147657..de230133aae 100644 --- a/forge-gui/res/formats/Extended, New Phyrexia.txt +++ b/forge-gui/res/formats/Extended/Extended, New Phyrexia.txt @@ -1,6 +1,6 @@ [format] Name:Extended, New Phyrexia Type:Historic -Subtype:Rotating -Order:491 +Subtype:Extended +Order:496 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH diff --git a/forge-gui/res/formats/Extended, Ninth Edition.txt b/forge-gui/res/formats/Extended/Extended, Ninth Edition.txt similarity index 95% rename from forge-gui/res/formats/Extended, Ninth Edition.txt rename to forge-gui/res/formats/Extended/Extended, Ninth Edition.txt index 031434408c1..57558afe162 100644 --- a/forge-gui/res/formats/Extended, Ninth Edition.txt +++ b/forge-gui/res/formats/Extended/Extended, Ninth Edition.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Ninth Edition Type:Historic -Subtype:Rotating -Order:363 +Subtype:Extended +Order:368 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED Banned:Ancient Tomb; Dark Ritual; Dream Halls; Earthcraft; Entomb; Frantic Search; Goblin Lackey; Goblin Recruiter; Grim Monolith; Hermit Druid; Lotus Petal; Memory Jar; Metalworker; Mind Over Matter; Oath of Druids; Replenish; Skullclamp; Survival of the Fittest; Time Spiral; Tinker; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Extended, Oct 1999.txt b/forge-gui/res/formats/Extended/Extended, Oct 1999.txt similarity index 91% rename from forge-gui/res/formats/Extended, Oct 1999.txt rename to forge-gui/res/formats/Extended/Extended, Oct 1999.txt index 254474d567f..370b3326c75 100644 --- a/forge-gui/res/formats/Extended, Oct 1999.txt +++ b/forge-gui/res/formats/Extended/Extended, Oct 1999.txt @@ -1,8 +1,8 @@ [format] Name:Extended, Oct 1999 -Order:571 -Subtype:Rotating Type:Historic +Subtype:Extended +Order:245 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS Additional:Badlands; Bayou; Plateau; Savannah; Scrubland; Taiga; Tropical Island; Tundra; Underground Sea; Volcanic Island -Banned:Amulet of Quoz; Balance; Dream Halls; Earthcraft; Lotus Petal; Memory Jar; Mind Over Matter; Time Spiral; Timmerian Fiends; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb \ No newline at end of file +Banned:Amulet of Quoz; Balance; Dream Halls; Earthcraft; Lotus Petal; Memory Jar; Mind Over Matter; Time Spiral; Timmerian Fiends; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Oct 2003.txt b/forge-gui/res/formats/Extended/Extended, Oct 2003.txt similarity index 93% rename from forge-gui/res/formats/Extended, Oct 2003.txt rename to forge-gui/res/formats/Extended/Extended, Oct 2003.txt index 53964e7e710..e69123743af 100644 --- a/forge-gui/res/formats/Extended, Oct 2003.txt +++ b/forge-gui/res/formats/Extended/Extended, Oct 2003.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Oct 2003 Type:Historic -Subtype:Rotating -Order:320 +Subtype:Extended +Order:325 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED Banned:Dark Ritual; Dream Halls; Earthcraft; Entomb; Frantic Search; Goblin Lackey; Lotus Petal; Memory Jar; Mind Over Matter; Replenish; Survival of the Fittest; Time Spiral; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Extended, October 2011.txt b/forge-gui/res/formats/Extended/Extended, October 2011.txt similarity index 62% rename from forge-gui/res/formats/Extended, October 2011.txt rename to forge-gui/res/formats/Extended/Extended, October 2011.txt index 25ff366e72c..8f21e52539c 100644 --- a/forge-gui/res/formats/Extended, October 2011.txt +++ b/forge-gui/res/formats/Extended/Extended, October 2011.txt @@ -1,7 +1,7 @@ [format] Name:Extended, October 2011 Type:Historic -Subtype:Rotating -Order:507 +Subtype:Extended +Order:512 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD -Banned:Jace; the Mind Sculptor; Mental Misstep; Ponder; Stoneforge Mystic +Banned:Jace, the Mind Sculptor; Mental Misstep; Ponder; Stoneforge Mystic diff --git a/forge-gui/res/formats/Extended/Extended, Odyssey.txt b/forge-gui/res/formats/Extended/Extended, Odyssey.txt new file mode 100644 index 00000000000..990a0f2cb10 --- /dev/null +++ b/forge-gui/res/formats/Extended/Extended, Odyssey.txt @@ -0,0 +1,8 @@ +[format] +Name:Extended, Odyssey +Type:Historic +Subtype:Extended +Order:287 +Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY +Additional:Badlands; Bayou; Plateau; Savannah; Scrubland; Taiga; Tropical Island; Tundra; Underground Sea; Volcanic Island +Banned:Amulet of Quoz; Dark Ritual; Demonic Consultation; Dream Halls; Earthcraft; Lotus Petal; Mana Vault; Memory Jar; Mind Over Matter; Necropotence; Replenish; Survival of the Fittest; Time Spiral; Timmerian Fiends; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Onslaught.txt b/forge-gui/res/formats/Extended/Extended, Onslaught.txt similarity index 67% rename from forge-gui/res/formats/Extended, Onslaught.txt rename to forge-gui/res/formats/Extended/Extended, Onslaught.txt index bc1990fddca..7d57b9c45c8 100644 --- a/forge-gui/res/formats/Extended, Onslaught.txt +++ b/forge-gui/res/formats/Extended/Extended, Onslaught.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Onslaught Type:Historic -Subtype:Rotating -Order:299 -Sets:6ED, 7ED, TMP, STH, EXO, USG, ULG, UDS, MMQ, NMS, PCY, INV, PLS, APC, ODY, TOR, JUD, ONS +Subtype:Extended +Order:304 +Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS Banned:Dark Ritual; Dream Halls; Earthcraft; Lotus Petal; Memory Jar; Mind Over Matter; Replenish; Survival of the Fittest; Time Spiral; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Extended, Planar Chaos.txt b/forge-gui/res/formats/Extended/Extended, Planar Chaos.txt similarity index 89% rename from forge-gui/res/formats/Extended, Planar Chaos.txt rename to forge-gui/res/formats/Extended/Extended, Planar Chaos.txt index f3c8dc7d256..0d0b9a678cf 100644 --- a/forge-gui/res/formats/Extended, Planar Chaos.txt +++ b/forge-gui/res/formats/Extended/Extended, Planar Chaos.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Planar Chaos Type:Historic -Subtype:Rotating -Order:396 +Subtype:Extended +Order:401 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC Banned:Aether Vial; Disciple of the Vault; Entomb; Skullclamp diff --git a/forge-gui/res/formats/Extended/Extended, Planeshift.txt b/forge-gui/res/formats/Extended/Extended, Planeshift.txt new file mode 100644 index 00000000000..5b8c41f8f9a --- /dev/null +++ b/forge-gui/res/formats/Extended/Extended, Planeshift.txt @@ -0,0 +1,8 @@ +[format] +Name:Extended, Planeshift +Type:Historic +Subtype:Extended +Order:272 +Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS +Additional:Badlands; Bayou; Plateau; Savannah; Scrubland; Taiga; Tropical Island; Tundra; Underground Sea; Volcanic Island +Banned:Amulet of Quoz; Dark Ritual; Dream Halls; Earthcraft; Lotus Petal; Mana Vault; Memory Jar; Mind Over Matter; Time Spiral; Timmerian Fiends; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended/Extended, Prophecy.txt b/forge-gui/res/formats/Extended/Extended, Prophecy.txt new file mode 100644 index 00000000000..4b18188a246 --- /dev/null +++ b/forge-gui/res/formats/Extended/Extended, Prophecy.txt @@ -0,0 +1,8 @@ +[format] +Name:Extended, Prophecy +Type:Historic +Subtype:Extended +Order:260 +Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY +Additional:Badlands; Bayou; Plateau; Savannah; Scrubland; Taiga; Tropical Island; Tundra; Underground Sea; Volcanic Island +Banned:Amulet of Quoz; Dark Ritual; Dream Halls; Earthcraft; Lotus Petal; Mana Vault; Memory Jar; Mind Over Matter; Time Spiral; Timmerian Fiends; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Ravnica_ City of Guilds.txt b/forge-gui/res/formats/Extended/Extended, Ravnica City of Guilds.txt similarity index 73% rename from forge-gui/res/formats/Extended, Ravnica_ City of Guilds.txt rename to forge-gui/res/formats/Extended/Extended, Ravnica City of Guilds.txt index a5634015c0b..d2d32e50da4 100644 --- a/forge-gui/res/formats/Extended, Ravnica_ City of Guilds.txt +++ b/forge-gui/res/formats/Extended/Extended, Ravnica City of Guilds.txt @@ -1,7 +1,7 @@ [format] -Name:Extended, Ravnica: City of Guilds +Name:Extended, Ravnica City of Guilds Type:Historic -Subtype:Rotating -Order:936 +Subtype:Extended +Order:375 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV Banned:Aether Vial; Disciple of the Vault; Entomb; Skullclamp diff --git a/forge-gui/res/formats/Extended, Rise of the Eldrazi.txt b/forge-gui/res/formats/Extended/Extended, Rise of the Eldrazi.txt similarity index 91% rename from forge-gui/res/formats/Extended, Rise of the Eldrazi.txt rename to forge-gui/res/formats/Extended/Extended, Rise of the Eldrazi.txt index a67f7fc82e0..045f15e0341 100644 --- a/forge-gui/res/formats/Extended, Rise of the Eldrazi.txt +++ b/forge-gui/res/formats/Extended/Extended, Rise of the Eldrazi.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Rise of the Eldrazi Type:Historic -Subtype:Rotating -Order:469 +Subtype:Extended +Order:474 Sets:MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE Banned:Aether Vial; Disciple of the Vault; Sensei's Divining Top; Skullclamp diff --git a/forge-gui/res/formats/Extended, Saviors of Kamigawa.txt b/forge-gui/res/formats/Extended/Extended, Saviors of Kamigawa.txt similarity index 95% rename from forge-gui/res/formats/Extended, Saviors of Kamigawa.txt rename to forge-gui/res/formats/Extended/Extended, Saviors of Kamigawa.txt index d0c245e964b..87726d7703a 100644 --- a/forge-gui/res/formats/Extended, Saviors of Kamigawa.txt +++ b/forge-gui/res/formats/Extended/Extended, Saviors of Kamigawa.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Saviors of Kamigawa Type:Historic -Subtype:Rotating -Order:359 +Subtype:Extended +Order:364 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK Banned:Ancient Tomb; Dark Ritual; Dream Halls; Earthcraft; Entomb; Frantic Search; Goblin Lackey; Goblin Recruiter; Grim Monolith; Hermit Druid; Lotus Petal; Memory Jar; Metalworker; Mind Over Matter; Oath of Druids; Replenish; Skullclamp; Survival of the Fittest; Time Spiral; Tinker; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Extended, Scars of Mirrodin.txt b/forge-gui/res/formats/Extended/Extended, Scars of Mirrodin.txt similarity index 82% rename from forge-gui/res/formats/Extended, Scars of Mirrodin.txt rename to forge-gui/res/formats/Extended/Extended, Scars of Mirrodin.txt index 5e3109f7a7d..3ae1c6d278b 100644 --- a/forge-gui/res/formats/Extended, Scars of Mirrodin.txt +++ b/forge-gui/res/formats/Extended/Extended, Scars of Mirrodin.txt @@ -1,6 +1,6 @@ [format] Name:Extended, Scars of Mirrodin Type:Historic -Subtype:Rotating -Order:480 +Subtype:Extended +Order:485 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM diff --git a/forge-gui/res/formats/Extended, Scourge.txt b/forge-gui/res/formats/Extended/Extended, Scourge.txt similarity index 92% rename from forge-gui/res/formats/Extended, Scourge.txt rename to forge-gui/res/formats/Extended/Extended, Scourge.txt index cb8cdc115cc..e1eeab510a0 100644 --- a/forge-gui/res/formats/Extended, Scourge.txt +++ b/forge-gui/res/formats/Extended/Extended, Scourge.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Scourge Type:Historic -Subtype:Rotating -Order:311 +Subtype:Extended +Order:316 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG Banned:Dark Ritual; Dream Halls; Earthcraft; Lotus Petal; Memory Jar; Mind Over Matter; Replenish; Survival of the Fittest; Time Spiral; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Extended, Sep 2004.txt b/forge-gui/res/formats/Extended/Extended, Sep 2004.txt similarity index 95% rename from forge-gui/res/formats/Extended, Sep 2004.txt rename to forge-gui/res/formats/Extended/Extended, Sep 2004.txt index a12ddf01981..8c04d24cd40 100644 --- a/forge-gui/res/formats/Extended, Sep 2004.txt +++ b/forge-gui/res/formats/Extended/Extended, Sep 2004.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Sep 2004 Type:Historic -Subtype:Rotating -Order:341 +Subtype:Extended +Order:346 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN Banned:Ancient Tomb; Dark Ritual; Dream Halls; Earthcraft; Entomb; Frantic Search; Goblin Lackey; Goblin Recruiter; Grim Monolith; Hermit Druid; Lotus Petal; Memory Jar; Metalworker; Mind Over Matter; Oath of Druids; Replenish; Skullclamp; Survival of the Fittest; Time Spiral; Tinker; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Extended, Sep 2005.txt b/forge-gui/res/formats/Extended/Extended, Sep 2005.txt similarity index 95% rename from forge-gui/res/formats/Extended, Sep 2005.txt rename to forge-gui/res/formats/Extended/Extended, Sep 2005.txt index 3bc1786739a..91d0fcc57a2 100644 --- a/forge-gui/res/formats/Extended, Sep 2005.txt +++ b/forge-gui/res/formats/Extended/Extended, Sep 2005.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Sep 2005 Type:Historic -Subtype:Rotating -Order:366 +Subtype:Extended +Order:371 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED Banned:Aether Vial; Ancient Tomb; Dark Ritual; Disciple of the Vault; Dream Halls; Earthcraft; Entomb; Frantic Search; Goblin Lackey; Goblin Recruiter; Grim Monolith; Hermit Druid; Lotus Petal; Memory Jar; Metalworker; Mind Over Matter; Oath of Druids; Replenish; Skullclamp; Survival of the Fittest; Time Spiral; Tinker; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Extended, Sep 2008.txt b/forge-gui/res/formats/Extended/Extended, Sep 2008.txt similarity index 91% rename from forge-gui/res/formats/Extended, Sep 2008.txt rename to forge-gui/res/formats/Extended/Extended, Sep 2008.txt index 07ad9b98f49..0c77530af27 100644 --- a/forge-gui/res/formats/Extended, Sep 2008.txt +++ b/forge-gui/res/formats/Extended/Extended, Sep 2008.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Sep 2008 Type:Historic -Subtype:Rotating -Order:433 +Subtype:Extended +Order:438 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE Banned:Aether Vial; Disciple of the Vault; Entomb; Sensei's Divining Top; Skullclamp diff --git a/forge-gui/res/formats/Extended/Extended, Seventh Edition.txt b/forge-gui/res/formats/Extended/Extended, Seventh Edition.txt new file mode 100644 index 00000000000..0185bdf4663 --- /dev/null +++ b/forge-gui/res/formats/Extended/Extended, Seventh Edition.txt @@ -0,0 +1,8 @@ +[format] +Name:Extended, Seventh Edition +Type:Historic +Subtype:Extended +Order:278 +Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED +Additional:Badlands; Bayou; Plateau; Savannah; Scrubland; Taiga; Tropical Island; Tundra; Underground Sea; Volcanic Island +Banned:Amulet of Quoz; Dark Ritual; Demonic Consultation; Dream Halls; Earthcraft; Lotus Petal; Mana Vault; Memory Jar; Mind Over Matter; Necropotence; Replenish; Survival of the Fittest; Time Spiral; Timmerian Fiends; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Shadowmoor.txt b/forge-gui/res/formats/Extended/Extended, Shadowmoor.txt similarity index 90% rename from forge-gui/res/formats/Extended, Shadowmoor.txt rename to forge-gui/res/formats/Extended/Extended, Shadowmoor.txt index fc19fb68538..1dd5efe03ed 100644 --- a/forge-gui/res/formats/Extended, Shadowmoor.txt +++ b/forge-gui/res/formats/Extended/Extended, Shadowmoor.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Shadowmoor Type:Historic -Subtype:Rotating -Order:423 +Subtype:Extended +Order:428 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM Banned:Aether Vial; Disciple of the Vault; Entomb; Skullclamp diff --git a/forge-gui/res/formats/Extended, Shards of Alara.txt b/forge-gui/res/formats/Extended/Extended, Shards of Alara.txt similarity index 90% rename from forge-gui/res/formats/Extended, Shards of Alara.txt rename to forge-gui/res/formats/Extended/Extended, Shards of Alara.txt index ed385c2b889..643bcbd9789 100644 --- a/forge-gui/res/formats/Extended, Shards of Alara.txt +++ b/forge-gui/res/formats/Extended/Extended, Shards of Alara.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Shards of Alara Type:Historic -Subtype:Rotating -Order:437 +Subtype:Extended +Order:442 Sets:ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA Banned:Aether Vial; Disciple of the Vault; Sensei's Divining Top; Skullclamp diff --git a/forge-gui/res/formats/Extended, Stronghold.txt b/forge-gui/res/formats/Extended/Extended, Stronghold.txt similarity index 76% rename from forge-gui/res/formats/Extended, Stronghold.txt rename to forge-gui/res/formats/Extended/Extended, Stronghold.txt index fc0b8998678..3956c842381 100644 --- a/forge-gui/res/formats/Extended, Stronghold.txt +++ b/forge-gui/res/formats/Extended/Extended, Stronghold.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Stronghold Type:Historic -Subtype:Rotating -Order:204 -Sets:2ED, 3ED, 4ED, CHR, 5ED, DRK, ARENA, FEM, ICE, CHR, HML, ALL, MIR, VIS, WTH, TMP, STH +Subtype:Extended +Order:209 +Sets:2ED, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Hypnotic Specter; Ivory Tower; Jeweled Bird; Kird Ape; Mana Crypt; Maze of Ith; Mind Twist; Rebirth; Regrowth; Serendib Efreet; Sol Ring; Strip Mine; Tempest Efreet; Timmerian Fiends; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Tempest.txt b/forge-gui/res/formats/Extended/Extended, Tempest.txt similarity index 77% rename from forge-gui/res/formats/Extended, Tempest.txt rename to forge-gui/res/formats/Extended/Extended, Tempest.txt index acebe2e5bf1..091414a2b23 100644 --- a/forge-gui/res/formats/Extended, Tempest.txt +++ b/forge-gui/res/formats/Extended/Extended, Tempest.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Tempest Type:Historic -Subtype:Rotating -Order:197 -Sets:2ED, 3ED, 4ED, CHR, 5ED, DRK, ARENA, FEM, ICE, CHR, HML, ALL, MIR, VIS, WTH, TMP +Subtype:Extended +Order:202 +Sets:2ED, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Hypnotic Specter; Ivory Tower; Jeweled Bird; Kird Ape; Mana Crypt; Maze of Ith; Mind Twist; Rebirth; Regrowth; Serendib Efreet; Sol Ring; Strip Mine; Tempest Efreet; Timmerian Fiends; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Tenth Edition.txt b/forge-gui/res/formats/Extended/Extended, Tenth Edition.txt similarity index 90% rename from forge-gui/res/formats/Extended, Tenth Edition.txt rename to forge-gui/res/formats/Extended/Extended, Tenth Edition.txt index 30da7eb738a..eda0043f5a8 100644 --- a/forge-gui/res/formats/Extended, Tenth Edition.txt +++ b/forge-gui/res/formats/Extended/Extended, Tenth Edition.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Tenth Edition Type:Historic -Subtype:Rotating -Order:407 +Subtype:Extended +Order:412 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E Banned:Aether Vial; Disciple of the Vault; Entomb; Skullclamp diff --git a/forge-gui/res/formats/Extended, Time Spiral.txt b/forge-gui/res/formats/Extended/Extended, Time Spiral.txt similarity index 89% rename from forge-gui/res/formats/Extended, Time Spiral.txt rename to forge-gui/res/formats/Extended/Extended, Time Spiral.txt index 629ca69f810..564c6360c86 100644 --- a/forge-gui/res/formats/Extended, Time Spiral.txt +++ b/forge-gui/res/formats/Extended/Extended, Time Spiral.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Time Spiral Type:Historic -Subtype:Rotating -Order:391 +Subtype:Extended +Order:396 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB Banned:Aether Vial; Disciple of the Vault; Entomb; Skullclamp diff --git a/forge-gui/res/formats/Extended/Extended, Torment.txt b/forge-gui/res/formats/Extended/Extended, Torment.txt new file mode 100644 index 00000000000..7cf33c519fb --- /dev/null +++ b/forge-gui/res/formats/Extended/Extended, Torment.txt @@ -0,0 +1,8 @@ +[format] +Name:Extended, Torment +Type:Historic +Subtype:Extended +Order:294 +Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR +Additional:Badlands; Bayou; Plateau; Savannah; Scrubland; Taiga; Tropical Island; Tundra; Underground Sea; Volcanic Island +Banned:Amulet of Quoz; Dark Ritual; Demonic Consultation; Dream Halls; Earthcraft; Lotus Petal; Mana Vault; Memory Jar; Mind Over Matter; Necropotence; Replenish; Survival of the Fittest; Time Spiral; Timmerian Fiends; Tolarian Academy; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Urza's Destiny.txt b/forge-gui/res/formats/Extended/Extended, Urza's Destiny.txt similarity index 75% rename from forge-gui/res/formats/Extended, Urza's Destiny.txt rename to forge-gui/res/formats/Extended/Extended, Urza's Destiny.txt index 73ac1dc5b9b..6fca183855a 100644 --- a/forge-gui/res/formats/Extended, Urza's Destiny.txt +++ b/forge-gui/res/formats/Extended/Extended, Urza's Destiny.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Urza's Destiny Type:Historic -Subtype:Rotating -Order:236 -Sets:2ED, 3ED, 4ED, CHR, 5ED, 6ED, DRK, ARENA, FEM, ICE, CHR, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG, UDS +Subtype:Extended +Order:241 +Sets:2ED, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS Banned:Amulet of Quoz; Balance; Black Vise; Bronze Tablet; Channel; Contract from Below; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Hypnotic Specter; Ivory Tower; Jeweled Bird; Kird Ape; Mana Crypt; Maze of Ith; Memory Jar; Mind Twist; Rebirth; Regrowth; Serendib Efreet; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Timmerian Fiends; Tolarian Academy; Wheel of Fortune; Windfall; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Urza's Saga.txt b/forge-gui/res/formats/Extended/Extended, Urza's Saga.txt similarity index 75% rename from forge-gui/res/formats/Extended, Urza's Saga.txt rename to forge-gui/res/formats/Extended/Extended, Urza's Saga.txt index e0844792302..2db1e5b2a0c 100644 --- a/forge-gui/res/formats/Extended, Urza's Saga.txt +++ b/forge-gui/res/formats/Extended/Extended, Urza's Saga.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Urza's Saga Type:Historic -Subtype:Rotating -Order:214 -Sets:2ED, 3ED, 4ED, CHR, 5ED, DRK, ARENA, FEM, ICE, CHR, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG +Subtype:Extended +Order:219 +Sets:2ED, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Hypnotic Specter; Ivory Tower; Jeweled Bird; Kird Ape; Mana Crypt; Maze of Ith; Mind Twist; Rebirth; Regrowth; Serendib Efreet; Sol Ring; Strip Mine; Tempest Efreet; Timmerian Fiends; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Weatherlight.txt b/forge-gui/res/formats/Extended/Extended, Weatherlight.txt similarity index 78% rename from forge-gui/res/formats/Extended, Weatherlight.txt rename to forge-gui/res/formats/Extended/Extended, Weatherlight.txt index 007a255e933..fc40257d6b4 100644 --- a/forge-gui/res/formats/Extended, Weatherlight.txt +++ b/forge-gui/res/formats/Extended/Extended, Weatherlight.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Weatherlight Type:Historic -Subtype:Rotating -Order:191 -Sets:2ED, 3ED, 4ED, CHR, 5ED, DRK, ARENA, FEM, ICE, CHR, HML, ALL, MIR, VIS, WTH +Subtype:Extended +Order:196 +Sets:2ED, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Ivory Tower; Jeweled Bird; Juggernaut; Kird Ape; Mana Crypt; Maze of Ith; Mind Twist; Rebirth; Regrowth; Serendib Efreet; Sol Ring; Strip Mine; Tempest Efreet; Timmerian Fiends; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Worldwake.txt b/forge-gui/res/formats/Extended/Extended, Worldwake.txt similarity index 90% rename from forge-gui/res/formats/Extended, Worldwake.txt rename to forge-gui/res/formats/Extended/Extended, Worldwake.txt index f5aef461da6..0fef83b67b6 100644 --- a/forge-gui/res/formats/Extended, Worldwake.txt +++ b/forge-gui/res/formats/Extended/Extended, Worldwake.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Worldwake Type:Historic -Subtype:Rotating -Order:464 +Subtype:Extended +Order:469 Sets:MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK Banned:Aether Vial; Disciple of the Vault; Sensei's Divining Top; Skullclamp diff --git a/forge-gui/res/formats/Extended, Zendikar.txt b/forge-gui/res/formats/Extended/Extended, Zendikar.txt similarity index 90% rename from forge-gui/res/formats/Extended, Zendikar.txt rename to forge-gui/res/formats/Extended/Extended, Zendikar.txt index e968b54a7f0..50490edac5f 100644 --- a/forge-gui/res/formats/Extended, Zendikar.txt +++ b/forge-gui/res/formats/Extended/Extended, Zendikar.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Zendikar Type:Historic -Subtype:Rotating -Order:459 +Subtype:Extended +Order:464 Sets:MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN Banned:Aether Vial; Disciple of the Vault; Sensei's Divining Top; Skullclamp diff --git a/forge-gui/res/formats/Invasion Block Constructed, Apocalypse.txt b/forge-gui/res/formats/Invasion Block Constructed, Apocalypse.txt deleted file mode 100644 index 1e658604b41..00000000000 --- a/forge-gui/res/formats/Invasion Block Constructed, Apocalypse.txt +++ /dev/null @@ -1,9 +0,0 @@ -[format] -Name:Invasion Block Constructed, Apocalypse -Type:Historic -Subtype:Block -Order:277 -Sets:INV, PLS, APC -[Extended, Apocalypse -Sets:3ED, 5ED, 6ED, 7ED, ICE, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG, UDS, MMQ, NMS, PCY, INV, PLS, APC -Banned:Aladdin's Lamp; Amulet of Quoz; Animate Artifact; Armageddon Clock; Balance; Basalt Monolith; Black Vise; Black Ward; Blessing; Blue Elemental Blast; Blue Ward; Braingeyser; Brass Man; Celestial Prism; Channel; Chaoslace; Clone; Conservator; Contract from Below; Control Magic; Conversion; Copy Artifact; Creature Bond; Dark Ritual; Darkpact; Deathlace; Demonic Attorney; Demonic Consultation; Demonic Hordes; Demonic Tutor; Dragon Whelp; Dream Halls; Dwarven Weaponsmith; Earth Elemental; Earthbind; Earthcraft; Ebony Horse; El-Hajjaj; Farmstead; Fastbond; Fork; Gaea's Liege; Goblin Balloon Brigade; Granite Gargoyle; Gray Ogre; Green Ward; Guardian Angel; Holy Armor; Hypnotic Specter; Island Fish Jasconius; Ivory Tower; Jandor's Ring; Juggernaut; Jump; Kird Ape; Kormus Bell; Kudzu; Lance; Lifelace; Lightning Bolt; Living Wall; Lotus Petal; Magnetic Mountain; Mana Crypt; Mana Vault; Memory Jar; Mijae Djinn; Mind Over Matter; Mind Twist; Mishra's War Machine; Necropotence; Nettling Imp; Onulet; Power Leak; Power Surge; Purelace; Rebirth; Reconstruction; Red Elemental Blast; Red Ward; Regrowth; Replenish; Resurrection; Reverse Polarity; Roc of Kher Ridges; Rock Hydra; Rocket Launcher; Royal Assassin; Sacrifice; Savannah Lions; Scavenging Ghoul; Sedge Troll; Sengir Vampire; Serendib Efreet; Simulacrum; Siren's Call; Sol Ring; Sunglasses of Urza; Survival of the Fittest; The Rack; Thoughtlace; Timber Wolves; Time Spiral; Timmerian Fiends; Tolarian Academy; Tunnel; Uthden Troll; Vesuvan Doppelganger; Veteran Bodyguard; Volcanic Eruption; Wall of Ice; Wall of Water; Wall of Wood; Water Elemental; Web; Wheel of Fortune; White Ward; Will-o'-the-Wisp; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Extended, Urza's Legacy.txt b/forge-gui/res/formats/Legacy/Extended, Urza's Legacy.txt similarity index 75% rename from forge-gui/res/formats/Extended, Urza's Legacy.txt rename to forge-gui/res/formats/Legacy/Extended, Urza's Legacy.txt index 23ce8a2e70d..8e9ec4d6b24 100644 --- a/forge-gui/res/formats/Extended, Urza's Legacy.txt +++ b/forge-gui/res/formats/Legacy/Extended, Urza's Legacy.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Urza's Legacy Type:Historic -Subtype:Eternal -Order:221 -Sets:2ED, 3ED, 4ED, CHR, 5ED, DRK, ARENA, FEM, ICE, CHR, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG +Subtype:Legacy +Order:226 +Sets:2ED, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG Banned:Amulet of Quoz; Balance; Black Vise; Bronze Tablet; Channel; Contract from Below; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Hypnotic Specter; Ivory Tower; Jeweled Bird; Kird Ape; Mana Crypt; Maze of Ith; Mind Twist; Rebirth; Regrowth; Serendib Efreet; Sol Ring; Strip Mine; Tempest Efreet; Timmerian Fiends; Tolarian Academy; Wheel of Fortune; Windfall; Zuran Orb diff --git a/forge-gui/res/formats/Legacy, Alara Reborn.txt b/forge-gui/res/formats/Legacy/Legacy, Alara Reborn.txt similarity index 70% rename from forge-gui/res/formats/Legacy, Alara Reborn.txt rename to forge-gui/res/formats/Legacy/Legacy, Alara Reborn.txt index 5369a432b73..d5af69c8e10 100644 --- a/forge-gui/res/formats/Legacy, Alara Reborn.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Alara Reborn.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Alara Reborn Type:Historic -Subtype:Eternal -Order:448 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB +Subtype:Legacy +Order:453 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Flash; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Avacyn Restored.txt b/forge-gui/res/formats/Legacy/Legacy, Avacyn Restored.txt similarity index 65% rename from forge-gui/res/formats/Legacy, Avacyn Restored.txt rename to forge-gui/res/formats/Legacy/Legacy, Avacyn Restored.txt index 917eaf5345d..e8e7c2e7332 100644 --- a/forge-gui/res/formats/Legacy, Avacyn Restored.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Avacyn Restored.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Avacyn Restored Type:Historic -Subtype:Eternal -Order:521 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR +Subtype:Legacy +Order:526 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Fastbond; Flash; Frantic Search; Goblin Recruiter; Gush; Hermit Druid; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Survival of the Fittest; Tempest Efreet; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Betrayers of Kamigawa.txt b/forge-gui/res/formats/Legacy/Legacy, Betrayers of Kamigawa.txt similarity index 76% rename from forge-gui/res/formats/Legacy, Betrayers of Kamigawa.txt rename to forge-gui/res/formats/Legacy/Legacy, Betrayers of Kamigawa.txt index 3320b3a874f..5ff2e9d0653 100644 --- a/forge-gui/res/formats/Legacy, Betrayers of Kamigawa.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Betrayers of Kamigawa.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Betrayers of Kamigawa Type:Historic -Subtype:Eternal -Order:353 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK +Subtype:Legacy +Order:358 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Over Matter; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Replenish; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Champions of Kamigawa.txt b/forge-gui/res/formats/Legacy/Legacy, Champions of Kamigawa.txt similarity index 77% rename from forge-gui/res/formats/Legacy, Champions of Kamigawa.txt rename to forge-gui/res/formats/Legacy/Legacy, Champions of Kamigawa.txt index 78faf01e833..ccf3330e104 100644 --- a/forge-gui/res/formats/Legacy, Champions of Kamigawa.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Champions of Kamigawa.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Champions of Kamigawa Type:Historic -Subtype:Eternal -Order:347 -Sets:3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK +Subtype:Legacy +Order:352 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Over Matter; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Replenish; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Coldsnap.txt b/forge-gui/res/formats/Legacy/Legacy, Coldsnap.txt similarity index 73% rename from forge-gui/res/formats/Legacy, Coldsnap.txt rename to forge-gui/res/formats/Legacy/Legacy, Coldsnap.txt index c0c35421c15..6d0afabe2de 100644 --- a/forge-gui/res/formats/Legacy, Coldsnap.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Coldsnap.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Coldsnap Type:Historic -Subtype:Eternal -Order:387 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP +Subtype:Legacy +Order:392 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Over Matter; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Replenish; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Conflux.txt b/forge-gui/res/formats/Legacy/Legacy, Conflux.txt similarity index 70% rename from forge-gui/res/formats/Legacy, Conflux.txt rename to forge-gui/res/formats/Legacy/Legacy, Conflux.txt index 68750b2d935..cfd6256da68 100644 --- a/forge-gui/res/formats/Legacy, Conflux.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Conflux.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Conflux Type:Historic -Subtype:Eternal -Order:443 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX +Subtype:Legacy +Order:448 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Flash; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Dark Ascension.txt b/forge-gui/res/formats/Legacy/Legacy, Dark Ascension.txt similarity index 65% rename from forge-gui/res/formats/Legacy, Dark Ascension.txt rename to forge-gui/res/formats/Legacy/Legacy, Dark Ascension.txt index d204e718927..1e34c7aef87 100644 --- a/forge-gui/res/formats/Legacy, Dark Ascension.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Dark Ascension.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Dark Ascension Type:Historic -Subtype:Eternal -Order:514 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA +Subtype:Legacy +Order:519 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Fastbond; Flash; Frantic Search; Goblin Recruiter; Gush; Hermit Druid; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Survival of the Fittest; Tempest Efreet; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Dissension.txt b/forge-gui/res/formats/Legacy/Legacy, Dissension.txt similarity index 73% rename from forge-gui/res/formats/Legacy, Dissension.txt rename to forge-gui/res/formats/Legacy/Legacy, Dissension.txt index 86caa372fe6..876b655e8b2 100644 --- a/forge-gui/res/formats/Legacy, Dissension.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Dissension.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Dissension Type:Historic -Subtype:Eternal -Order:382 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS +Subtype:Legacy +Order:387 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Over Matter; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Replenish; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Eventide.txt b/forge-gui/res/formats/Legacy/Legacy, Eventide.txt similarity index 70% rename from forge-gui/res/formats/Legacy, Eventide.txt rename to forge-gui/res/formats/Legacy/Legacy, Eventide.txt index 29b0298859c..67d3bf3942e 100644 --- a/forge-gui/res/formats/Legacy, Eventide.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Eventide.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Eventide Type:Historic -Subtype:Eternal -Order:431 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE +Subtype:Legacy +Order:436 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Flash; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Future Sight.txt b/forge-gui/res/formats/Legacy/Legacy, Future Sight.txt similarity index 72% rename from forge-gui/res/formats/Legacy, Future Sight.txt rename to forge-gui/res/formats/Legacy/Legacy, Future Sight.txt index de91785eeea..ba196ec70fd 100644 --- a/forge-gui/res/formats/Legacy, Future Sight.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Future Sight.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Future Sight Type:Historic -Subtype:Eternal -Order:402 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT +Subtype:Legacy +Order:407 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Over Matter; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Replenish; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Guildpact.txt b/forge-gui/res/formats/Legacy/Legacy, Guildpact.txt similarity index 74% rename from forge-gui/res/formats/Legacy, Guildpact.txt rename to forge-gui/res/formats/Legacy/Legacy, Guildpact.txt index 8137e7b02db..e059777f33f 100644 --- a/forge-gui/res/formats/Legacy, Guildpact.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Guildpact.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Guildpact Type:Historic -Subtype:Eternal -Order:376 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT +Subtype:Legacy +Order:381 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Over Matter; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Replenish; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Innistrad.txt b/forge-gui/res/formats/Legacy/Legacy, Innistrad.txt similarity index 65% rename from forge-gui/res/formats/Legacy, Innistrad.txt rename to forge-gui/res/formats/Legacy/Legacy, Innistrad.txt index 87152f8a5de..e4cdeac4646 100644 --- a/forge-gui/res/formats/Legacy, Innistrad.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Innistrad.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Innistrad Type:Historic -Subtype:Eternal -Order:504 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD +Subtype:Legacy +Order:509 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Fastbond; Flash; Frantic Search; Goblin Recruiter; Gush; Hermit Druid; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Survival of the Fittest; Tempest Efreet; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, January 2011.txt b/forge-gui/res/formats/Legacy/Legacy, January 2011.txt similarity index 66% rename from forge-gui/res/formats/Legacy, January 2011.txt rename to forge-gui/res/formats/Legacy/Legacy, January 2011.txt index c0d3d6d8769..b5d48c7bc07 100644 --- a/forge-gui/res/formats/Legacy, January 2011.txt +++ b/forge-gui/res/formats/Legacy/Legacy, January 2011.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, January 2011 Type:Historic -Subtype:Eternal -Order:483 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM +Subtype:Legacy +Order:488 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Fastbond; Flash; Frantic Search; Goblin Recruiter; Gush; Hermit Druid; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Survival of the Fittest; Tempest Efreet; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, July 2010.txt b/forge-gui/res/formats/Legacy/Legacy, July 2010.txt similarity index 67% rename from forge-gui/res/formats/Legacy, July 2010.txt rename to forge-gui/res/formats/Legacy/Legacy, July 2010.txt index 56482476a90..19954ee1401 100644 --- a/forge-gui/res/formats/Legacy, July 2010.txt +++ b/forge-gui/res/formats/Legacy/Legacy, July 2010.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, July 2010 Type:Historic -Subtype:Eternal -Order:473 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE +Subtype:Legacy +Order:478 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Fastbond; Flash; Frantic Search; Goblin Recruiter; Gush; Hermit Druid; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, July 2012.txt b/forge-gui/res/formats/Legacy/Legacy, July 2012.txt similarity index 65% rename from forge-gui/res/formats/Legacy, July 2012.txt rename to forge-gui/res/formats/Legacy/Legacy, July 2012.txt index 1454390c56a..50f9ee9a531 100644 --- a/forge-gui/res/formats/Legacy, July 2012.txt +++ b/forge-gui/res/formats/Legacy/Legacy, July 2012.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, July 2012 Type:Historic -Subtype:Eternal -Order:523 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR +Subtype:Legacy +Order:528 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Fastbond; Flash; Frantic Search; Goblin Recruiter; Gush; Hermit Druid; Imperial Seal; Jeweled Bird; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Survival of the Fittest; Tempest Efreet; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Jun 2007.txt b/forge-gui/res/formats/Legacy/Legacy, Jun 2007.txt similarity index 71% rename from forge-gui/res/formats/Legacy, Jun 2007.txt rename to forge-gui/res/formats/Legacy/Legacy, Jun 2007.txt index b4a41e0dd34..28363b433f8 100644 --- a/forge-gui/res/formats/Legacy, Jun 2007.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Jun 2007.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Jun 2007 Type:Historic -Subtype:Eternal -Order:405 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT +Subtype:Legacy +Order:410 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Flash; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Lorwyn.txt b/forge-gui/res/formats/Legacy/Legacy, Lorwyn.txt similarity index 71% rename from forge-gui/res/formats/Legacy, Lorwyn.txt rename to forge-gui/res/formats/Legacy/Legacy, Lorwyn.txt index e48f16f2531..e6d5fc7869c 100644 --- a/forge-gui/res/formats/Legacy, Lorwyn.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Lorwyn.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Lorwyn Type:Historic -Subtype:Eternal -Order:415 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW +Subtype:Legacy +Order:420 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Flash; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Magic 2010.txt b/forge-gui/res/formats/Legacy/Legacy, Magic 2010.txt similarity index 69% rename from forge-gui/res/formats/Legacy, Magic 2010.txt rename to forge-gui/res/formats/Legacy/Legacy, Magic 2010.txt index df02aaf0251..3744e455f87 100644 --- a/forge-gui/res/formats/Legacy, Magic 2010.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Magic 2010.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Magic 2010 Type:Historic -Subtype:Eternal -Order:454 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10 +Subtype:Legacy +Order:459 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10 Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Flash; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Magic 2011.txt b/forge-gui/res/formats/Legacy/Legacy, Magic 2011.txt similarity index 66% rename from forge-gui/res/formats/Legacy, Magic 2011.txt rename to forge-gui/res/formats/Legacy/Legacy, Magic 2011.txt index af1eb9d3e9d..d23df019e72 100644 --- a/forge-gui/res/formats/Legacy, Magic 2011.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Magic 2011.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Magic 2011 Type:Historic -Subtype:Eternal -Order:476 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11 +Subtype:Legacy +Order:481 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11 Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Fastbond; Flash; Frantic Search; Goblin Recruiter; Gush; Hermit Druid; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Magic 2012.txt b/forge-gui/res/formats/Legacy/Legacy, Magic 2012.txt similarity index 66% rename from forge-gui/res/formats/Legacy, Magic 2012.txt rename to forge-gui/res/formats/Legacy/Legacy, Magic 2012.txt index b3834044d99..77b1f0f2041 100644 --- a/forge-gui/res/formats/Legacy, Magic 2012.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Magic 2012.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Magic 2012 Type:Historic -Subtype:Eternal -Order:497 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12 +Subtype:Legacy +Order:502 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12 Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Fastbond; Flash; Frantic Search; Goblin Recruiter; Gush; Hermit Druid; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Survival of the Fittest; Tempest Efreet; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Magic 2013.txt b/forge-gui/res/formats/Legacy/Legacy, Magic 2013.txt similarity index 64% rename from forge-gui/res/formats/Legacy, Magic 2013.txt rename to forge-gui/res/formats/Legacy/Legacy, Magic 2013.txt index 2d8355bdcf6..bda2c99cb91 100644 --- a/forge-gui/res/formats/Legacy, Magic 2013.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Magic 2013.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Magic 2013 Type:Historic -Subtype:Eternal -Order:527 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13 +Subtype:Legacy +Order:532 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13 Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Fastbond; Flash; Frantic Search; Goblin Recruiter; Gush; Hermit Druid; Imperial Seal; Jeweled Bird; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Survival of the Fittest; Tempest Efreet; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Mirrodin Besieged.txt b/forge-gui/res/formats/Legacy/Legacy, Mirrodin Besieged.txt similarity index 66% rename from forge-gui/res/formats/Legacy, Mirrodin Besieged.txt rename to forge-gui/res/formats/Legacy/Legacy, Mirrodin Besieged.txt index 92bfaa97aed..1e762627aa7 100644 --- a/forge-gui/res/formats/Legacy, Mirrodin Besieged.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Mirrodin Besieged.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Mirrodin Besieged Type:Historic -Subtype:Eternal -Order:487 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS +Subtype:Legacy +Order:492 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Fastbond; Flash; Frantic Search; Goblin Recruiter; Gush; Hermit Druid; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Survival of the Fittest; Tempest Efreet; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Morningtide.txt b/forge-gui/res/formats/Legacy/Legacy, Morningtide.txt similarity index 71% rename from forge-gui/res/formats/Legacy, Morningtide.txt rename to forge-gui/res/formats/Legacy/Legacy, Morningtide.txt index c01e0e8244e..e908462cc8a 100644 --- a/forge-gui/res/formats/Legacy, Morningtide.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Morningtide.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Morningtide Type:Historic -Subtype:Eternal -Order:420 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR +Subtype:Legacy +Order:425 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Flash; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, New Phyrexia.txt b/forge-gui/res/formats/Legacy/Legacy, New Phyrexia.txt similarity index 66% rename from forge-gui/res/formats/Legacy, New Phyrexia.txt rename to forge-gui/res/formats/Legacy/Legacy, New Phyrexia.txt index 820770d98a2..a92595a5355 100644 --- a/forge-gui/res/formats/Legacy, New Phyrexia.txt +++ b/forge-gui/res/formats/Legacy/Legacy, New Phyrexia.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, New Phyrexia Type:Historic -Subtype:Eternal -Order:492 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH +Subtype:Legacy +Order:497 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Fastbond; Flash; Frantic Search; Goblin Recruiter; Gush; Hermit Druid; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Survival of the Fittest; Tempest Efreet; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Ninth Edition.txt b/forge-gui/res/formats/Legacy/Legacy, Ninth Edition.txt similarity index 76% rename from forge-gui/res/formats/Legacy, Ninth Edition.txt rename to forge-gui/res/formats/Legacy/Legacy, Ninth Edition.txt index 9c655597045..05420a03fe2 100644 --- a/forge-gui/res/formats/Legacy, Ninth Edition.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Ninth Edition.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Ninth Edition Type:Historic -Subtype:Eternal -Order:364 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED +Subtype:Legacy +Order:369 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Over Matter; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Replenish; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, October 2009.txt b/forge-gui/res/formats/Legacy/Legacy, October 2009.txt similarity index 69% rename from forge-gui/res/formats/Legacy, October 2009.txt rename to forge-gui/res/formats/Legacy/Legacy, October 2009.txt index 4a25321af7a..7e7df9107ff 100644 --- a/forge-gui/res/formats/Legacy, October 2009.txt +++ b/forge-gui/res/formats/Legacy/Legacy, October 2009.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, October 2009 Type:Historic -Subtype:Eternal -Order:456 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10 +Subtype:Legacy +Order:461 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10 Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Fastbond; Flash; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Planar Chaos.txt b/forge-gui/res/formats/Legacy/Legacy, Planar Chaos.txt similarity index 72% rename from forge-gui/res/formats/Legacy, Planar Chaos.txt rename to forge-gui/res/formats/Legacy/Legacy, Planar Chaos.txt index 2eeba566ee5..45360873289 100644 --- a/forge-gui/res/formats/Legacy, Planar Chaos.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Planar Chaos.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Planar Chaos Type:Historic -Subtype:Eternal -Order:397 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC +Subtype:Legacy +Order:402 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Over Matter; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Replenish; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Ravnica_ City of Guilds.txt b/forge-gui/res/formats/Legacy/Legacy, Ravnica City of Guilds.txt similarity index 71% rename from forge-gui/res/formats/Legacy, Ravnica_ City of Guilds.txt rename to forge-gui/res/formats/Legacy/Legacy, Ravnica City of Guilds.txt index 52f6453544c..a9aebc06d46 100644 --- a/forge-gui/res/formats/Legacy, Ravnica_ City of Guilds.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Ravnica City of Guilds.txt @@ -1,7 +1,7 @@ [format] -Name:Legacy, Ravnica: City of Guilds +Name:Legacy, Ravnica City of Guilds Type:Historic -Subtype:Eternal -Order:939 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00 +Subtype:Legacy +Order:376 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00 Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Over Matter; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Replenish; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Rise of the Eldrazi.txt b/forge-gui/res/formats/Legacy/Legacy, Rise of the Eldrazi.txt similarity index 68% rename from forge-gui/res/formats/Legacy, Rise of the Eldrazi.txt rename to forge-gui/res/formats/Legacy/Legacy, Rise of the Eldrazi.txt index 530efd115e2..0466a58959b 100644 --- a/forge-gui/res/formats/Legacy, Rise of the Eldrazi.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Rise of the Eldrazi.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Rise of the Eldrazi Type:Historic -Subtype:Eternal -Order:470 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE +Subtype:Legacy +Order:475 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Fastbond; Flash; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Saviors of Kamigawa.txt b/forge-gui/res/formats/Legacy/Legacy, Saviors of Kamigawa.txt similarity index 76% rename from forge-gui/res/formats/Legacy, Saviors of Kamigawa.txt rename to forge-gui/res/formats/Legacy/Legacy, Saviors of Kamigawa.txt index 6d93c695742..823bc4b3b4b 100644 --- a/forge-gui/res/formats/Legacy, Saviors of Kamigawa.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Saviors of Kamigawa.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Saviors of Kamigawa Type:Historic -Subtype:Eternal -Order:360 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK +Subtype:Legacy +Order:365 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Over Matter; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Replenish; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Scars of Mirrodin.txt b/forge-gui/res/formats/Legacy/Legacy, Scars of Mirrodin.txt similarity index 66% rename from forge-gui/res/formats/Legacy, Scars of Mirrodin.txt rename to forge-gui/res/formats/Legacy/Legacy, Scars of Mirrodin.txt index 5030533dc17..7da06df7509 100644 --- a/forge-gui/res/formats/Legacy, Scars of Mirrodin.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Scars of Mirrodin.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Scars of Mirrodin Type:Historic -Subtype:Eternal -Order:481 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM +Subtype:Legacy +Order:486 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Fastbond; Flash; Frantic Search; Goblin Recruiter; Gush; Hermit Druid; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Sep 2007.txt b/forge-gui/res/formats/Legacy/Legacy, Sep 2007.txt similarity index 71% rename from forge-gui/res/formats/Legacy, Sep 2007.txt rename to forge-gui/res/formats/Legacy/Legacy, Sep 2007.txt index 5e67b7c60bc..1f78e75c271 100644 --- a/forge-gui/res/formats/Legacy, Sep 2007.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Sep 2007.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Sep 2007 Type:Historic -Subtype:Eternal -Order:411 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E +Subtype:Legacy +Order:416 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Flash; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Sep 2008.txt b/forge-gui/res/formats/Legacy/Legacy, Sep 2008.txt similarity index 70% rename from forge-gui/res/formats/Legacy, Sep 2008.txt rename to forge-gui/res/formats/Legacy/Legacy, Sep 2008.txt index 4d4edad8f4d..4aa969563ca 100644 --- a/forge-gui/res/formats/Legacy, Sep 2008.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Sep 2008.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Sep 2008 Type:Historic -Subtype:Eternal -Order:434 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE +Subtype:Legacy +Order:439 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Flash; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Shadowmoor.txt b/forge-gui/res/formats/Legacy/Legacy, Shadowmoor.txt similarity index 71% rename from forge-gui/res/formats/Legacy, Shadowmoor.txt rename to forge-gui/res/formats/Legacy/Legacy, Shadowmoor.txt index cd5dd46bdc9..53708fec0d2 100644 --- a/forge-gui/res/formats/Legacy, Shadowmoor.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Shadowmoor.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Shadowmoor Type:Historic -Subtype:Eternal -Order:425 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM +Subtype:Legacy +Order:430 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Flash; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Shards of Alara.txt b/forge-gui/res/formats/Legacy/Legacy, Shards of Alara.txt similarity index 70% rename from forge-gui/res/formats/Legacy, Shards of Alara.txt rename to forge-gui/res/formats/Legacy/Legacy, Shards of Alara.txt index d75fbb747c4..37298a838f6 100644 --- a/forge-gui/res/formats/Legacy, Shards of Alara.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Shards of Alara.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Shards of Alara Type:Historic -Subtype:Eternal -Order:438 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA +Subtype:Legacy +Order:443 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Flash; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Tenth Edition.txt b/forge-gui/res/formats/Legacy/Legacy, Tenth Edition.txt similarity index 71% rename from forge-gui/res/formats/Legacy, Tenth Edition.txt rename to forge-gui/res/formats/Legacy/Legacy, Tenth Edition.txt index fe0f0ee6a46..19cc44daaf5 100644 --- a/forge-gui/res/formats/Legacy, Tenth Edition.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Tenth Edition.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Tenth Edition Type:Historic -Subtype:Eternal -Order:409 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E +Subtype:Legacy +Order:414 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Flash; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Time Spiral.txt b/forge-gui/res/formats/Legacy/Legacy, Time Spiral.txt similarity index 72% rename from forge-gui/res/formats/Legacy, Time Spiral.txt rename to forge-gui/res/formats/Legacy/Legacy, Time Spiral.txt index 8c2d0ac9e1d..084ac8171db 100644 --- a/forge-gui/res/formats/Legacy, Time Spiral.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Time Spiral.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Time Spiral Type:Historic -Subtype:Eternal -Order:392 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB +Subtype:Legacy +Order:397 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Over Matter; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Replenish; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Worldwake.txt b/forge-gui/res/formats/Legacy/Legacy, Worldwake.txt similarity index 68% rename from forge-gui/res/formats/Legacy, Worldwake.txt rename to forge-gui/res/formats/Legacy/Legacy, Worldwake.txt index 7ed6c8fc3fa..dd4a1369cce 100644 --- a/forge-gui/res/formats/Legacy, Worldwake.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Worldwake.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Worldwake Type:Historic -Subtype:Eternal -Order:465 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK +Subtype:Legacy +Order:470 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Fastbond; Flash; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Legacy, Zendikar.txt b/forge-gui/res/formats/Legacy/Legacy, Zendikar.txt similarity index 68% rename from forge-gui/res/formats/Legacy, Zendikar.txt rename to forge-gui/res/formats/Legacy/Legacy, Zendikar.txt index 7a65211d6e6..109b13d1ae8 100644 --- a/forge-gui/res/formats/Legacy, Zendikar.txt +++ b/forge-gui/res/formats/Legacy/Legacy, Zendikar.txt @@ -1,7 +1,7 @@ [format] Name:Legacy, Zendikar Type:Historic -Subtype:Eternal -Order:460 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN +Subtype:Legacy +Order:465 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Earthcraft; Fastbond; Flash; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Imperial Seal; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Standard, Urza's Legacy.txt b/forge-gui/res/formats/Legacy/Standard, Urza's Legacy.txt similarity index 82% rename from forge-gui/res/formats/Standard, Urza's Legacy.txt rename to forge-gui/res/formats/Legacy/Standard, Urza's Legacy.txt index 668c206990c..fb046e0210d 100644 --- a/forge-gui/res/formats/Standard, Urza's Legacy.txt +++ b/forge-gui/res/formats/Legacy/Standard, Urza's Legacy.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Urza's Legacy Type:Historic -Subtype:Eternal -Order:220 +Subtype:Legacy +Order:225 Sets:5ED, TMP, STH, EXO, USG, ULG Banned:Tolarian Academy; Windfall diff --git a/forge-gui/res/formats/Urza Block Constructed, Urza's Legacy.txt b/forge-gui/res/formats/Legacy/Urza Block Constructed, Urza's Legacy.txt similarity index 75% rename from forge-gui/res/formats/Urza Block Constructed, Urza's Legacy.txt rename to forge-gui/res/formats/Legacy/Urza Block Constructed, Urza's Legacy.txt index 86ed1b3bc2a..422544bff69 100644 --- a/forge-gui/res/formats/Urza Block Constructed, Urza's Legacy.txt +++ b/forge-gui/res/formats/Legacy/Urza Block Constructed, Urza's Legacy.txt @@ -1,6 +1,6 @@ [format] Name:Urza Block Constructed, Urza's Legacy Type:Historic -Subtype:Eternal -Order:222 +Subtype:Legacy +Order:227 Sets:USG, ULG diff --git a/forge-gui/res/formats/Modern, August 2011.txt b/forge-gui/res/formats/Modern/Modern, August 2011.txt similarity index 77% rename from forge-gui/res/formats/Modern, August 2011.txt rename to forge-gui/res/formats/Modern/Modern, August 2011.txt index 103e19fad3e..996ab723415 100644 --- a/forge-gui/res/formats/Modern, August 2011.txt +++ b/forge-gui/res/formats/Modern/Modern, August 2011.txt @@ -1,7 +1,7 @@ [format] Name:Modern, August 2011 Type:Historic -Subtype:Eternal -Order:499 +Subtype:Modern +Order:504 Sets:8ED, 9ED, 10E, M10, M11, M12, MRD, DST, 5DN, CHK, BOK, SOK, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, LRW, MOR, SHM, EVE, ALA, CFX, ARB, ZEN, WWK, ROE, SOM, MBS, NPH -Banned:Ancestral Vision; Ancient Den; Bitterblossom; Chrome Mox; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Hypergenesis; Jace; the Mind Sculptor; Mental Misstep; Seat of the Synod; Sensei's Divining Top; Skullclamp; Stoneforge Mystic; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Valakut; the Molten Pinnacle; Vault of Whispers +Banned:Ancestral Vision; Ancient Den; Bitterblossom; Chrome Mox; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Hypergenesis; Jace, the Mind Sculptor; Mental Misstep; Seat of the Synod; Sensei's Divining Top; Skullclamp; Stoneforge Mystic; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Valakut, the Molten Pinnacle; Vault of Whispers diff --git a/forge-gui/res/formats/Modern, Avacyn Restored.txt b/forge-gui/res/formats/Modern/Modern, Avacyn Restored.txt similarity index 80% rename from forge-gui/res/formats/Modern, Avacyn Restored.txt rename to forge-gui/res/formats/Modern/Modern, Avacyn Restored.txt index ac41ee4ba35..dc9e955346b 100644 --- a/forge-gui/res/formats/Modern, Avacyn Restored.txt +++ b/forge-gui/res/formats/Modern/Modern, Avacyn Restored.txt @@ -1,7 +1,7 @@ [format] Name:Modern, Avacyn Restored Type:Historic -Subtype:Eternal -Order:519 +Subtype:Modern +Order:524 Sets:8ED, 9ED, 10E, M10, M11, M12, MRD, DST, 5DN, CHK, BOK, SOK, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, LRW, MOR, SHM, EVE, ALA, CFX, ARB, ZEN, WWK, ROE, SOM, MBS, NPH, ISD, DKA, AVR -Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace; the Mind Sculptor; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Sensei's Divining Top; Skullclamp; Stoneforge Mystic; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Valakut; the Molten Pinnacle; Vault of Whispers; Wild Nacatl +Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace, the Mind Sculptor; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Sensei's Divining Top; Skullclamp; Stoneforge Mystic; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Valakut, the Molten Pinnacle; Vault of Whispers; Wild Nacatl diff --git a/forge-gui/res/formats/Modern, Dark Ascension.txt b/forge-gui/res/formats/Modern/Modern, Dark Ascension.txt similarity index 79% rename from forge-gui/res/formats/Modern, Dark Ascension.txt rename to forge-gui/res/formats/Modern/Modern, Dark Ascension.txt index e774d5b72d0..ee6c311ffc6 100644 --- a/forge-gui/res/formats/Modern, Dark Ascension.txt +++ b/forge-gui/res/formats/Modern/Modern, Dark Ascension.txt @@ -1,7 +1,7 @@ [format] Name:Modern, Dark Ascension Type:Historic -Subtype:Eternal -Order:512 +Subtype:Modern +Order:517 Sets:8ED, 9ED, 10E, M10, M11, M12, MRD, DST, 5DN, CHK, BOK, SOK, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, LRW, MOR, SHM, EVE, ALA, CFX, ARB, ZEN, WWK, ROE, SOM, MBS, NPH, ISD, DKA -Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace; the Mind Sculptor; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Sensei's Divining Top; Skullclamp; Stoneforge Mystic; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Valakut; the Molten Pinnacle; Vault of Whispers; Wild Nacatl +Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace, the Mind Sculptor; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Sensei's Divining Top; Skullclamp; Stoneforge Mystic; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Valakut, the Molten Pinnacle; Vault of Whispers; Wild Nacatl diff --git a/forge-gui/res/formats/Modern, Innistrad.txt b/forge-gui/res/formats/Modern/Modern, Innistrad.txt similarity index 77% rename from forge-gui/res/formats/Modern, Innistrad.txt rename to forge-gui/res/formats/Modern/Modern, Innistrad.txt index 4e0638bb6c8..ac04bc5308c 100644 --- a/forge-gui/res/formats/Modern, Innistrad.txt +++ b/forge-gui/res/formats/Modern/Modern, Innistrad.txt @@ -1,7 +1,7 @@ [format] Name:Modern, Innistrad Type:Historic -Subtype:Eternal -Order:502 +Subtype:Modern +Order:507 Sets:8ED, 9ED, 10E, M10, M11, M12, MRD, DST, 5DN, CHK, BOK, SOK, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, LRW, MOR, SHM, EVE, ALA, CFX, ARB, ZEN, WWK, ROE, SOM, MBS, NPH, ISD -Banned:Ancestral Vision; Ancient Den; Bitterblossom; Chrome Mox; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Hypergenesis; Jace; the Mind Sculptor; Mental Misstep; Seat of the Synod; Sensei's Divining Top; Skullclamp; Stoneforge Mystic; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Valakut; the Molten Pinnacle; Vault of Whispers +Banned:Ancestral Vision; Ancient Den; Bitterblossom; Chrome Mox; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Hypergenesis; Jace, the Mind Sculptor; Mental Misstep; Seat of the Synod; Sensei's Divining Top; Skullclamp; Stoneforge Mystic; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Valakut, the Molten Pinnacle; Vault of Whispers diff --git a/forge-gui/res/formats/Modern, January 2012.txt b/forge-gui/res/formats/Modern/Modern, January 2012.txt similarity index 79% rename from forge-gui/res/formats/Modern, January 2012.txt rename to forge-gui/res/formats/Modern/Modern, January 2012.txt index 5e3d6d6476d..244b4dbfe34 100644 --- a/forge-gui/res/formats/Modern, January 2012.txt +++ b/forge-gui/res/formats/Modern/Modern, January 2012.txt @@ -1,7 +1,7 @@ [format] Name:Modern, January 2012 Type:Historic -Subtype:Eternal -Order:509 +Subtype:Modern +Order:514 Sets:8ED, 9ED, 10E, M10, M11, M12, MRD, DST, 5DN, CHK, BOK, SOK, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, LRW, MOR, SHM, EVE, ALA, CFX, ARB, ZEN, WWK, ROE, SOM, MBS, NPH, ISD -Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace; the Mind Sculptor; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Sensei's Divining Top; Skullclamp; Stoneforge Mystic; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Valakut; the Molten Pinnacle; Vault of Whispers; Wild Nacatl +Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace, the Mind Sculptor; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Sensei's Divining Top; Skullclamp; Stoneforge Mystic; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Valakut, the Molten Pinnacle; Vault of Whispers; Wild Nacatl diff --git a/forge-gui/res/formats/Modern, Magic 2013.txt b/forge-gui/res/formats/Modern/Modern, Magic 2013.txt similarity index 80% rename from forge-gui/res/formats/Modern, Magic 2013.txt rename to forge-gui/res/formats/Modern/Modern, Magic 2013.txt index 244277102d6..b581b8da8cc 100644 --- a/forge-gui/res/formats/Modern, Magic 2013.txt +++ b/forge-gui/res/formats/Modern/Modern, Magic 2013.txt @@ -1,7 +1,7 @@ [format] Name:Modern, Magic 2013 Type:Historic -Subtype:Eternal -Order:525 +Subtype:Modern +Order:530 Sets:8ED, 9ED, 10E, M10, M11, M12, MRD, DST, 5DN, CHK, BOK, SOK, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, LRW, MOR, SHM, EVE, ALA, CFX, ARB, ZEN, WWK, ROE, SOM, MBS, NPH, ISD, DKA, AVR, M13 -Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace; the Mind Sculptor; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Sensei's Divining Top; Skullclamp; Stoneforge Mystic; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Valakut; the Molten Pinnacle; Vault of Whispers; Wild Nacatl +Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace, the Mind Sculptor; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Sensei's Divining Top; Skullclamp; Stoneforge Mystic; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Valakut, the Molten Pinnacle; Vault of Whispers; Wild Nacatl diff --git a/forge-gui/res/formats/Modern, October 2011.txt b/forge-gui/res/formats/Modern/Modern, October 2011.txt similarity index 78% rename from forge-gui/res/formats/Modern, October 2011.txt rename to forge-gui/res/formats/Modern/Modern, October 2011.txt index 6ac9806a9d1..81a038ece21 100644 --- a/forge-gui/res/formats/Modern, October 2011.txt +++ b/forge-gui/res/formats/Modern/Modern, October 2011.txt @@ -1,7 +1,7 @@ [format] Name:Modern, October 2011 Type:Historic -Subtype:Eternal -Order:506 +Subtype:Modern +Order:511 Sets:8ED, 9ED, 10E, M10, M11, M12, MRD, DST, 5DN, CHK, BOK, SOK, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, LRW, MOR, SHM, EVE, ALA, CFX, ARB, ZEN, WWK, ROE, SOM, MBS, NPH, ISD -Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace; the Mind Sculptor; Mental Misstep; Ponder; Preordain; Rite of Flame; Seat of the Synod; Sensei's Divining Top; Skullclamp; Stoneforge Mystic; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Valakut; the Molten Pinnacle; Vault of Whispers +Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace, the Mind Sculptor; Mental Misstep; Ponder; Preordain; Rite of Flame; Seat of the Synod; Sensei's Divining Top; Skullclamp; Stoneforge Mystic; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Valakut, the Molten Pinnacle; Vault of Whispers diff --git a/forge-gui/res/formats/Ravnica Block Constructed, Ravnica_ City of Guilds.txt b/forge-gui/res/formats/Ravnica Block Constructed, Ravnica_ City of Guilds.txt deleted file mode 100644 index a92a68de018..00000000000 --- a/forge-gui/res/formats/Ravnica Block Constructed, Ravnica_ City of Guilds.txt +++ /dev/null @@ -1,6 +0,0 @@ -[format] -Name:Ravnica Block Constructed, Ravnica: City of Guilds -Type:Historic -Subtype:Block -Order:934 -Sets:RAV diff --git a/forge-gui/res/formats/Extended.txt b/forge-gui/res/formats/Sanctioned/Extended.txt similarity index 90% rename from forge-gui/res/formats/Extended.txt rename to forge-gui/res/formats/Sanctioned/Extended.txt index 410a2af456f..da63a34d9ea 100644 --- a/forge-gui/res/formats/Extended.txt +++ b/forge-gui/res/formats/Sanctioned/Extended.txt @@ -1,7 +1,7 @@ [format] Name:Extended Order:107 -Subtype:Rotating +Subtype:Extended Type:Historic Sets:SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM, M14, THS, BNG, JOU, M15 Banned:Ponder; Mental Misstep diff --git a/forge-gui/res/formats/Legacy.txt b/forge-gui/res/formats/Sanctioned/Legacy.txt similarity index 98% rename from forge-gui/res/formats/Legacy.txt rename to forge-gui/res/formats/Sanctioned/Legacy.txt index 33e2ef931a0..c2856eda962 100644 --- a/forge-gui/res/formats/Legacy.txt +++ b/forge-gui/res/formats/Sanctioned/Legacy.txt @@ -1,6 +1,6 @@ [format] Name:Legacy Order:105 -Subtype:Eternal +Subtype:Legacy Type:Sanctioned Banned:Adriana's Valor; Advantageous Proclamation; Assemble the Rank and Vile; Backup Plan; Brago's Favor; Double Stroke; Echoing Boon; Emissary's Ploy; Hired Heist; Hold the Perimeter; Hymn of the Wilds; Immediate Action; Incendiary Dissent; Iterative Analysis; Muzzio's Preparations; Natural Unity; Power Play; Secret Summoning; Secrets of Paradise; Sentinel Dispatch; Sovereign's Realm; Summoner's Bond; Unexpected Potential; Weight Advantage; Worldknit; Amulet of Quoz; Bronze Tablet; Contract from Below; Darkpact; Demonic Attorney; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends; Ancestral Recall; Balance; Bazaar of Baghdad; Black Lotus; Channel; Chaos Orb; Demonic Consultation; Demonic Tutor; Dig Through Time; Earthcraft; Falling Star; Fastbond; Flash; Frantic Search; Goblin Recruiter; Gush; Hermit Druid; Imperial Seal; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mental Misstep; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Sensei's Divining Top; Shahrazad; Skullclamp; Sol Ring; Strip Mine; Survival of the Fittest; Time Vault; Time Walk; Timetwister; Tinker; Tolarian Academy; Treasure Cruise; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Modern.txt b/forge-gui/res/formats/Sanctioned/Modern.txt similarity index 98% rename from forge-gui/res/formats/Modern.txt rename to forge-gui/res/formats/Sanctioned/Modern.txt index 990f2252502..476872ea201 100644 --- a/forge-gui/res/formats/Modern.txt +++ b/forge-gui/res/formats/Sanctioned/Modern.txt @@ -1,7 +1,7 @@ [format] Name:Modern Order:102 -Subtype:Eternal +Subtype:Modern Type:Sanctioned Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, EVE, SHM, MOR, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM, M14, THS, BNG, JOU, M15, KTK, FRF, DTK, MM2, ORI, BFZ, OGW, SOI, EMN, KLD, AER, AKH, W17, HOU, XLN, RIX Banned:Ancient Den; Birthing Pod; Blazing Shoal; Chrome Mox; Cloudpost; Dark Depths; Deathrite Shaman; Dig Through Time; Dread Return; Eye of Ugin; Gitaxian Probe; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Second Sunrise; Seething Song; Sensei's Divining Top; Skullclamp; Splinter Twin; Stoneforge Mystic; Summer Bloom; Treasure Cruise; Tree of Tales; Umezawa's Jitte; Vault of Whispers diff --git a/forge-gui/res/formats/Vintage.txt b/forge-gui/res/formats/Sanctioned/Vintage.txt similarity index 98% rename from forge-gui/res/formats/Vintage.txt rename to forge-gui/res/formats/Sanctioned/Vintage.txt index 0eae9e70a33..f7dc5c7c4c8 100644 --- a/forge-gui/res/formats/Vintage.txt +++ b/forge-gui/res/formats/Sanctioned/Vintage.txt @@ -1,7 +1,7 @@ [format] Name:Vintage Order:104 -Subtype:Eternal +Subtype:Vintage Type:Sanctioned Banned:Adriana's Valor; Advantageous Proclamation; Assemble the Rank and Vile; Backup Plan; Brago's Favor; Double Stroke; Echoing Boon; Emissary's Ploy; Hired Heist; Hold the Perimeter; Hymn of the Wilds; Immediate Action; Incendiary Dissent; Iterative Analysis; Muzzio's Preparations; Natural Unity; Power Play; Secret Summoning; Secrets of Paradise; Sentinel Dispatch; Sovereign's Realm; Summoner's Bond; Unexpected Potential; Weight Advantage; Worldknit; Amulet of Quoz; Bronze Tablet; Contract from Below; Darkpact; Demonic Attorney; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends; Chaos Orb; Falling Star; Shahrazad Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Chalice of the Void; Channel; Demonic Consultation; Demonic Tutor; Dig Through Time; Fastbond; Flash; Gitaxian Probe; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lodestone Golem; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Merchant Scroll; Mind's Desire; Monastery Mentor; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Ponder; Sol Ring; Strip Mine; Thorn of Amethyst; Time Vault; Time Walk; Timetwister; Tinker; Tolarian Academy; Treasure Cruise; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Will diff --git a/forge-gui/res/formats/standard.txt b/forge-gui/res/formats/Sanctioned/standard.txt similarity index 92% rename from forge-gui/res/formats/standard.txt rename to forge-gui/res/formats/Sanctioned/standard.txt index dd6ad90f6b9..6484a5dcb4b 100644 --- a/forge-gui/res/formats/standard.txt +++ b/forge-gui/res/formats/Sanctioned/standard.txt @@ -1,7 +1,7 @@ [format] Name:Standard Order:101 -Subtype:Custom +Subtype:Standard Type:Sanctioned Sets:KLD, AER, AKH, W17, HOU, XLN, RIX Banned: Attune with Aether; Rogue Refiner; Rampaging Ferocidon; Ramunap Ruins; Smuggler's Copter; Aetherworks Marvel; Felidar Guardian diff --git a/forge-gui/res/formats/Standard, Apocalypse.txt b/forge-gui/res/formats/Standard, Apocalypse.txt deleted file mode 100644 index d4311d50ac8..00000000000 --- a/forge-gui/res/formats/Standard, Apocalypse.txt +++ /dev/null @@ -1,6 +0,0 @@ -[format] -Name:Standard, Apocalypse -Type:Historic -Subtype:Rotating -Order:276 -Sets:7ED, MMQ, NMS, PCY, INV, PLS diff --git a/forge-gui/res/formats/Standard, Exodus.txt b/forge-gui/res/formats/Standard, Exodus.txt deleted file mode 100644 index cb4bf0c4f7d..00000000000 --- a/forge-gui/res/formats/Standard, Exodus.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Standard, Exodus -Type:Historic -Subtype:Rotating -Order:207 -Sets:5ED, MIR, VIS, WTH, TMP, STH, EXO -Banned:Timmerian Fiends diff --git a/forge-gui/res/formats/Standard, Fifth Edition.txt b/forge-gui/res/formats/Standard, Fifth Edition.txt deleted file mode 100644 index 6395a36bb7b..00000000000 --- a/forge-gui/res/formats/Standard, Fifth Edition.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Standard, Fifth Edition -Type:Historic -Subtype:Rotating -Order:187 -Sets:5ED, MIR, ALL, VIS -Banned:Rebirth; Timmerian Fiends diff --git a/forge-gui/res/formats/Standard, Judgment.txt b/forge-gui/res/formats/Standard, Judgment.txt deleted file mode 100644 index c4a567506fc..00000000000 --- a/forge-gui/res/formats/Standard, Judgment.txt +++ /dev/null @@ -1,6 +0,0 @@ -[format] -Name:Standard, Judgment -Type:Historic -Subtype:Rotating -Order:292 -Sets:7ED, INV, PLS, APC, ODY, TOR, JUD diff --git a/forge-gui/res/formats/Standard, Odyssey.txt b/forge-gui/res/formats/Standard, Odyssey.txt deleted file mode 100644 index 577c5c9125d..00000000000 --- a/forge-gui/res/formats/Standard, Odyssey.txt +++ /dev/null @@ -1,6 +0,0 @@ -[format] -Name:Standard, Odyssey -Type:Historic -Subtype:Rotating -Order:280 -Sets:7ED, INV, PLS, APC, ODY diff --git a/forge-gui/res/formats/Standard, Ravnica_City of Guilds.txt b/forge-gui/res/formats/Standard, Ravnica_City of Guilds.txt deleted file mode 100644 index 853f70b8f71..00000000000 --- a/forge-gui/res/formats/Standard, Ravnica_City of Guilds.txt +++ /dev/null @@ -1,6 +0,0 @@ -[format] -Name:Standard, Ravnica:City of Guilds -Type:Historic -Subtype:Rotating -Order:932 -Sets:9ED, CHK, BOK, SOK, RAV diff --git a/forge-gui/res/formats/Standard, Seventh Edition.txt b/forge-gui/res/formats/Standard, Seventh Edition.txt deleted file mode 100644 index f774039b3f5..00000000000 --- a/forge-gui/res/formats/Standard, Seventh Edition.txt +++ /dev/null @@ -1,6 +0,0 @@ -[format] -Name:Standard, Seventh Edition -Type:Historic -Subtype:Rotating -Order:272 -Sets:7ED, MMQ, NMS, PCY, INV, PLS diff --git a/forge-gui/res/formats/Standard, Stronghold.txt b/forge-gui/res/formats/Standard, Stronghold.txt deleted file mode 100644 index 56adae21633..00000000000 --- a/forge-gui/res/formats/Standard, Stronghold.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Standard, Stronghold -Type:Historic -Subtype:Rotating -Order:202 -Sets:5ED, MIR, VIS, WTH, TMP, STH -Banned:Timmerian Fiends diff --git a/forge-gui/res/formats/Standard, Tempest.txt b/forge-gui/res/formats/Standard, Tempest.txt deleted file mode 100644 index 175a5621f31..00000000000 --- a/forge-gui/res/formats/Standard, Tempest.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Standard, Tempest -Type:Historic -Subtype:Rotating -Order:195 -Sets:5ED, MIR, VIS, WTH, TMP -Banned:Timmerian Fiends diff --git a/forge-gui/res/formats/Standard, Torment.txt b/forge-gui/res/formats/Standard, Torment.txt deleted file mode 100644 index 1ba438d21fa..00000000000 --- a/forge-gui/res/formats/Standard, Torment.txt +++ /dev/null @@ -1,6 +0,0 @@ -[format] -Name:Standard, Torment -Type:Historic -Subtype:Rotating -Order:287 -Sets:7ED, INV, PLS, APC, ODY, TOR diff --git a/forge-gui/res/formats/Standard, Alara Reborn.txt b/forge-gui/res/formats/Standard/Standard, Alara Reborn.txt similarity index 77% rename from forge-gui/res/formats/Standard, Alara Reborn.txt rename to forge-gui/res/formats/Standard/Standard, Alara Reborn.txt index ea086a56ac2..96df96b2e3f 100644 --- a/forge-gui/res/formats/Standard, Alara Reborn.txt +++ b/forge-gui/res/formats/Standard/Standard, Alara Reborn.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Alara Reborn Type:Historic -Subtype:Rotating -Order:446 +Subtype:Standard +Order:451 Sets:10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB diff --git a/forge-gui/res/formats/Standard/Standard, Apocalypse.txt b/forge-gui/res/formats/Standard/Standard, Apocalypse.txt new file mode 100644 index 00000000000..7cce21d71ec --- /dev/null +++ b/forge-gui/res/formats/Standard/Standard, Apocalypse.txt @@ -0,0 +1,6 @@ +[format] +Name:Standard, Apocalypse +Type:Historic +Subtype:Standard +Order:281 +Sets:MMQ, NMS, PCY, INV, PLS, 7ED diff --git a/forge-gui/res/formats/Standard, Apr 1999.txt b/forge-gui/res/formats/Standard/Standard, Apr 1999.txt similarity index 88% rename from forge-gui/res/formats/Standard, Apr 1999.txt rename to forge-gui/res/formats/Standard/Standard, Apr 1999.txt index a049f3f7eda..2691c758767 100644 --- a/forge-gui/res/formats/Standard, Apr 1999.txt +++ b/forge-gui/res/formats/Standard/Standard, Apr 1999.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Apr 1999 Type:Historic -Subtype:Rotating -Order:225 +Subtype:Standard +Order:230 Sets:5ED, TMP, STH, EXO, USG, ULG Banned:Dream Halls; Earthcraft; Fluctuator; Lotus Petal; Memory Jar; Recurring Nightmare; Time Spiral; Tolarian Academy; Windfall diff --git a/forge-gui/res/formats/Standard, Avacyn Restored.txt b/forge-gui/res/formats/Standard/Standard, Avacyn Restored.txt similarity index 77% rename from forge-gui/res/formats/Standard, Avacyn Restored.txt rename to forge-gui/res/formats/Standard/Standard, Avacyn Restored.txt index 1e29e8cc34a..4336a954ff3 100644 --- a/forge-gui/res/formats/Standard, Avacyn Restored.txt +++ b/forge-gui/res/formats/Standard/Standard, Avacyn Restored.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Avacyn Restored Type:Historic -Subtype:Rotating -Order:518 +Subtype:Standard +Order:523 Sets:SOM, MBS, NPH, M12, ISD, DKA, AVR diff --git a/forge-gui/res/formats/Standard, Betrayers of Kamigawa.txt b/forge-gui/res/formats/Standard/Standard, Betrayers of Kamigawa.txt similarity index 80% rename from forge-gui/res/formats/Standard, Betrayers of Kamigawa.txt rename to forge-gui/res/formats/Standard/Standard, Betrayers of Kamigawa.txt index fb3f004cb26..f9c058ed9fa 100644 --- a/forge-gui/res/formats/Standard, Betrayers of Kamigawa.txt +++ b/forge-gui/res/formats/Standard/Standard, Betrayers of Kamigawa.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Betrayers of Kamigawa Type:Historic -Subtype:Rotating -Order:350 +Subtype:Standard +Order:355 Sets:8ED, MRD, DST, 5DN, CHK, BOK Banned:Skullclamp diff --git a/forge-gui/res/formats/Standard, Champions of Kamigawa.txt b/forge-gui/res/formats/Standard/Standard, Champions of Kamigawa.txt similarity index 79% rename from forge-gui/res/formats/Standard, Champions of Kamigawa.txt rename to forge-gui/res/formats/Standard/Standard, Champions of Kamigawa.txt index c6ba6bea3dd..7f3cbad31d7 100644 --- a/forge-gui/res/formats/Standard, Champions of Kamigawa.txt +++ b/forge-gui/res/formats/Standard/Standard, Champions of Kamigawa.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Champions of Kamigawa Type:Historic -Subtype:Rotating -Order:344 +Subtype:Standard +Order:349 Sets:8ED, MRD, DST, 5DN, CHK Banned:Skullclamp diff --git a/forge-gui/res/formats/Standard, Coldsnap.txt b/forge-gui/res/formats/Standard/Standard, Coldsnap.txt similarity index 77% rename from forge-gui/res/formats/Standard, Coldsnap.txt rename to forge-gui/res/formats/Standard/Standard, Coldsnap.txt index ce74f1e726a..13afc493625 100644 --- a/forge-gui/res/formats/Standard, Coldsnap.txt +++ b/forge-gui/res/formats/Standard/Standard, Coldsnap.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Coldsnap Type:Historic -Subtype:Rotating -Order:384 +Subtype:Standard +Order:389 Sets:9ED, CHK, BOK, SOK, RAV, GPT, DIS, CSP diff --git a/forge-gui/res/formats/Standard, Conflux.txt b/forge-gui/res/formats/Standard/Standard, Conflux.txt similarity index 75% rename from forge-gui/res/formats/Standard, Conflux.txt rename to forge-gui/res/formats/Standard/Standard, Conflux.txt index c7b4567aaab..775a0581476 100644 --- a/forge-gui/res/formats/Standard, Conflux.txt +++ b/forge-gui/res/formats/Standard/Standard, Conflux.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Conflux Type:Historic -Subtype:Rotating -Order:441 +Subtype:Standard +Order:446 Sets:10E, LRW, MOR, SHM, EVE, ALA, CFX diff --git a/forge-gui/res/formats/Standard, Dark Ascension.txt b/forge-gui/res/formats/Standard/Standard, Dark Ascension.txt similarity index 76% rename from forge-gui/res/formats/Standard, Dark Ascension.txt rename to forge-gui/res/formats/Standard/Standard, Dark Ascension.txt index 91669d39ba6..8a584fdb619 100644 --- a/forge-gui/res/formats/Standard, Dark Ascension.txt +++ b/forge-gui/res/formats/Standard/Standard, Dark Ascension.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Dark Ascension Type:Historic -Subtype:Rotating -Order:511 +Subtype:Standard +Order:516 Sets:SOM, MBS, NPH, M12, ISD, DKA diff --git a/forge-gui/res/formats/Standard, Darksteel.txt b/forge-gui/res/formats/Standard/Standard, Darksteel.txt similarity index 75% rename from forge-gui/res/formats/Standard, Darksteel.txt rename to forge-gui/res/formats/Standard/Standard, Darksteel.txt index d695fd94987..dd9d164c95f 100644 --- a/forge-gui/res/formats/Standard, Darksteel.txt +++ b/forge-gui/res/formats/Standard/Standard, Darksteel.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Darksteel Type:Historic -Subtype:Rotating -Order:329 +Subtype:Standard +Order:334 Sets:8ED, ONS, LGN, SCG, MRD, DST diff --git a/forge-gui/res/formats/Standard, Dissension.txt b/forge-gui/res/formats/Standard/Standard, Dissension.txt similarity index 76% rename from forge-gui/res/formats/Standard, Dissension.txt rename to forge-gui/res/formats/Standard/Standard, Dissension.txt index 5a255be3861..faeb8287491 100644 --- a/forge-gui/res/formats/Standard, Dissension.txt +++ b/forge-gui/res/formats/Standard/Standard, Dissension.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Dissension Type:Historic -Subtype:Rotating -Order:379 +Subtype:Standard +Order:384 Sets:9ED, CHK, BOK, SOK, RAV, GPT, DIS diff --git a/forge-gui/res/formats/Standard, Eighth Edition.txt b/forge-gui/res/formats/Standard/Standard, Eighth Edition.txt similarity index 77% rename from forge-gui/res/formats/Standard, Eighth Edition.txt rename to forge-gui/res/formats/Standard/Standard, Eighth Edition.txt index f87b39b629f..3ff444c5ad4 100644 --- a/forge-gui/res/formats/Standard, Eighth Edition.txt +++ b/forge-gui/res/formats/Standard/Standard, Eighth Edition.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Eighth Edition Type:Historic -Subtype:Rotating -Order:316 +Subtype:Standard +Order:321 Sets:8ED, ODY, TOR, JUD, ONS, LGN, SCG diff --git a/forge-gui/res/formats/Standard, Eventide.txt b/forge-gui/res/formats/Standard/Standard, Eventide.txt similarity index 78% rename from forge-gui/res/formats/Standard, Eventide.txt rename to forge-gui/res/formats/Standard/Standard, Eventide.txt index 91beaf9e98b..86bdafabbb9 100644 --- a/forge-gui/res/formats/Standard, Eventide.txt +++ b/forge-gui/res/formats/Standard/Standard, Eventide.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Eventide Type:Historic -Subtype:Rotating -Order:428 +Subtype:Standard +Order:433 Sets:10E, CSP, TSP, TSB, PLC, FUT, LRW, MOR, SHM, EVE diff --git a/forge-gui/res/formats/Standard/Standard, Exodus.txt b/forge-gui/res/formats/Standard/Standard, Exodus.txt new file mode 100644 index 00000000000..d576a84624a --- /dev/null +++ b/forge-gui/res/formats/Standard/Standard, Exodus.txt @@ -0,0 +1,6 @@ +[format] +Name:Standard, Exodus +Type:Historic +Subtype:Standard +Order:212 +Sets:MIR, VIS, 5ED, WTH, TMP, STH, EXO diff --git a/forge-gui/res/formats/Standard, Fifth Dawn.txt b/forge-gui/res/formats/Standard/Standard, Fifth Dawn.txt similarity index 79% rename from forge-gui/res/formats/Standard, Fifth Dawn.txt rename to forge-gui/res/formats/Standard/Standard, Fifth Dawn.txt index 71b4a002797..a436686f953 100644 --- a/forge-gui/res/formats/Standard, Fifth Dawn.txt +++ b/forge-gui/res/formats/Standard/Standard, Fifth Dawn.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Fifth Dawn Type:Historic -Subtype:Rotating -Order:336 +Subtype:Standard +Order:341 Sets:8ED, ONS, LGN, SCG, MRD, DST, 5DN Banned:Skullclamp diff --git a/forge-gui/res/formats/Standard/Standard, Fifth Edition.txt b/forge-gui/res/formats/Standard/Standard, Fifth Edition.txt new file mode 100644 index 00000000000..43f683f722d --- /dev/null +++ b/forge-gui/res/formats/Standard/Standard, Fifth Edition.txt @@ -0,0 +1,7 @@ +[format] +Name:Standard, Fifth Edition +Type:Historic +Subtype:Standard +Order:192 +Sets:ALL, MIR, VIS, 5ED +Banned:Rebirth diff --git a/forge-gui/res/formats/Standard, Future Sight.txt b/forge-gui/res/formats/Standard/Standard, Future Sight.txt similarity index 78% rename from forge-gui/res/formats/Standard, Future Sight.txt rename to forge-gui/res/formats/Standard/Standard, Future Sight.txt index a8805f7ffa1..dcb0bda87f0 100644 --- a/forge-gui/res/formats/Standard, Future Sight.txt +++ b/forge-gui/res/formats/Standard/Standard, Future Sight.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Future Sight Type:Historic -Subtype:Rotating -Order:399 +Subtype:Standard +Order:404 Sets:9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT diff --git a/forge-gui/res/formats/Standard, Guildpact.txt b/forge-gui/res/formats/Standard/Standard, Guildpact.txt similarity index 75% rename from forge-gui/res/formats/Standard, Guildpact.txt rename to forge-gui/res/formats/Standard/Standard, Guildpact.txt index ea7a94b29c1..6d11fd066f9 100644 --- a/forge-gui/res/formats/Standard, Guildpact.txt +++ b/forge-gui/res/formats/Standard/Standard, Guildpact.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Guildpact Type:Historic -Subtype:Rotating -Order:373 +Subtype:Standard +Order:378 Sets:9ED, CHK, BOK, SOK, RAV, GPT diff --git a/forge-gui/res/formats/Standard, Innistrad.txt b/forge-gui/res/formats/Standard/Standard, Innistrad.txt similarity index 74% rename from forge-gui/res/formats/Standard, Innistrad.txt rename to forge-gui/res/formats/Standard/Standard, Innistrad.txt index 387de26fe9e..07ed32a45cd 100644 --- a/forge-gui/res/formats/Standard, Innistrad.txt +++ b/forge-gui/res/formats/Standard/Standard, Innistrad.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Innistrad Type:Historic -Subtype:Rotating -Order:501 +Subtype:Standard +Order:506 Sets:SOM, MBS, NPH, M12, ISD diff --git a/forge-gui/res/formats/Standard, Invasion.txt b/forge-gui/res/formats/Standard/Standard, Invasion.txt similarity index 73% rename from forge-gui/res/formats/Standard, Invasion.txt rename to forge-gui/res/formats/Standard/Standard, Invasion.txt index 9359059c0c2..b616494b3e6 100644 --- a/forge-gui/res/formats/Standard, Invasion.txt +++ b/forge-gui/res/formats/Standard/Standard, Invasion.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Invasion Type:Historic -Subtype:Rotating -Order:261 +Subtype:Standard +Order:266 Sets:6ED, MMQ, NMS, PCY, INV diff --git a/forge-gui/res/formats/Standard, Jan 1997.txt b/forge-gui/res/formats/Standard/Standard, Jan 1997.txt similarity index 78% rename from forge-gui/res/formats/Standard, Jan 1997.txt rename to forge-gui/res/formats/Standard/Standard, Jan 1997.txt index db06838c048..59b60a830eb 100644 --- a/forge-gui/res/formats/Standard, Jan 1997.txt +++ b/forge-gui/res/formats/Standard/Standard, Jan 1997.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Jan 1997 Type:Historic -Subtype:Rotating -Order:181 -Sets:4ED, CHR, MIR, HML, ALL +Subtype:Standard +Order:186 +Sets:4ED, CHR, HML, ALL, MIR Banned:Balance; Black Vise; Bronze Tablet; Channel; Ivory Tower; Jeweled Bird; Land Tax; Mind Twist; Rebirth; Strip Mine; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Standard, Jan 1999.txt b/forge-gui/res/formats/Standard/Standard, Jan 1999.txt similarity index 80% rename from forge-gui/res/formats/Standard, Jan 1999.txt rename to forge-gui/res/formats/Standard/Standard, Jan 1999.txt index 32d766e27ff..1143e630930 100644 --- a/forge-gui/res/formats/Standard, Jan 1999.txt +++ b/forge-gui/res/formats/Standard/Standard, Jan 1999.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Jan 1999 Type:Historic -Subtype:Rotating -Order:217 +Subtype:Standard +Order:222 Sets:5ED, TMP, STH, EXO, USG Banned:Tolarian Academy; Windfall diff --git a/forge-gui/res/formats/Standard/Standard, Judgment.txt b/forge-gui/res/formats/Standard/Standard, Judgment.txt new file mode 100644 index 00000000000..20376a32376 --- /dev/null +++ b/forge-gui/res/formats/Standard/Standard, Judgment.txt @@ -0,0 +1,6 @@ +[format] +Name:Standard, Judgment +Type:Historic +Subtype:Standard +Order:297 +Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD diff --git a/forge-gui/res/formats/Standard, July 2011.txt b/forge-gui/res/formats/Standard/Standard, July 2011.txt similarity index 53% rename from forge-gui/res/formats/Standard, July 2011.txt rename to forge-gui/res/formats/Standard/Standard, July 2011.txt index b4cbae7e29c..4d5670fd586 100644 --- a/forge-gui/res/formats/Standard, July 2011.txt +++ b/forge-gui/res/formats/Standard/Standard, July 2011.txt @@ -1,7 +1,7 @@ [format] Name:Standard, July 2011 Type:Historic -Subtype:Rotating -Order:494 +Subtype:Standard +Order:499 Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH -Banned:Jace; the Mind Sculptor; Stoneforge Mystic +Banned:Jace, the Mind Sculptor; Stoneforge Mystic diff --git a/forge-gui/res/formats/Standard, Jun 2004.txt b/forge-gui/res/formats/Standard/Standard, Jun 2004.txt similarity index 79% rename from forge-gui/res/formats/Standard, Jun 2004.txt rename to forge-gui/res/formats/Standard/Standard, Jun 2004.txt index 7d6905abfa3..f986fc2ae79 100644 --- a/forge-gui/res/formats/Standard, Jun 2004.txt +++ b/forge-gui/res/formats/Standard/Standard, Jun 2004.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Jun 2004 Type:Historic -Subtype:Rotating -Order:334 +Subtype:Standard +Order:339 Sets:8ED, ONS, LGN, SCG, MRD, DST, 5DN Banned:Skullclamp diff --git a/forge-gui/res/formats/Standard, Legions.txt b/forge-gui/res/formats/Standard/Standard, Legions.txt similarity index 74% rename from forge-gui/res/formats/Standard, Legions.txt rename to forge-gui/res/formats/Standard/Standard, Legions.txt index 5436c0ce246..d00fa871b78 100644 --- a/forge-gui/res/formats/Standard, Legions.txt +++ b/forge-gui/res/formats/Standard/Standard, Legions.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Legions Type:Historic -Subtype:Rotating -Order:302 +Subtype:Standard +Order:307 Sets:7ED, ODY, TOR, JUD, ONS, LGN diff --git a/forge-gui/res/formats/Standard, Lorwyn.txt b/forge-gui/res/formats/Standard/Standard, Lorwyn.txt similarity index 75% rename from forge-gui/res/formats/Standard, Lorwyn.txt rename to forge-gui/res/formats/Standard/Standard, Lorwyn.txt index 9abe136cd6c..ceff8edd08a 100644 --- a/forge-gui/res/formats/Standard, Lorwyn.txt +++ b/forge-gui/res/formats/Standard/Standard, Lorwyn.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Lorwyn Type:Historic -Subtype:Rotating -Order:412 +Subtype:Standard +Order:417 Sets:10E, CSP, TSP, TSB, PLC, FUT, LRW diff --git a/forge-gui/res/formats/Standard, Magic 2010.txt b/forge-gui/res/formats/Standard/Standard, Magic 2010.txt similarity index 77% rename from forge-gui/res/formats/Standard, Magic 2010.txt rename to forge-gui/res/formats/Standard/Standard, Magic 2010.txt index 7b11b606beb..27d5ed0e0c2 100644 --- a/forge-gui/res/formats/Standard, Magic 2010.txt +++ b/forge-gui/res/formats/Standard/Standard, Magic 2010.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Magic 2010 Type:Historic -Subtype:Rotating -Order:452 +Subtype:Standard +Order:457 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10 diff --git a/forge-gui/res/formats/Standard, Magic 2011.txt b/forge-gui/res/formats/Standard/Standard, Magic 2011.txt similarity index 76% rename from forge-gui/res/formats/Standard, Magic 2011.txt rename to forge-gui/res/formats/Standard/Standard, Magic 2011.txt index 9330b6e4ddd..62b37946bd8 100644 --- a/forge-gui/res/formats/Standard, Magic 2011.txt +++ b/forge-gui/res/formats/Standard/Standard, Magic 2011.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Magic 2011 Type:Historic -Subtype:Rotating -Order:474 +Subtype:Standard +Order:479 Sets:ALA, CFX, ARB, ZEN, WWK, ROE, M11 diff --git a/forge-gui/res/formats/Standard, Magic 2012.txt b/forge-gui/res/formats/Standard/Standard, Magic 2012.txt similarity index 53% rename from forge-gui/res/formats/Standard, Magic 2012.txt rename to forge-gui/res/formats/Standard/Standard, Magic 2012.txt index 3ef5dac2a91..3f0fe05c495 100644 --- a/forge-gui/res/formats/Standard, Magic 2012.txt +++ b/forge-gui/res/formats/Standard/Standard, Magic 2012.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Magic 2012 Type:Historic -Subtype:Rotating -Order:495 +Subtype:Standard +Order:500 Sets:ZEN, WWK, ROE, SOM, MBS, NPH, M12 -Banned:Jace; the Mind Sculptor; Stoneforge Mystic +Banned:Jace, the Mind Sculptor; Stoneforge Mystic diff --git a/forge-gui/res/formats/Standard, Magic 2013.txt b/forge-gui/res/formats/Standard/Standard, Magic 2013.txt similarity index 76% rename from forge-gui/res/formats/Standard, Magic 2013.txt rename to forge-gui/res/formats/Standard/Standard, Magic 2013.txt index 4e257b39889..60dfa45991e 100644 --- a/forge-gui/res/formats/Standard, Magic 2013.txt +++ b/forge-gui/res/formats/Standard/Standard, Magic 2013.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Magic 2013 Type:Historic -Subtype:Rotating -Order:524 +Subtype:Standard +Order:529 Sets:SOM, MBS, NPH, ISD, DKA, AVR, M13 diff --git a/forge-gui/res/formats/Standard, Mar 2005.txt b/forge-gui/res/formats/Standard/Standard, Mar 2005.txt similarity index 89% rename from forge-gui/res/formats/Standard, Mar 2005.txt rename to forge-gui/res/formats/Standard/Standard, Mar 2005.txt index 566396ed61d..66c783d9f92 100644 --- a/forge-gui/res/formats/Standard, Mar 2005.txt +++ b/forge-gui/res/formats/Standard/Standard, Mar 2005.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Mar 2005 Type:Historic -Subtype:Rotating -Order:355 +Subtype:Standard +Order:360 Sets:8ED, MRD, DST, 5DN, CHK, BOK Banned:Arcbound Ravager; Ancient Den; Darksteel Citadel; Disciple of the Vault; Great Furnace; Seat of the Synod; Skullclamp; Tree of Tales; Vault of Whispers diff --git a/forge-gui/res/formats/Standard, Mercadian Masques.txt b/forge-gui/res/formats/Standard/Standard, Mercadian Masques.txt similarity index 69% rename from forge-gui/res/formats/Standard, Mercadian Masques.txt rename to forge-gui/res/formats/Standard/Standard, Mercadian Masques.txt index 29c38586519..94abfdb8978 100644 --- a/forge-gui/res/formats/Standard, Mercadian Masques.txt +++ b/forge-gui/res/formats/Standard/Standard, Mercadian Masques.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Mercadian Masques Type:Historic -Subtype:Rotating -Order:243 -Sets:6ED, USG, ULG, UDS, MMQ +Subtype:Standard +Order:248 +Sets:USG, ULG, 6ED, UDS, MMQ Banned:Fluctuator; Memory Jar; Time Spiral; Tolarian Academy; Windfall diff --git a/forge-gui/res/formats/Standard, Mirage.txt b/forge-gui/res/formats/Standard/Standard, Mirage.txt similarity index 91% rename from forge-gui/res/formats/Standard, Mirage.txt rename to forge-gui/res/formats/Standard/Standard, Mirage.txt index 75bfd91ceb5..e3d0b008a90 100644 --- a/forge-gui/res/formats/Standard, Mirage.txt +++ b/forge-gui/res/formats/Standard/Standard, Mirage.txt @@ -1,8 +1,8 @@ [format] Name:Standard, Mirage Type:Historic -Subtype:Rotating -Order:179 +Subtype:Standard +Order:184 Sets:FEM, 4ED, ICE, CHR, HML, ALL, MIR Restricted:Balance; Black Vise; Hymn to Tourach; Ivory Tower; Land Tax; Strip Mine; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Jeweled Bird; Mind Twist; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Standard, Mirrodin Besieged.txt b/forge-gui/res/formats/Standard/Standard, Mirrodin Besieged.txt similarity index 76% rename from forge-gui/res/formats/Standard, Mirrodin Besieged.txt rename to forge-gui/res/formats/Standard/Standard, Mirrodin Besieged.txt index 9b67548c904..1ef40c2165e 100644 --- a/forge-gui/res/formats/Standard, Mirrodin Besieged.txt +++ b/forge-gui/res/formats/Standard/Standard, Mirrodin Besieged.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Mirrodin Besieged Type:Historic -Subtype:Rotating -Order:485 +Subtype:Standard +Order:490 Sets:ZEN, WWK, ROE, M11, SOM, MBS diff --git a/forge-gui/res/formats/Standard, Mirrodin.txt b/forge-gui/res/formats/Standard/Standard, Mirrodin.txt similarity index 73% rename from forge-gui/res/formats/Standard, Mirrodin.txt rename to forge-gui/res/formats/Standard/Standard, Mirrodin.txt index 0195cd98ae1..f9d65d80257 100644 --- a/forge-gui/res/formats/Standard, Mirrodin.txt +++ b/forge-gui/res/formats/Standard/Standard, Mirrodin.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Mirrodin Type:Historic -Subtype:Rotating -Order:321 +Subtype:Standard +Order:326 Sets:8ED, ONS, LGN, SCG, MRD diff --git a/forge-gui/res/formats/Standard, Morningtide.txt b/forge-gui/res/formats/Standard/Standard, Morningtide.txt similarity index 77% rename from forge-gui/res/formats/Standard, Morningtide.txt rename to forge-gui/res/formats/Standard/Standard, Morningtide.txt index 179e344fe36..722101a0c6d 100644 --- a/forge-gui/res/formats/Standard, Morningtide.txt +++ b/forge-gui/res/formats/Standard/Standard, Morningtide.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Morningtide Type:Historic -Subtype:Rotating -Order:417 +Subtype:Standard +Order:422 Sets:10E, CSP, TSP, TSB, PLC, FUT, LRW, MOR diff --git a/forge-gui/res/formats/Standard, Nemesis.txt b/forge-gui/res/formats/Standard/Standard, Nemesis.txt similarity index 65% rename from forge-gui/res/formats/Standard, Nemesis.txt rename to forge-gui/res/formats/Standard/Standard, Nemesis.txt index a4eb82ab865..93a2d400678 100644 --- a/forge-gui/res/formats/Standard, Nemesis.txt +++ b/forge-gui/res/formats/Standard/Standard, Nemesis.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Nemesis Type:Historic -Subtype:Rotating -Order:248 -Sets:6ED, USG, ULG, UDS, MMQ, NMS +Subtype:Standard +Order:253 +Sets:USG, ULG, 6ED, UDS, MMQ, NMS Banned:Fluctuator; Memory Jar; Time Spiral; Tolarian Academy; Windfall diff --git a/forge-gui/res/formats/Standard, New Phyrexia.txt b/forge-gui/res/formats/Standard/Standard, New Phyrexia.txt similarity index 76% rename from forge-gui/res/formats/Standard, New Phyrexia.txt rename to forge-gui/res/formats/Standard/Standard, New Phyrexia.txt index 06788a70a27..740fd82037d 100644 --- a/forge-gui/res/formats/Standard, New Phyrexia.txt +++ b/forge-gui/res/formats/Standard/Standard, New Phyrexia.txt @@ -1,6 +1,6 @@ [format] Name:Standard, New Phyrexia Type:Historic -Subtype:Rotating -Order:490 +Subtype:Standard +Order:495 Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH diff --git a/forge-gui/res/formats/Standard, Ninth Edition.txt b/forge-gui/res/formats/Standard/Standard, Ninth Edition.txt similarity index 90% rename from forge-gui/res/formats/Standard, Ninth Edition.txt rename to forge-gui/res/formats/Standard/Standard, Ninth Edition.txt index b91cb8c0c49..39322ac6118 100644 --- a/forge-gui/res/formats/Standard, Ninth Edition.txt +++ b/forge-gui/res/formats/Standard/Standard, Ninth Edition.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Ninth Edition Type:Historic -Subtype:Rotating -Order:362 +Subtype:Standard +Order:367 Sets:9ED, MRD, DST, 5DN, CHK, BOK, SOK Banned:Arcbound Ravager; Ancient Den; Darksteel Citadel; Disciple of the Vault; Great Furnace; Seat of the Synod; Skullclamp; Tree of Tales; Vault of Whispers diff --git a/forge-gui/res/formats/Standard, Oct 1996.txt b/forge-gui/res/formats/Standard/Standard, Oct 1996.txt similarity index 91% rename from forge-gui/res/formats/Standard, Oct 1996.txt rename to forge-gui/res/formats/Standard/Standard, Oct 1996.txt index 7a1b2b398a4..4cad4787526 100644 --- a/forge-gui/res/formats/Standard, Oct 1996.txt +++ b/forge-gui/res/formats/Standard/Standard, Oct 1996.txt @@ -1,8 +1,8 @@ [format] Name:Standard, Oct 1996 Type:Historic -Subtype:Rotating -Order:174 +Subtype:Standard +Order:179 Sets:FEM, 4ED, ICE, CHR, HML, ALL Restricted:Balance; Black Vise; Hymn to Tourach; Ivory Tower; Land Tax; Strip Mine; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Jeweled Bird; Mind Twist; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Standard/Standard, Odyssey.txt b/forge-gui/res/formats/Standard/Standard, Odyssey.txt new file mode 100644 index 00000000000..031ad553d72 --- /dev/null +++ b/forge-gui/res/formats/Standard/Standard, Odyssey.txt @@ -0,0 +1,6 @@ +[format] +Name:Standard, Odyssey +Type:Historic +Subtype:Standard +Order:285 +Sets:INV, PLS, 7ED, APC, ODY diff --git a/forge-gui/res/formats/Standard, Onslaught.txt b/forge-gui/res/formats/Standard/Standard, Onslaught.txt similarity index 74% rename from forge-gui/res/formats/Standard, Onslaught.txt rename to forge-gui/res/formats/Standard/Standard, Onslaught.txt index 13c611f269c..3d8dc7525da 100644 --- a/forge-gui/res/formats/Standard, Onslaught.txt +++ b/forge-gui/res/formats/Standard/Standard, Onslaught.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Onslaught Type:Historic -Subtype:Rotating -Order:297 +Subtype:Standard +Order:302 Sets:7ED, ODY, TOR, JUD, ONS diff --git a/forge-gui/res/formats/Standard, Planar Chaos.txt b/forge-gui/res/formats/Standard/Standard, Planar Chaos.txt similarity index 77% rename from forge-gui/res/formats/Standard, Planar Chaos.txt rename to forge-gui/res/formats/Standard/Standard, Planar Chaos.txt index 35d4d7c1a8f..6bb611d2f5c 100644 --- a/forge-gui/res/formats/Standard, Planar Chaos.txt +++ b/forge-gui/res/formats/Standard/Standard, Planar Chaos.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Planar Chaos Type:Historic -Subtype:Rotating -Order:394 +Subtype:Standard +Order:399 Sets:9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC diff --git a/forge-gui/res/formats/Standard, Planeshift.txt b/forge-gui/res/formats/Standard/Standard, Planeshift.txt similarity index 75% rename from forge-gui/res/formats/Standard, Planeshift.txt rename to forge-gui/res/formats/Standard/Standard, Planeshift.txt index 93bd8c00beb..60fe1ad6046 100644 --- a/forge-gui/res/formats/Standard, Planeshift.txt +++ b/forge-gui/res/formats/Standard/Standard, Planeshift.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Planeshift Type:Historic -Subtype:Rotating -Order:266 +Subtype:Standard +Order:271 Sets:6ED, MMQ, NMS, PCY, INV, PLS diff --git a/forge-gui/res/formats/Standard, Prophecy.txt b/forge-gui/res/formats/Standard/Standard, Prophecy.txt similarity index 64% rename from forge-gui/res/formats/Standard, Prophecy.txt rename to forge-gui/res/formats/Standard/Standard, Prophecy.txt index 65974e38c04..b2dd2232943 100644 --- a/forge-gui/res/formats/Standard, Prophecy.txt +++ b/forge-gui/res/formats/Standard/Standard, Prophecy.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Prophecy Type:Historic -Subtype:Rotating -Order:254 -Sets:6ED, USG, ULG, UDS, MMQ, NMS, PCY +Subtype:Standard +Order:259 +Sets:USG, ULG, 6ED, UDS, MMQ, NMS, PCY Banned:Fluctuator; Memory Jar; Time Spiral; Tolarian Academy; Windfall diff --git a/forge-gui/res/formats/Standard/Standard, RavnicaCity of Guilds.txt b/forge-gui/res/formats/Standard/Standard, RavnicaCity of Guilds.txt new file mode 100644 index 00000000000..9cdf1f38d20 --- /dev/null +++ b/forge-gui/res/formats/Standard/Standard, RavnicaCity of Guilds.txt @@ -0,0 +1,6 @@ +[format] +Name:Standard, RavnicaCity of Guilds +Type:Historic +Subtype:Standard +Order:373 +Sets:9ED, CHK, BOK, SOK, RAV diff --git a/forge-gui/res/formats/Standard, Rise of the Eldrazi.txt b/forge-gui/res/formats/Standard/Standard, Rise of the Eldrazi.txt similarity index 78% rename from forge-gui/res/formats/Standard, Rise of the Eldrazi.txt rename to forge-gui/res/formats/Standard/Standard, Rise of the Eldrazi.txt index b1bc3277e9b..8ace31334f5 100644 --- a/forge-gui/res/formats/Standard, Rise of the Eldrazi.txt +++ b/forge-gui/res/formats/Standard/Standard, Rise of the Eldrazi.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Rise of the Eldrazi Type:Historic -Subtype:Rotating -Order:468 +Subtype:Standard +Order:473 Sets:ALA, CFX, ARB, M10, ZEN, WWK, ROE diff --git a/forge-gui/res/formats/Standard, Saviors of Kamigawa.txt b/forge-gui/res/formats/Standard/Standard, Saviors of Kamigawa.txt similarity index 90% rename from forge-gui/res/formats/Standard, Saviors of Kamigawa.txt rename to forge-gui/res/formats/Standard/Standard, Saviors of Kamigawa.txt index 61eebacb338..b7ed2caccd4 100644 --- a/forge-gui/res/formats/Standard, Saviors of Kamigawa.txt +++ b/forge-gui/res/formats/Standard/Standard, Saviors of Kamigawa.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Saviors of Kamigawa Type:Historic -Subtype:Rotating -Order:357 +Subtype:Standard +Order:362 Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK Banned:Arcbound Ravager; Ancient Den; Darksteel Citadel; Disciple of the Vault; Great Furnace; Seat of the Synod; Skullclamp; Tree of Tales; Vault of Whispers diff --git a/forge-gui/res/formats/Standard, Scars of Mirrodin.txt b/forge-gui/res/formats/Standard/Standard, Scars of Mirrodin.txt similarity index 75% rename from forge-gui/res/formats/Standard, Scars of Mirrodin.txt rename to forge-gui/res/formats/Standard/Standard, Scars of Mirrodin.txt index 2a5f2e3a708..7951f597c44 100644 --- a/forge-gui/res/formats/Standard, Scars of Mirrodin.txt +++ b/forge-gui/res/formats/Standard/Standard, Scars of Mirrodin.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Scars of Mirrodin Type:Historic -Subtype:Rotating -Order:479 +Subtype:Standard +Order:484 Sets:ZEN, WWK, ROE, M11, SOM diff --git a/forge-gui/res/formats/Standard, Scourge.txt b/forge-gui/res/formats/Standard/Standard, Scourge.txt similarity index 75% rename from forge-gui/res/formats/Standard, Scourge.txt rename to forge-gui/res/formats/Standard/Standard, Scourge.txt index c5466ecd10c..99fc0e98ba7 100644 --- a/forge-gui/res/formats/Standard, Scourge.txt +++ b/forge-gui/res/formats/Standard/Standard, Scourge.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Scourge Type:Historic -Subtype:Rotating -Order:309 +Subtype:Standard +Order:314 Sets:7ED, ODY, TOR, JUD, ONS, LGN, SCG diff --git a/forge-gui/res/formats/Standard/Standard, Seventh Edition.txt b/forge-gui/res/formats/Standard/Standard, Seventh Edition.txt new file mode 100644 index 00000000000..a56f00fe275 --- /dev/null +++ b/forge-gui/res/formats/Standard/Standard, Seventh Edition.txt @@ -0,0 +1,6 @@ +[format] +Name:Standard, Seventh Edition +Type:Historic +Subtype:Standard +Order:277 +Sets:MMQ, NMS, PCY, INV, PLS, 7ED diff --git a/forge-gui/res/formats/Standard, Shadowmoor.txt b/forge-gui/res/formats/Standard/Standard, Shadowmoor.txt similarity index 78% rename from forge-gui/res/formats/Standard, Shadowmoor.txt rename to forge-gui/res/formats/Standard/Standard, Shadowmoor.txt index 4163398408e..a8ba1a22d66 100644 --- a/forge-gui/res/formats/Standard, Shadowmoor.txt +++ b/forge-gui/res/formats/Standard/Standard, Shadowmoor.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Shadowmoor Type:Historic -Subtype:Rotating -Order:422 +Subtype:Standard +Order:427 Sets:10E, CSP, TSP, TSB, PLC, FUT, LRW, MOR, SHM diff --git a/forge-gui/res/formats/Standard, Shards of Alara.txt b/forge-gui/res/formats/Standard/Standard, Shards of Alara.txt similarity index 76% rename from forge-gui/res/formats/Standard, Shards of Alara.txt rename to forge-gui/res/formats/Standard/Standard, Shards of Alara.txt index 5a31ebe669e..eab500a4bad 100644 --- a/forge-gui/res/formats/Standard, Shards of Alara.txt +++ b/forge-gui/res/formats/Standard/Standard, Shards of Alara.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Shards of Alara Type:Historic -Subtype:Rotating -Order:436 +Subtype:Standard +Order:441 Sets:10E, LRW, MOR, SHM, EVE, ALA diff --git a/forge-gui/res/formats/Standard/Standard, Stronghold.txt b/forge-gui/res/formats/Standard/Standard, Stronghold.txt new file mode 100644 index 00000000000..ae505331420 --- /dev/null +++ b/forge-gui/res/formats/Standard/Standard, Stronghold.txt @@ -0,0 +1,6 @@ +[format] +Name:Standard, Stronghold +Type:Historic +Subtype:Standard +Order:207 +Sets:MIR, VIS, 5ED, WTH, TMP, STH diff --git a/forge-gui/res/formats/Standard/Standard, Tempest.txt b/forge-gui/res/formats/Standard/Standard, Tempest.txt new file mode 100644 index 00000000000..150530002cf --- /dev/null +++ b/forge-gui/res/formats/Standard/Standard, Tempest.txt @@ -0,0 +1,6 @@ +[format] +Name:Standard, Tempest +Type:Historic +Subtype:Standard +Order:200 +Sets:MIR, VIS, 5ED, WTH, TMP diff --git a/forge-gui/res/formats/Standard, Tenth Edition.txt b/forge-gui/res/formats/Standard/Standard, Tenth Edition.txt similarity index 78% rename from forge-gui/res/formats/Standard, Tenth Edition.txt rename to forge-gui/res/formats/Standard/Standard, Tenth Edition.txt index ea08e0edbcc..7048cf27291 100644 --- a/forge-gui/res/formats/Standard, Tenth Edition.txt +++ b/forge-gui/res/formats/Standard/Standard, Tenth Edition.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Tenth Edition Type:Historic -Subtype:Rotating -Order:406 +Subtype:Standard +Order:411 Sets:10E, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT diff --git a/forge-gui/res/formats/Standard, Time Spiral.txt b/forge-gui/res/formats/Standard/Standard, Time Spiral.txt similarity index 76% rename from forge-gui/res/formats/Standard, Time Spiral.txt rename to forge-gui/res/formats/Standard/Standard, Time Spiral.txt index c2ae5bad9cc..fc914632c6c 100644 --- a/forge-gui/res/formats/Standard, Time Spiral.txt +++ b/forge-gui/res/formats/Standard/Standard, Time Spiral.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Time Spiral Type:Historic -Subtype:Rotating -Order:389 +Subtype:Standard +Order:394 Sets:9ED, RAV, GPT, DIS, CSP, TSP, TSB diff --git a/forge-gui/res/formats/Standard/Standard, Torment.txt b/forge-gui/res/formats/Standard/Standard, Torment.txt new file mode 100644 index 00000000000..f1e1d24eacf --- /dev/null +++ b/forge-gui/res/formats/Standard/Standard, Torment.txt @@ -0,0 +1,6 @@ +[format] +Name:Standard, Torment +Type:Historic +Subtype:Standard +Order:292 +Sets:INV, PLS, 7ED, APC, ODY, TOR diff --git a/forge-gui/res/formats/Standard, Urza's Destiny.txt b/forge-gui/res/formats/Standard/Standard, Urza's Destiny.txt similarity index 75% rename from forge-gui/res/formats/Standard, Urza's Destiny.txt rename to forge-gui/res/formats/Standard/Standard, Urza's Destiny.txt index 62c08c4e96a..6448926f9e2 100644 --- a/forge-gui/res/formats/Standard, Urza's Destiny.txt +++ b/forge-gui/res/formats/Standard/Standard, Urza's Destiny.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Urza's Destiny Type:Historic -Subtype:Rotating -Order:234 -Sets:6ED, TMP, STH, EXO, USG, ULG, UDS +Subtype:Standard +Order:239 +Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS Banned:Dream Halls; Earthcraft; Fluctuator; Lotus Petal; Memory Jar; Mind Over Matter; Recurring Nightmare; Time Spiral; Tolarian Academy; Windfall diff --git a/forge-gui/res/formats/Standard, Urza's Saga.txt b/forge-gui/res/formats/Standard/Standard, Urza's Saga.txt similarity index 60% rename from forge-gui/res/formats/Standard, Urza's Saga.txt rename to forge-gui/res/formats/Standard/Standard, Urza's Saga.txt index f9921117d53..4b227f5f61b 100644 --- a/forge-gui/res/formats/Standard, Urza's Saga.txt +++ b/forge-gui/res/formats/Standard/Standard, Urza's Saga.txt @@ -1,7 +1,6 @@ [format] Name:Standard, Urza's Saga Type:Historic -Subtype:Rotating -Order:212 +Subtype:Standard +Order:217 Sets:5ED, TMP, STH, EXO, USG -Banned:Timmerian Fiends diff --git a/forge-gui/res/formats/Standard, Visions.txt b/forge-gui/res/formats/Standard/Standard, Visions.txt similarity index 67% rename from forge-gui/res/formats/Standard, Visions.txt rename to forge-gui/res/formats/Standard/Standard, Visions.txt index cc5d7c5549a..8c913a64d07 100644 --- a/forge-gui/res/formats/Standard, Visions.txt +++ b/forge-gui/res/formats/Standard/Standard, Visions.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Visions Type:Historic -Subtype:Rotating -Order:184 -Sets:4ED, CHR, MIR, ALL, VIS -Banned:Balance; Black Vise; Bronze Tablet; Channel; Ivory Tower; Jeweled Bird; Land Tax; Mind Twist; Rebirth; Strip Mine; Tempest Efreet; Timmerian Fiends +Subtype:Standard +Order:189 +Sets:4ED, CHR, ALL, MIR, VIS +Banned:Balance; Black Vise; Bronze Tablet; Channel; Ivory Tower; Jeweled Bird; Land Tax; Mind Twist; Rebirth; Strip Mine; Tempest Efreet diff --git a/forge-gui/res/formats/Standard, Weatherlight.txt b/forge-gui/res/formats/Standard/Standard, Weatherlight.txt similarity index 60% rename from forge-gui/res/formats/Standard, Weatherlight.txt rename to forge-gui/res/formats/Standard/Standard, Weatherlight.txt index 950ae81eadf..c49f9255d1f 100644 --- a/forge-gui/res/formats/Standard, Weatherlight.txt +++ b/forge-gui/res/formats/Standard/Standard, Weatherlight.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Weatherlight Type:Historic -Subtype:Rotating -Order:189 -Sets:5ED, ICE, HML, ALL, MIR, VIS, WTH +Subtype:Standard +Order:194 +Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH Banned:Amulet of Quoz; Timmerian Fiends; Zuran Orb diff --git a/forge-gui/res/formats/Standard, Worldwake.txt b/forge-gui/res/formats/Standard/Standard, Worldwake.txt similarity index 75% rename from forge-gui/res/formats/Standard, Worldwake.txt rename to forge-gui/res/formats/Standard/Standard, Worldwake.txt index bb76637cc85..016ae192771 100644 --- a/forge-gui/res/formats/Standard, Worldwake.txt +++ b/forge-gui/res/formats/Standard/Standard, Worldwake.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Worldwake Type:Historic -Subtype:Rotating -Order:463 +Subtype:Standard +Order:468 Sets:ALA, CFX, ARB, M10, ZEN, WWK diff --git a/forge-gui/res/formats/Standard, Zendikar.txt b/forge-gui/res/formats/Standard/Standard, Zendikar.txt similarity index 73% rename from forge-gui/res/formats/Standard, Zendikar.txt rename to forge-gui/res/formats/Standard/Standard, Zendikar.txt index 56c04d79ea5..a262978714f 100644 --- a/forge-gui/res/formats/Standard, Zendikar.txt +++ b/forge-gui/res/formats/Standard/Standard, Zendikar.txt @@ -1,6 +1,6 @@ [format] Name:Standard, Zendikar Type:Historic -Subtype:Rotating -Order:458 +Subtype:Standard +Order:463 Sets:ALA, CFX, ARB, M10, ZEN diff --git a/forge-gui/res/formats/Type 2, Chronicles.txt b/forge-gui/res/formats/Standard/Type 2, Chronicles.txt similarity index 81% rename from forge-gui/res/formats/Type 2, Chronicles.txt rename to forge-gui/res/formats/Standard/Type 2, Chronicles.txt index 45445bdb3ef..2d4dee4576e 100644 --- a/forge-gui/res/formats/Type 2, Chronicles.txt +++ b/forge-gui/res/formats/Standard/Type 2, Chronicles.txt @@ -1,7 +1,7 @@ [format] Name:Type 2, Chronicles Type:Historic -Subtype:Eternal -Order:157 +Subtype:Standard +Order:162 Sets:FEM, 4ED, ICE Restricted:Balance; Channel; Ivory Tower; Mind Twist diff --git a/forge-gui/res/formats/Type 2, Fourth Edition.txt b/forge-gui/res/formats/Standard/Type 2, Fourth Edition.txt similarity index 82% rename from forge-gui/res/formats/Type 2, Fourth Edition.txt rename to forge-gui/res/formats/Standard/Type 2, Fourth Edition.txt index bdc4ae31bd2..a8fbd36205d 100644 --- a/forge-gui/res/formats/Type 2, Fourth Edition.txt +++ b/forge-gui/res/formats/Standard/Type 2, Fourth Edition.txt @@ -1,7 +1,7 @@ [format] Name:Type 2, Fourth Edition Type:Historic -Subtype:Eternal -Order:153 +Subtype:Standard +Order:158 Sets:DRK, FEM, 4ED Restricted:Balance; Channel; Ivory Tower; Mind Twist diff --git a/forge-gui/res/formats/Type 2, Ice Age.txt b/forge-gui/res/formats/Standard/Type 2, Ice Age.txt similarity index 81% rename from forge-gui/res/formats/Type 2, Ice Age.txt rename to forge-gui/res/formats/Standard/Type 2, Ice Age.txt index 4af24cca7a2..b05a6637d18 100644 --- a/forge-gui/res/formats/Type 2, Ice Age.txt +++ b/forge-gui/res/formats/Standard/Type 2, Ice Age.txt @@ -1,7 +1,7 @@ [format] Name:Type 2, Ice Age Type:Historic -Subtype:Eternal -Order:155 +Subtype:Standard +Order:160 Sets:FEM, 4ED, ICE Restricted:Balance; Channel; Ivory Tower; Mind Twist diff --git a/forge-gui/res/formats/Type 1.5, Oct 1999.txt b/forge-gui/res/formats/Type 1.5, Oct 1999.txt deleted file mode 100644 index 72c53647a29..00000000000 --- a/forge-gui/res/formats/Type 1.5, Oct 1999.txt +++ /dev/null @@ -1,7 +0,0 @@ -[format] -Name:Type 1.5, Oct 1999 -Type:Historic -Subtype:Rotating -Order:242 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS -Banned:Amulet of Quoz; ; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Rebirth; Regrowth; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Classic Restricted, Apr 1999.txt b/forge-gui/res/formats/Vintage/Classic Restricted, Apr 1999.txt similarity index 71% rename from forge-gui/res/formats/Classic Restricted, Apr 1999.txt rename to forge-gui/res/formats/Vintage/Classic Restricted, Apr 1999.txt index ef05d1494dd..eeb19b8c675 100644 --- a/forge-gui/res/formats/Classic Restricted, Apr 1999.txt +++ b/forge-gui/res/formats/Vintage/Classic Restricted, Apr 1999.txt @@ -1,7 +1,7 @@ [format] Name:Classic Restricted, Apr 1999 Type:Historic -Subtype:Eternal -Order:228 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG +Subtype:Vintage +Order:233 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Fork; Ivory Tower; Jeweled Bird; Memory Jar; Mind Twist; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tolarian Academy; Wheel of Fortune; Windfall; Zuran Orb diff --git a/forge-gui/res/formats/Classic Restricted, Classic Sixth Edition.txt b/forge-gui/res/formats/Vintage/Classic Restricted, Classic Sixth Edition.txt similarity index 71% rename from forge-gui/res/formats/Classic Restricted, Classic Sixth Edition.txt rename to forge-gui/res/formats/Vintage/Classic Restricted, Classic Sixth Edition.txt index f68aea57826..b24321037e4 100644 --- a/forge-gui/res/formats/Classic Restricted, Classic Sixth Edition.txt +++ b/forge-gui/res/formats/Vintage/Classic Restricted, Classic Sixth Edition.txt @@ -1,7 +1,7 @@ [format] Name:Classic Restricted, Classic Sixth Edition Type:Historic -Subtype:Eternal -Order:232 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED +Subtype:Vintage +Order:237 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Fork; Ivory Tower; Jeweled Bird; Memory Jar; Mind Twist; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tolarian Academy; Wheel of Fortune; Windfall; Zuran Orb diff --git a/forge-gui/res/formats/Classic Restricted, Exodus.txt b/forge-gui/res/formats/Vintage/Classic Restricted, Exodus.txt similarity index 71% rename from forge-gui/res/formats/Classic Restricted, Exodus.txt rename to forge-gui/res/formats/Vintage/Classic Restricted, Exodus.txt index 07032c62c98..1ac9cd52907 100644 --- a/forge-gui/res/formats/Classic Restricted, Exodus.txt +++ b/forge-gui/res/formats/Vintage/Classic Restricted, Exodus.txt @@ -1,7 +1,7 @@ [format] Name:Classic Restricted, Exodus Type:Historic -Subtype:Eternal -Order:208 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO +Subtype:Vintage +Order:213 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Copy Artifact; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Feldon's Cane; Fork; Ivory Tower; Jeweled Bird; Maze of Ith; Mind Twist; Rebirth; Regrowth; Sol Ring; Strip Mine; Tempest Efreet; Timmerian Fiends; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Classic Restricted, Fifth Edition.txt b/forge-gui/res/formats/Vintage/Classic Restricted, Fifth Edition.txt similarity index 96% rename from forge-gui/res/formats/Classic Restricted, Fifth Edition.txt rename to forge-gui/res/formats/Vintage/Classic Restricted, Fifth Edition.txt index 2906cae288e..d160a16dd42 100644 --- a/forge-gui/res/formats/Classic Restricted, Fifth Edition.txt +++ b/forge-gui/res/formats/Vintage/Classic Restricted, Fifth Edition.txt @@ -1,7 +1,7 @@ [format] Name:Classic Restricted, Fifth Edition Type:Historic -Subtype:Eternal -Order:186 +Subtype:Vintage +Order:191 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED Banned:Amulet of Quoz; Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Bronze Tablet; Candelabra of Tawnos; Channel; Chaos Orb; Contract from Below; Copy Artifact; Darkpact; Demonic Attorney; Demonic Tutor; Divine Intervention; Falling Star; Fastbond; Feldon's Cane; Fork; Ivory Tower; Jeweled Bird; Land Tax; Library of Alexandria; Maze of Ith; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Rebirth; Recall; Regrowth; Shahrazad; Sol Ring; Strip Mine; Tempest Efreet; Timetwister; Time Walk; Timmerian Fiends; Underworld Dreams; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Classic Restricted, Jan 1997.txt b/forge-gui/res/formats/Vintage/Classic Restricted, Jan 1997.txt similarity index 96% rename from forge-gui/res/formats/Classic Restricted, Jan 1997.txt rename to forge-gui/res/formats/Vintage/Classic Restricted, Jan 1997.txt index 5afc6b5b954..07ad90c7d99 100644 --- a/forge-gui/res/formats/Classic Restricted, Jan 1997.txt +++ b/forge-gui/res/formats/Vintage/Classic Restricted, Jan 1997.txt @@ -1,7 +1,7 @@ [format] Name:Classic Restricted, Jan 1997 Type:Historic -Subtype:Eternal -Order:180 +Subtype:Vintage +Order:185 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR Banned:Amulet of Quoz; Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Bronze Tablet; Candelabra of Tawnos; Channel; Chaos Orb; Contract from Below; Copy Artifact; Darkpact; Demonic Attorney; Demonic Tutor; Divine Intervention; Falling Star; Fastbond; Feldon's Cane; Fork; Ivory Tower; Jeweled Bird; Land Tax; Library of Alexandria; Maze of Ith; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Rebirth; Recall; Regrowth; Shahrazad; Sol Ring; Strip Mine; Tempest Efreet; Timetwister; Time Walk; Timmerian Fiends; Underworld Dreams; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Classic Restricted, Jan 1999.txt b/forge-gui/res/formats/Vintage/Classic Restricted, Jan 1999.txt similarity index 72% rename from forge-gui/res/formats/Classic Restricted, Jan 1999.txt rename to forge-gui/res/formats/Vintage/Classic Restricted, Jan 1999.txt index 06097315ac1..92adc4d1866 100644 --- a/forge-gui/res/formats/Classic Restricted, Jan 1999.txt +++ b/forge-gui/res/formats/Vintage/Classic Restricted, Jan 1999.txt @@ -1,7 +1,7 @@ [format] Name:Classic Restricted, Jan 1999 Type:Historic -Subtype:Eternal -Order:218 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG +Subtype:Vintage +Order:223 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Copy Artifact; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Fork; Ivory Tower; Jeweled Bird; Maze of Ith; Mind Twist; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Timmerian Fiends; Tolarian Academy; Wheel of Fortune; Windfall; Zuran Orb diff --git a/forge-gui/res/formats/Classic Restricted, Mirage.txt b/forge-gui/res/formats/Vintage/Classic Restricted, Mirage.txt similarity index 96% rename from forge-gui/res/formats/Classic Restricted, Mirage.txt rename to forge-gui/res/formats/Vintage/Classic Restricted, Mirage.txt index 9f0655759c8..e90cab86e06 100644 --- a/forge-gui/res/formats/Classic Restricted, Mirage.txt +++ b/forge-gui/res/formats/Vintage/Classic Restricted, Mirage.txt @@ -1,7 +1,7 @@ [format] Name:Classic Restricted, Mirage Type:Historic -Subtype:Eternal -Order:178 +Subtype:Vintage +Order:183 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR Banned:Amulet of Quoz; Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Bronze Tablet; Candelabra of Tawnos; Channel; Chaos Orb; Contract from Below; Copy Artifact; Darkpact; Demonic Attorney; Demonic Tutor; Divine Intervention; Falling Star; Fastbond; Feldon's Cane; Fork; Hymn to Tourach; Ivory Tower; Jeweled Bird; Land Tax; Library of Alexandria; Maze of Ith; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Rebirth; Recall; Regrowth; Shahrazad; Sol Ring; Strip Mine; Tempest Efreet; Timetwister; Time Walk; Timmerian Fiends; Underworld Dreams; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Classic Restricted, Oct 1996.txt b/forge-gui/res/formats/Vintage/Classic Restricted, Oct 1996.txt similarity index 96% rename from forge-gui/res/formats/Classic Restricted, Oct 1996.txt rename to forge-gui/res/formats/Vintage/Classic Restricted, Oct 1996.txt index aa2952b175f..51d0d7ab1a1 100644 --- a/forge-gui/res/formats/Classic Restricted, Oct 1996.txt +++ b/forge-gui/res/formats/Vintage/Classic Restricted, Oct 1996.txt @@ -1,7 +1,7 @@ [format] Name:Classic Restricted, Oct 1996 Type:Historic -Subtype:Eternal -Order:173 +Subtype:Vintage +Order:178 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL Banned:Amulet of Quoz; Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Bronze Tablet; Candelabra of Tawnos; Channel; Chaos Orb; Contract from Below; Copy Artifact; Darkpact; Demonic Attorney; Demonic Tutor; Divine Intervention; Falling Star; Fastbond; Feldon's Cane; Fork; Hymn to Tourach; Ivory Tower; Jeweled Bird; Land Tax; Library of Alexandria; Maze of Ith; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Rebirth; Recall; Regrowth; Shahrazad; Sol Ring; Strip Mine; Tempest Efreet; Timetwister; Time Walk; Timmerian Fiends; Underworld Dreams; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Classic Restricted, Stronghold.txt b/forge-gui/res/formats/Vintage/Classic Restricted, Stronghold.txt similarity index 72% rename from forge-gui/res/formats/Classic Restricted, Stronghold.txt rename to forge-gui/res/formats/Vintage/Classic Restricted, Stronghold.txt index 469d37ad83d..aa6d85058c5 100644 --- a/forge-gui/res/formats/Classic Restricted, Stronghold.txt +++ b/forge-gui/res/formats/Vintage/Classic Restricted, Stronghold.txt @@ -1,7 +1,7 @@ [format] Name:Classic Restricted, Stronghold Type:Historic -Subtype:Eternal -Order:203 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH +Subtype:Vintage +Order:208 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Copy Artifact; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Feldon's Cane; Fork; Ivory Tower; Jeweled Bird; Maze of Ith; Mind Twist; Rebirth; Regrowth; Sol Ring; Strip Mine; Tempest Efreet; Timmerian Fiends; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Classic Restricted, Tempest.txt b/forge-gui/res/formats/Vintage/Classic Restricted, Tempest.txt similarity index 72% rename from forge-gui/res/formats/Classic Restricted, Tempest.txt rename to forge-gui/res/formats/Vintage/Classic Restricted, Tempest.txt index b1219d81af2..dd6646d9871 100644 --- a/forge-gui/res/formats/Classic Restricted, Tempest.txt +++ b/forge-gui/res/formats/Vintage/Classic Restricted, Tempest.txt @@ -1,7 +1,7 @@ [format] Name:Classic Restricted, Tempest Type:Historic -Subtype:Eternal -Order:196 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP +Subtype:Vintage +Order:201 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Copy Artifact; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Feldon's Cane; Fork; Ivory Tower; Jeweled Bird; Maze of Ith; Mind Twist; Rebirth; Regrowth; Sol Ring; Strip Mine; Tempest Efreet; Timmerian Fiends; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Classic Restricted, Urza's Destiny.txt b/forge-gui/res/formats/Vintage/Classic Restricted, Urza's Destiny.txt similarity index 70% rename from forge-gui/res/formats/Classic Restricted, Urza's Destiny.txt rename to forge-gui/res/formats/Vintage/Classic Restricted, Urza's Destiny.txt index 16def7c467e..ba0816c4f39 100644 --- a/forge-gui/res/formats/Classic Restricted, Urza's Destiny.txt +++ b/forge-gui/res/formats/Vintage/Classic Restricted, Urza's Destiny.txt @@ -1,7 +1,7 @@ [format] Name:Classic Restricted, Urza's Destiny Type:Historic -Subtype:Eternal -Order:237 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS +Subtype:Vintage +Order:242 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Fork; Ivory Tower; Jeweled Bird; Memory Jar; Mind Twist; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tolarian Academy; Wheel of Fortune; Windfall; Zuran Orb diff --git a/forge-gui/res/formats/Classic Restricted, Urza's Legacy.txt b/forge-gui/res/formats/Vintage/Classic Restricted, Urza's Legacy.txt similarity index 71% rename from forge-gui/res/formats/Classic Restricted, Urza's Legacy.txt rename to forge-gui/res/formats/Vintage/Classic Restricted, Urza's Legacy.txt index 97cc6337bbd..ec994fa1622 100644 --- a/forge-gui/res/formats/Classic Restricted, Urza's Legacy.txt +++ b/forge-gui/res/formats/Vintage/Classic Restricted, Urza's Legacy.txt @@ -1,7 +1,7 @@ [format] Name:Classic Restricted, Urza's Legacy Type:Historic -Subtype:Eternal -Order:223 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG +Subtype:Vintage +Order:228 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Copy Artifact; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Fork; Ivory Tower; Jeweled Bird; Maze of Ith; Mind Twist; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Timmerian Fiends; Tolarian Academy; Wheel of Fortune; Windfall; Zuran Orb diff --git a/forge-gui/res/formats/Classic Restricted, Urza's Saga.txt b/forge-gui/res/formats/Vintage/Classic Restricted, Urza's Saga.txt similarity index 70% rename from forge-gui/res/formats/Classic Restricted, Urza's Saga.txt rename to forge-gui/res/formats/Vintage/Classic Restricted, Urza's Saga.txt index 7082c4b3e39..ad41c0728a3 100644 --- a/forge-gui/res/formats/Classic Restricted, Urza's Saga.txt +++ b/forge-gui/res/formats/Vintage/Classic Restricted, Urza's Saga.txt @@ -1,7 +1,7 @@ [format] Name:Classic Restricted, Urza's Saga Type:Historic -Subtype:Eternal -Order:213 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG +Subtype:Vintage +Order:218 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Copy Artifact; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Feldon's Cane; Fork; Ivory Tower; Jeweled Bird; Maze of Ith; Mind Twist; Rebirth; Regrowth; Sol Ring; Strip Mine; Tempest Efreet; Timmerian Fiends; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Classic Restricted, Visions.txt b/forge-gui/res/formats/Vintage/Classic Restricted, Visions.txt similarity index 96% rename from forge-gui/res/formats/Classic Restricted, Visions.txt rename to forge-gui/res/formats/Vintage/Classic Restricted, Visions.txt index bcc31e7abb2..bf8598f4482 100644 --- a/forge-gui/res/formats/Classic Restricted, Visions.txt +++ b/forge-gui/res/formats/Vintage/Classic Restricted, Visions.txt @@ -1,7 +1,7 @@ [format] Name:Classic Restricted, Visions Type:Historic -Subtype:Eternal -Order:183 +Subtype:Vintage +Order:188 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS Banned:Amulet of Quoz; Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Bronze Tablet; Candelabra of Tawnos; Channel; Chaos Orb; Contract from Below; Copy Artifact; Darkpact; Demonic Attorney; Demonic Tutor; Divine Intervention; Falling Star; Fastbond; Feldon's Cane; Fork; Ivory Tower; Jeweled Bird; Land Tax; Library of Alexandria; Maze of Ith; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Rebirth; Recall; Regrowth; Shahrazad; Sol Ring; Strip Mine; Tempest Efreet; Timetwister; Time Walk; Timmerian Fiends; Underworld Dreams; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Classic Restricted, Weatherlight.txt b/forge-gui/res/formats/Vintage/Classic Restricted, Weatherlight.txt similarity index 95% rename from forge-gui/res/formats/Classic Restricted, Weatherlight.txt rename to forge-gui/res/formats/Vintage/Classic Restricted, Weatherlight.txt index 544513493c7..e65449e9c20 100644 --- a/forge-gui/res/formats/Classic Restricted, Weatherlight.txt +++ b/forge-gui/res/formats/Vintage/Classic Restricted, Weatherlight.txt @@ -1,7 +1,7 @@ [format] Name:Classic Restricted, Weatherlight Type:Historic -Subtype:Eternal -Order:190 +Subtype:Vintage +Order:195 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Copy Artifact; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Feldon's Cane; Fork; Ivory Tower; Jeweled Bird; Maze of Ith; Mind Twist; Rebirth; Regrowth; Sol Ring; Strip Mine; Tempest Efreet; Timmerian Fiends; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Classic, Apr 1999.txt b/forge-gui/res/formats/Vintage/Classic, Apr 1999.txt similarity index 96% rename from forge-gui/res/formats/Classic, Apr 1999.txt rename to forge-gui/res/formats/Vintage/Classic, Apr 1999.txt index 21c2d32a949..64f46cbaff5 100644 --- a/forge-gui/res/formats/Classic, Apr 1999.txt +++ b/forge-gui/res/formats/Vintage/Classic, Apr 1999.txt @@ -1,8 +1,8 @@ [format] Name:Classic, Apr 1999 Type:Historic -Subtype:Eternal -Order:229 +Subtype:Vintage +Order:234 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Demonic Tutor; Fastbond; Fork; Ivory Tower; Library of Alexandria; Mirror Universe; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tolarian Academy; Underworld Dreams; Wheel of Fortune; Windfall Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Classic, Classic Sixth Edition.txt b/forge-gui/res/formats/Vintage/Classic, Classic Sixth Edition.txt similarity index 96% rename from forge-gui/res/formats/Classic, Classic Sixth Edition.txt rename to forge-gui/res/formats/Vintage/Classic, Classic Sixth Edition.txt index 284c5843cfd..29e2f3c1e1f 100644 --- a/forge-gui/res/formats/Classic, Classic Sixth Edition.txt +++ b/forge-gui/res/formats/Vintage/Classic, Classic Sixth Edition.txt @@ -1,8 +1,8 @@ [format] Name:Classic, Classic Sixth Edition Type:Historic -Subtype:Eternal -Order:233 +Subtype:Vintage +Order:238 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Demonic Tutor; Fastbond; Fork; Ivory Tower; Library of Alexandria; Mirror Universe; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tolarian Academy; Underworld Dreams; Wheel of Fortune; Windfall Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Classic, Exodus.txt b/forge-gui/res/formats/Vintage/Classic, Exodus.txt similarity index 96% rename from forge-gui/res/formats/Classic, Exodus.txt rename to forge-gui/res/formats/Vintage/Classic, Exodus.txt index 9516fe4574c..7e9fc29e2d7 100644 --- a/forge-gui/res/formats/Classic, Exodus.txt +++ b/forge-gui/res/formats/Vintage/Classic, Exodus.txt @@ -1,8 +1,8 @@ [format] Name:Classic, Exodus Type:Historic -Subtype:Eternal -Order:206 +Subtype:Vintage +Order:211 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Demonic Tutor; Fastbond; Fork; Ivory Tower; Library of Alexandria; Maze of Ith; Mirror Universe; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Recall; Regrowth; Sol Ring; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Classic, Fifth Edition.txt b/forge-gui/res/formats/Vintage/Classic, Fifth Edition.txt similarity index 96% rename from forge-gui/res/formats/Classic, Fifth Edition.txt rename to forge-gui/res/formats/Vintage/Classic, Fifth Edition.txt index 47798f984e8..61866c6366f 100644 --- a/forge-gui/res/formats/Classic, Fifth Edition.txt +++ b/forge-gui/res/formats/Vintage/Classic, Fifth Edition.txt @@ -1,8 +1,8 @@ [format] Name:Classic, Fifth Edition Type:Historic -Subtype:Eternal -Order:185 +Subtype:Vintage +Order:190 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Braingeyser; Candelabra of Tawnos; Copy Artifact; Demonic Tutor; Fastbond; Feldon's Cane; Fork; Ivory Tower; Library of Alexandria; Maze of Ith; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Recall; Regrowth; Sol Ring; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Classic, Mirage.txt b/forge-gui/res/formats/Vintage/Classic, Mirage.txt similarity index 96% rename from forge-gui/res/formats/Classic, Mirage.txt rename to forge-gui/res/formats/Vintage/Classic, Mirage.txt index edee54edd49..eb70d93ba8d 100644 --- a/forge-gui/res/formats/Classic, Mirage.txt +++ b/forge-gui/res/formats/Vintage/Classic, Mirage.txt @@ -1,8 +1,8 @@ [format] Name:Classic, Mirage Type:Historic -Subtype:Eternal -Order:177 +Subtype:Vintage +Order:182 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Braingeyser; Candelabra of Tawnos; Copy Artifact; Demonic Tutor; Fastbond; Feldon's Cane; Fork; Ivory Tower; Library of Alexandria; Maze of Ith; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Recall; Regrowth; Sol Ring; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Classic, Oct 1996.txt b/forge-gui/res/formats/Vintage/Classic, Oct 1996.txt similarity index 96% rename from forge-gui/res/formats/Classic, Oct 1996.txt rename to forge-gui/res/formats/Vintage/Classic, Oct 1996.txt index ead44a8d5f4..a60e7db5283 100644 --- a/forge-gui/res/formats/Classic, Oct 1996.txt +++ b/forge-gui/res/formats/Vintage/Classic, Oct 1996.txt @@ -1,8 +1,8 @@ [format] Name:Classic, Oct 1996 Type:Historic -Subtype:Eternal -Order:172 +Subtype:Vintage +Order:177 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Braingeyser; Candelabra of Tawnos; Copy Artifact; Demonic Tutor; Fastbond; Feldon's Cane; Fork; Ivory Tower; Library of Alexandria; Maze of Ith; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Recall; Regrowth; Sol Ring; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Classic, Stronghold.txt b/forge-gui/res/formats/Vintage/Classic, Stronghold.txt similarity index 96% rename from forge-gui/res/formats/Classic, Stronghold.txt rename to forge-gui/res/formats/Vintage/Classic, Stronghold.txt index 8445c50f34d..d20a4484285 100644 --- a/forge-gui/res/formats/Classic, Stronghold.txt +++ b/forge-gui/res/formats/Vintage/Classic, Stronghold.txt @@ -1,8 +1,8 @@ [format] Name:Classic, Stronghold Type:Historic -Subtype:Eternal -Order:201 +Subtype:Vintage +Order:206 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Demonic Tutor; Fastbond; Fork; Ivory Tower; Library of Alexandria; Maze of Ith; Mirror Universe; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Recall; Regrowth; Sol Ring; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Classic, Tempest.txt b/forge-gui/res/formats/Vintage/Classic, Tempest.txt similarity index 96% rename from forge-gui/res/formats/Classic, Tempest.txt rename to forge-gui/res/formats/Vintage/Classic, Tempest.txt index 889a5c286a1..b8f522d9189 100644 --- a/forge-gui/res/formats/Classic, Tempest.txt +++ b/forge-gui/res/formats/Vintage/Classic, Tempest.txt @@ -1,8 +1,8 @@ [format] Name:Classic, Tempest Type:Historic -Subtype:Eternal -Order:194 +Subtype:Vintage +Order:199 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Demonic Tutor; Fastbond; Fork; Ivory Tower; Library of Alexandria; Maze of Ith; Mirror Universe; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Recall; Regrowth; Sol Ring; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Classic, Urza's Destiny.txt b/forge-gui/res/formats/Vintage/Classic, Urza's Destiny.txt similarity index 96% rename from forge-gui/res/formats/Classic, Urza's Destiny.txt rename to forge-gui/res/formats/Vintage/Classic, Urza's Destiny.txt index 64d7329cd1b..9abc6f8b839 100644 --- a/forge-gui/res/formats/Classic, Urza's Destiny.txt +++ b/forge-gui/res/formats/Vintage/Classic, Urza's Destiny.txt @@ -1,8 +1,8 @@ [format] Name:Classic, Urza's Destiny Type:Historic -Subtype:Eternal -Order:238 +Subtype:Vintage +Order:243 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Demonic Tutor; Fastbond; Fork; Ivory Tower; Library of Alexandria; Mirror Universe; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tolarian Academy; Underworld Dreams; Wheel of Fortune; Windfall Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Classic, Urza's Legacy.txt b/forge-gui/res/formats/Vintage/Classic, Urza's Legacy.txt similarity index 96% rename from forge-gui/res/formats/Classic, Urza's Legacy.txt rename to forge-gui/res/formats/Vintage/Classic, Urza's Legacy.txt index c8185e07d49..624c82b3da7 100644 --- a/forge-gui/res/formats/Classic, Urza's Legacy.txt +++ b/forge-gui/res/formats/Vintage/Classic, Urza's Legacy.txt @@ -1,8 +1,8 @@ [format] Name:Classic, Urza's Legacy Type:Historic -Subtype:Eternal -Order:224 +Subtype:Vintage +Order:229 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Demonic Tutor; Fastbond; Fork; Ivory Tower; Library of Alexandria; Maze of Ith; Mirror Universe; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Recall; Regrowth; Sol Ring; Stroke of Genius; Timetwister; Time Walk; Tolarian Academy; Underworld Dreams; Wheel of Fortune; Windfall Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Classic, Urza's Saga.txt b/forge-gui/res/formats/Vintage/Classic, Urza's Saga.txt similarity index 96% rename from forge-gui/res/formats/Classic, Urza's Saga.txt rename to forge-gui/res/formats/Vintage/Classic, Urza's Saga.txt index 5df3afbd886..e6bda3eb2ee 100644 --- a/forge-gui/res/formats/Classic, Urza's Saga.txt +++ b/forge-gui/res/formats/Vintage/Classic, Urza's Saga.txt @@ -1,8 +1,8 @@ [format] Name:Classic, Urza's Saga Type:Historic -Subtype:Eternal -Order:211 +Subtype:Vintage +Order:216 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Demonic Tutor; Fastbond; Fork; Ivory Tower; Library of Alexandria; Maze of Ith; Mirror Universe; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Recall; Regrowth; Sol Ring; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Classic, Visions.txt b/forge-gui/res/formats/Vintage/Classic, Visions.txt similarity index 96% rename from forge-gui/res/formats/Classic, Visions.txt rename to forge-gui/res/formats/Vintage/Classic, Visions.txt index 7773967677f..fd90a9f05dd 100644 --- a/forge-gui/res/formats/Classic, Visions.txt +++ b/forge-gui/res/formats/Vintage/Classic, Visions.txt @@ -1,8 +1,8 @@ [format] Name:Classic, Visions Type:Historic -Subtype:Eternal -Order:182 +Subtype:Vintage +Order:187 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Braingeyser; Candelabra of Tawnos; Copy Artifact; Demonic Tutor; Fastbond; Feldon's Cane; Fork; Ivory Tower; Library of Alexandria; Maze of Ith; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Recall; Regrowth; Sol Ring; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Classic, Weatherlight.txt b/forge-gui/res/formats/Vintage/Classic, Weatherlight.txt similarity index 96% rename from forge-gui/res/formats/Classic, Weatherlight.txt rename to forge-gui/res/formats/Vintage/Classic, Weatherlight.txt index 48fe55d84ce..1c3298eb45f 100644 --- a/forge-gui/res/formats/Classic, Weatherlight.txt +++ b/forge-gui/res/formats/Vintage/Classic, Weatherlight.txt @@ -1,8 +1,8 @@ [format] Name:Classic, Weatherlight Type:Historic -Subtype:Eternal -Order:188 +Subtype:Vintage +Order:193 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Candelabra of Tawnos; Copy Artifact; Demonic Tutor; Fastbond; Feldon's Cane; Fork; Ivory Tower; Library of Alexandria; Maze of Ith; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Recall; Regrowth; Sol Ring; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Extended, Classic Sixth Edition.txt b/forge-gui/res/formats/Vintage/Extended, Classic Sixth Edition.txt similarity index 75% rename from forge-gui/res/formats/Extended, Classic Sixth Edition.txt rename to forge-gui/res/formats/Vintage/Extended, Classic Sixth Edition.txt index 55729e73454..29d38d5a64c 100644 --- a/forge-gui/res/formats/Extended, Classic Sixth Edition.txt +++ b/forge-gui/res/formats/Vintage/Extended, Classic Sixth Edition.txt @@ -1,7 +1,7 @@ [format] Name:Extended, Classic Sixth Edition Type:Historic -Subtype:Eternal -Order:231 -Sets:2ED, 3ED, 4ED, CHR, 5ED, 6ED, DRK, ARENA, FEM, ICE, CHR, HML, ALL, MIR, VIS, WTH, TMP, STH, EXO, USG, ULG +Subtype:Vintage +Order:236 +Sets:2ED, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED Banned:Amulet of Quoz; Balance; Black Vise; Bronze Tablet; Channel; Contract from Below; Darkpact; Demonic Attorney; Demonic Tutor; Fastbond; Hypnotic Specter; Ivory Tower; Jeweled Bird; Kird Ape; Mana Crypt; Maze of Ith; Memory Jar; Mind Twist; Rebirth; Regrowth; Serendib Efreet; Sol Ring; Strip Mine; Tempest Efreet; Timmerian Fiends; Tolarian Academy; Wheel of Fortune; Windfall; Zuran Orb diff --git a/forge-gui/res/formats/Jan 1999 Classic.txt b/forge-gui/res/formats/Vintage/Jan 1999 Classic.txt similarity index 96% rename from forge-gui/res/formats/Jan 1999 Classic.txt rename to forge-gui/res/formats/Vintage/Jan 1999 Classic.txt index 3067d97ba6f..5b60672cc17 100644 --- a/forge-gui/res/formats/Jan 1999 Classic.txt +++ b/forge-gui/res/formats/Vintage/Jan 1999 Classic.txt @@ -1,8 +1,8 @@ [format] Name:Jan 1999 Classic Type:Historic -Subtype:Eternal -Order:216 +Subtype:Vintage +Order:221 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Demonic Tutor; Fastbond; Fork; Ivory Tower; Library of Alexandria; Maze of Ith; Mirror Universe; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Recall; Regrowth; Sol Ring; Stroke of Genius; Timetwister; Time Walk; Tolarian Academy; Underworld Dreams; Wheel of Fortune; Windfall Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Standard, Classic Sixth Edition.txt b/forge-gui/res/formats/Vintage/Standard, Classic Sixth Edition.txt similarity index 76% rename from forge-gui/res/formats/Standard, Classic Sixth Edition.txt rename to forge-gui/res/formats/Vintage/Standard, Classic Sixth Edition.txt index 6338fcd1385..6b2125ed6d9 100644 --- a/forge-gui/res/formats/Standard, Classic Sixth Edition.txt +++ b/forge-gui/res/formats/Vintage/Standard, Classic Sixth Edition.txt @@ -1,7 +1,7 @@ [format] Name:Standard, Classic Sixth Edition Type:Historic -Subtype:Eternal -Order:230 -Sets:6ED, TMP, STH, EXO, USG, ULG +Subtype:Vintage +Order:235 +Sets:TMP, STH, EXO, USG, ULG, 6ED Banned:Dream Halls; Earthcraft; Fluctuator; Lotus Petal; Memory Jar; Recurring Nightmare; Time Spiral; Tolarian Academy; Windfall diff --git a/forge-gui/res/formats/Type 1, Apocalypse.txt b/forge-gui/res/formats/Vintage/Type 1, Apocalypse.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Apocalypse.txt rename to forge-gui/res/formats/Vintage/Type 1, Apocalypse.txt index e665ea87ad8..b58ff7db399 100644 --- a/forge-gui/res/formats/Type 1, Apocalypse.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Apocalypse.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Apocalypse Type:Historic -Subtype:Rotating -Order:278 +Subtype:Vintage +Order:283 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Apr 2003.txt b/forge-gui/res/formats/Vintage/Type 1, Apr 2003.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Apr 2003.txt rename to forge-gui/res/formats/Vintage/Type 1, Apr 2003.txt index 6f708a8e311..95b20085a4d 100644 --- a/forge-gui/res/formats/Type 1, Apr 2003.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Apr 2003.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Apr 2003 Type:Historic -Subtype:Rotating -Order:307 +Subtype:Vintage +Order:312 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, LGN Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Braingeyser; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Earthcraft; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Chronicles.txt b/forge-gui/res/formats/Vintage/Type 1, Chronicles.txt similarity index 98% rename from forge-gui/res/formats/Type 1, Chronicles.txt rename to forge-gui/res/formats/Vintage/Type 1, Chronicles.txt index d2bf51f4752..b892b219df6 100644 --- a/forge-gui/res/formats/Type 1, Chronicles.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Chronicles.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Chronicles Type:Historic -Subtype:Rotating -Order:156 +Subtype:Vintage +Order:161 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR Restricted:Adun Oakenshield; Ali from Cairo; Ancestral Recall; Angus Mackenzie; Arcades Sabboth; Axelrod Gunnarson; Ayesha Tanaka; Balance; Barktooth Warbeard; Bartel Runeaxe; Berserk; Black Lotus; Boris Devilboon; Braingeyser; Candelabra of Tawnos; Channel; Chaos Orb; Chromium; Copy Artifact; Dakkon Blackblade; Demonic Tutor; Falling Star; Feldon's Cane; Fork; Gabriel Angelfire; Gosta Dirk; Gwendlyn Di Corci; Halfdane; Hammerheim; Hazezon Tamar; Hunding Gjornersen; Ivory Tower; Jacques le Vert; Jasmine Boreal; Jedit Ojanen; Jerrard of the Closed Fist; Johan; Karakas; Kasimir the Lone Wolf; Kei Takahashi; Lady Caleria; Lady Evangela; Lady Orca; Library of Alexandria; Livonya Silone; Lord Magnus; Marhault Elsdragon; Maze of Ith; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Nebuchadnezzar; Nicol Bolas; Palladia-Mors; Pavel Maliki; Pendelhaven; Princess Lucrezia; Ragnar; Ramirez DePietro; Ramses Overdark; Rasputin Dreamweaver; Regrowth; Riven Turnbull; Rohgahh of Kher Keep; Rubinia Soulsinger; Sir Shandlar of Eberyn; Sivitri Scarzam; Sol Ring; Sol'kanar the Swamp King; Stangg; Sunastian Falconer; Tetsuo Umezawa; The Lady of the Mountain; The Tabernacle at Pendrell Vale; Timetwister; Time Walk; Tobias Andrion; Tolaria; Tor Wauki; Torsten Von Ursus; Tuknir Deathlock; Underworld Dreams; Ur-Drago; Urborg; Vaevictis Asmadi; Wheel of Fortune; Xira Arien Banned:Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Jeweled Bird; Shahrazad; Time Vault diff --git a/forge-gui/res/formats/Type 1, Darksteel.txt b/forge-gui/res/formats/Vintage/Type 1, Darksteel.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Darksteel.txt rename to forge-gui/res/formats/Vintage/Type 1, Darksteel.txt index 1fa7e59e0d2..f795e004db7 100644 --- a/forge-gui/res/formats/Type 1, Darksteel.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Darksteel.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Darksteel Type:Historic -Subtype:Rotating -Order:332 +Subtype:Vintage +Order:337 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Braingeyser; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Earthcraft; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Gush; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Eighth Edition.txt b/forge-gui/res/formats/Vintage/Type 1, Eighth Edition.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Eighth Edition.txt rename to forge-gui/res/formats/Vintage/Type 1, Eighth Edition.txt index 459413070cd..973368a8f13 100644 --- a/forge-gui/res/formats/Type 1, Eighth Edition.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Eighth Edition.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Eighth Edition Type:Historic -Subtype:Rotating -Order:318 +Subtype:Vintage +Order:323 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Braingeyser; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Earthcraft; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Gush; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Fifth Dawn.txt b/forge-gui/res/formats/Vintage/Type 1, Fifth Dawn.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Fifth Dawn.txt rename to forge-gui/res/formats/Vintage/Type 1, Fifth Dawn.txt index 20e28dd1daa..b943454ccf5 100644 --- a/forge-gui/res/formats/Type 1, Fifth Dawn.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Fifth Dawn.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Fifth Dawn Type:Historic -Subtype:Rotating -Order:339 +Subtype:Vintage +Order:344 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Braingeyser; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Earthcraft; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Gush; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Fourth Edition.txt b/forge-gui/res/formats/Vintage/Type 1, Fourth Edition.txt similarity index 98% rename from forge-gui/res/formats/Type 1, Fourth Edition.txt rename to forge-gui/res/formats/Vintage/Type 1, Fourth Edition.txt index 7d032b3ac75..e22254318f0 100644 --- a/forge-gui/res/formats/Type 1, Fourth Edition.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Fourth Edition.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Fourth Edition Type:Historic -Subtype:Rotating -Order:152 +Subtype:Vintage +Order:157 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED Restricted:Adun Oakenshield; Ali from Cairo; Ancestral Recall; Angus Mackenzie; Arcades Sabboth; Axelrod Gunnarson; Ayesha Tanaka; Balance; Barktooth Warbeard; Bartel Runeaxe; Berserk; Black Lotus; Boris Devilboon; Braingeyser; Candelabra of Tawnos; Channel; Chaos Orb; Chromium; Copy Artifact; Dakkon Blackblade; Demonic Tutor; Falling Star; Feldon's Cane; Fork; Gabriel Angelfire; Gosta Dirk; Gwendlyn Di Corci; Halfdane; Hammerheim; Hazezon Tamar; Hunding Gjornersen; Ivory Tower; Jacques le Vert; Jasmine Boreal; Jedit Ojanen; Jerrard of the Closed Fist; Johan; Karakas; Kasimir the Lone Wolf; Kei Takahashi; Lady Caleria; Lady Evangela; Lady Orca; Library of Alexandria; Livonya Silone; Lord Magnus; Marhault Elsdragon; Maze of Ith; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Nebuchadnezzar; Nicol Bolas; Palladia-Mors; Pavel Maliki; Pendelhaven; Princess Lucrezia; Ragnar; Ramirez DePietro; Ramses Overdark; Rasputin Dreamweaver; Regrowth; Riven Turnbull; Rohgahh of Kher Keep; Rubinia Soulsinger; Sir Shandlar of Eberyn; Sivitri Scarzam; Sol Ring; Sol'kanar the Swamp King; Stangg; Sunastian Falconer; Tetsuo Umezawa; The Lady of the Mountain; The Tabernacle at Pendrell Vale; Timetwister; Time Walk; Tobias Andrion; Tolaria; Tor Wauki; Torsten Von Ursus; Tuknir Deathlock; Underworld Dreams; Ur-Drago; Urborg; Vaevictis Asmadi; Wheel of Fortune; Xira Arien Banned:Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Jeweled Bird; Shahrazad; Time Vault diff --git a/forge-gui/res/formats/Type 1, Ice Age.txt b/forge-gui/res/formats/Vintage/Type 1, Ice Age.txt similarity index 98% rename from forge-gui/res/formats/Type 1, Ice Age.txt rename to forge-gui/res/formats/Vintage/Type 1, Ice Age.txt index a1edcf989c5..fd25a122d8f 100644 --- a/forge-gui/res/formats/Type 1, Ice Age.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Ice Age.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Ice Age Type:Historic -Subtype:Rotating -Order:154 +Subtype:Vintage +Order:159 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE Restricted:Adun Oakenshield; Ali from Cairo; Ancestral Recall; Angus Mackenzie; Arcades Sabboth; Axelrod Gunnarson; Ayesha Tanaka; Balance; Barktooth Warbeard; Bartel Runeaxe; Berserk; Black Lotus; Boris Devilboon; Braingeyser; Candelabra of Tawnos; Channel; Chaos Orb; Chromium; Copy Artifact; Dakkon Blackblade; Demonic Tutor; Falling Star; Feldon's Cane; Fork; Gabriel Angelfire; Gosta Dirk; Gwendlyn Di Corci; Halfdane; Hammerheim; Hazezon Tamar; Hunding Gjornersen; Ivory Tower; Jacques le Vert; Jasmine Boreal; Jedit Ojanen; Jerrard of the Closed Fist; Johan; Karakas; Kasimir the Lone Wolf; Kei Takahashi; Lady Caleria; Lady Evangela; Lady Orca; Library of Alexandria; Livonya Silone; Lord Magnus; Marhault Elsdragon; Maze of Ith; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Nebuchadnezzar; Nicol Bolas; Palladia-Mors; Pavel Maliki; Pendelhaven; Princess Lucrezia; Ragnar; Ramirez DePietro; Ramses Overdark; Rasputin Dreamweaver; Regrowth; Riven Turnbull; Rohgahh of Kher Keep; Rubinia Soulsinger; Sir Shandlar of Eberyn; Sivitri Scarzam; Sol Ring; Sol'kanar the Swamp King; Stangg; Sunastian Falconer; Tetsuo Umezawa; The Lady of the Mountain; The Tabernacle at Pendrell Vale; Timetwister; Time Walk; Tobias Andrion; Tolaria; Tor Wauki; Torsten Von Ursus; Tuknir Deathlock; Underworld Dreams; Ur-Drago; Urborg; Vaevictis Asmadi; Wheel of Fortune; Xira Arien Banned:Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Jeweled Bird; Shahrazad; diff --git a/forge-gui/res/formats/Type 1, Invasion.txt b/forge-gui/res/formats/Vintage/Type 1, Invasion.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Invasion.txt rename to forge-gui/res/formats/Vintage/Type 1, Invasion.txt index 55b61ff98b7..60b355223a1 100644 --- a/forge-gui/res/formats/Type 1, Invasion.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Invasion.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Invasion Type:Historic -Subtype:Rotating -Order:264 +Subtype:Vintage +Order:269 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Jan 2002.txt b/forge-gui/res/formats/Vintage/Type 1, Jan 2002.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Jan 2002.txt rename to forge-gui/res/formats/Vintage/Type 1, Jan 2002.txt index 2aae9be51d2..09074402e71 100644 --- a/forge-gui/res/formats/Type 1, Jan 2002.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Jan 2002.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Jan 2002 Type:Historic -Subtype:Rotating -Order:285 +Subtype:Vintage +Order:290 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Jan 2004.txt b/forge-gui/res/formats/Vintage/Type 1, Jan 2004.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Jan 2004.txt rename to forge-gui/res/formats/Vintage/Type 1, Jan 2004.txt index c5dcacd37c5..da4266ea313 100644 --- a/forge-gui/res/formats/Type 1, Jan 2004.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Jan 2004.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Jan 2004 Type:Historic -Subtype:Rotating -Order:327 +Subtype:Vintage +Order:332 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Braingeyser; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Earthcraft; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Gush; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Judgment.txt b/forge-gui/res/formats/Vintage/Type 1, Judgment.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Judgment.txt rename to forge-gui/res/formats/Vintage/Type 1, Judgment.txt index bd6e21ceaf9..f22a10127b2 100644 --- a/forge-gui/res/formats/Type 1, Judgment.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Judgment.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Judgment Type:Historic -Subtype:Rotating -Order:295 +Subtype:Vintage +Order:300 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Jul 2003.txt b/forge-gui/res/formats/Vintage/Type 1, Jul 2003.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Jul 2003.txt rename to forge-gui/res/formats/Vintage/Type 1, Jul 2003.txt index 05fd12271a1..22cadfdcbd6 100644 --- a/forge-gui/res/formats/Type 1, Jul 2003.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Jul 2003.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Jul 2003 Type:Historic -Subtype:Rotating -Order:314 +Subtype:Vintage +Order:319 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Braingeyser; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Earthcraft; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Gush; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Legions.txt b/forge-gui/res/formats/Vintage/Type 1, Legions.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Legions.txt rename to forge-gui/res/formats/Vintage/Type 1, Legions.txt index 67a8fbd7ab8..1f0445290fd 100644 --- a/forge-gui/res/formats/Type 1, Legions.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Legions.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Legions Type:Historic -Subtype:Rotating -Order:305 +Subtype:Vintage +Order:310 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, LGN Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Mercadian Masques.txt b/forge-gui/res/formats/Vintage/Type 1, Mercadian Masques.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Mercadian Masques.txt rename to forge-gui/res/formats/Vintage/Type 1, Mercadian Masques.txt index 6199c7413a4..65f92e57042 100644 --- a/forge-gui/res/formats/Type 1, Mercadian Masques.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Mercadian Masques.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Mercadian Masques Type:Historic -Subtype:Rotating -Order:246 +Subtype:Vintage +Order:251 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Crop Rotation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Mirrodin.txt b/forge-gui/res/formats/Vintage/Type 1, Mirrodin.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Mirrodin.txt rename to forge-gui/res/formats/Vintage/Type 1, Mirrodin.txt index de7bcafb82f..baa13491ad2 100644 --- a/forge-gui/res/formats/Type 1, Mirrodin.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Mirrodin.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Mirrodin Type:Historic -Subtype:Rotating -Order:324 +Subtype:Vintage +Order:329 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Braingeyser; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Earthcraft; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Gush; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Nemesis.txt b/forge-gui/res/formats/Vintage/Type 1, Nemesis.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Nemesis.txt rename to forge-gui/res/formats/Vintage/Type 1, Nemesis.txt index f6754ee5227..bce6fa841f7 100644 --- a/forge-gui/res/formats/Type 1, Nemesis.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Nemesis.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Nemesis Type:Historic -Subtype:Rotating -Order:251 +Subtype:Vintage +Order:256 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Crop Rotation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Oct 1999.txt b/forge-gui/res/formats/Vintage/Type 1, Oct 1999.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Oct 1999.txt rename to forge-gui/res/formats/Vintage/Type 1, Oct 1999.txt index 6f87358dd52..a6e9e5b7997 100644 --- a/forge-gui/res/formats/Type 1, Oct 1999.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Oct 1999.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Oct 1999 Type:Historic -Subtype:Rotating -Order:241 +Subtype:Vintage +Order:246 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Crop Rotation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mox Diamond; Mystical Tutor; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Oct 2000.txt b/forge-gui/res/formats/Vintage/Type 1, Oct 2000.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Oct 2000.txt rename to forge-gui/res/formats/Vintage/Type 1, Oct 2000.txt index e6c60ceccc4..446129f85b7 100644 --- a/forge-gui/res/formats/Type 1, Oct 2000.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Oct 2000.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Oct 2000 Type:Historic -Subtype:Rotating -Order:259 +Subtype:Vintage +Order:264 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Odyssey.txt b/forge-gui/res/formats/Vintage/Type 1, Odyssey.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Odyssey.txt rename to forge-gui/res/formats/Vintage/Type 1, Odyssey.txt index 84c88e22180..e8a39f58808 100644 --- a/forge-gui/res/formats/Type 1, Odyssey.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Odyssey.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Odyssey Type:Historic -Subtype:Rotating -Order:283 +Subtype:Vintage +Order:288 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Onslaught.txt b/forge-gui/res/formats/Vintage/Type 1, Onslaught.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Onslaught.txt rename to forge-gui/res/formats/Vintage/Type 1, Onslaught.txt index ac6dbac7d63..86334521fe4 100644 --- a/forge-gui/res/formats/Type 1, Onslaught.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Onslaught.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Onslaught Type:Historic -Subtype:Rotating -Order:300 +Subtype:Vintage +Order:305 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Planeshift.txt b/forge-gui/res/formats/Vintage/Type 1, Planeshift.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Planeshift.txt rename to forge-gui/res/formats/Vintage/Type 1, Planeshift.txt index d2b89be5faf..f96a296a292 100644 --- a/forge-gui/res/formats/Type 1, Planeshift.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Planeshift.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Planeshift Type:Historic -Subtype:Rotating -Order:269 +Subtype:Vintage +Order:274 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Prophecy.txt b/forge-gui/res/formats/Vintage/Type 1, Prophecy.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Prophecy.txt rename to forge-gui/res/formats/Vintage/Type 1, Prophecy.txt index a35ecddde4f..974d9e3e0b3 100644 --- a/forge-gui/res/formats/Type 1, Prophecy.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Prophecy.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Prophecy Type:Historic -Subtype:Rotating -Order:257 +Subtype:Vintage +Order:262 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Crop Rotation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Scourge.txt b/forge-gui/res/formats/Vintage/Type 1, Scourge.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Scourge.txt rename to forge-gui/res/formats/Vintage/Type 1, Scourge.txt index 1dccfda07be..a9fe1fa497d 100644 --- a/forge-gui/res/formats/Type 1, Scourge.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Scourge.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Scourge Type:Historic -Subtype:Rotating -Order:312 +Subtype:Vintage +Order:317 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Braingeyser; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Earthcraft; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Seventh Edition.txt b/forge-gui/res/formats/Vintage/Type 1, Seventh Edition.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Seventh Edition.txt rename to forge-gui/res/formats/Vintage/Type 1, Seventh Edition.txt index 2d9ca292f81..0a4ce03d885 100644 --- a/forge-gui/res/formats/Type 1, Seventh Edition.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Seventh Edition.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Seventh Edition Type:Historic -Subtype:Rotating -Order:274 +Subtype:Vintage +Order:279 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1, Torment.txt b/forge-gui/res/formats/Vintage/Type 1, Torment.txt similarity index 97% rename from forge-gui/res/formats/Type 1, Torment.txt rename to forge-gui/res/formats/Vintage/Type 1, Torment.txt index 3a920e8579b..502f74dc4ce 100644 --- a/forge-gui/res/formats/Type 1, Torment.txt +++ b/forge-gui/res/formats/Vintage/Type 1, Torment.txt @@ -1,8 +1,8 @@ [format] Name:Type 1, Torment Type:Historic -Subtype:Rotating -Order:290 +Subtype:Vintage +Order:295 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Library of Alexandria; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Recall; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Type 1.5, Apocalypse.txt b/forge-gui/res/formats/Vintage/Type 1.5, Apocalypse.txt similarity index 76% rename from forge-gui/res/formats/Type 1.5, Apocalypse.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Apocalypse.txt index 4e7561b7da5..7c026354911 100644 --- a/forge-gui/res/formats/Type 1.5, Apocalypse.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Apocalypse.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Apocalypse Type:Historic -Subtype:Rotating -Order:279 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC +Subtype:Vintage +Order:284 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Apr 2003.txt b/forge-gui/res/formats/Vintage/Type 1.5, Apr 2003.txt similarity index 75% rename from forge-gui/res/formats/Type 1.5, Apr 2003.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Apr 2003.txt index 89df4bbd38e..d40c53baf74 100644 --- a/forge-gui/res/formats/Type 1.5, Apr 2003.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Apr 2003.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Apr 2003 Type:Historic -Subtype:Rotating -Order:308 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, LGN +Subtype:Vintage +Order:313 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, LGN Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Earthcraft; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Darksteel.txt b/forge-gui/res/formats/Vintage/Type 1.5, Darksteel.txt similarity index 75% rename from forge-gui/res/formats/Type 1.5, Darksteel.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Darksteel.txt index eb0dc450d55..fe774be3807 100644 --- a/forge-gui/res/formats/Type 1.5, Darksteel.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Darksteel.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Darksteel Type:Historic -Subtype:Rotating -Order:333 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST +Subtype:Vintage +Order:338 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Burning Wish; Chrome Mox; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Earthcraft; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Gush; Jeweled Bird; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Eighth Edition.txt b/forge-gui/res/formats/Vintage/Type 1.5, Eighth Edition.txt similarity index 74% rename from forge-gui/res/formats/Type 1.5, Eighth Edition.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Eighth Edition.txt index 8d2233d7636..ca56213ca04 100644 --- a/forge-gui/res/formats/Type 1.5, Eighth Edition.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Eighth Edition.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Eighth Edition Type:Historic -Subtype:Rotating -Order:319 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED +Subtype:Vintage +Order:324 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Earthcraft; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Gush; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Fifth Dawn.txt b/forge-gui/res/formats/Vintage/Type 1.5, Fifth Dawn.txt similarity index 74% rename from forge-gui/res/formats/Type 1.5, Fifth Dawn.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Fifth Dawn.txt index 25182cff5a3..045c610572d 100644 --- a/forge-gui/res/formats/Type 1.5, Fifth Dawn.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Fifth Dawn.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Fifth Dawn Type:Historic -Subtype:Rotating -Order:340 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN +Subtype:Vintage +Order:345 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Burning Wish; Chrome Mox; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Earthcraft; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Gush; Jeweled Bird; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Invasion.txt b/forge-gui/res/formats/Vintage/Type 1.5, Invasion.txt similarity index 77% rename from forge-gui/res/formats/Type 1.5, Invasion.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Invasion.txt index 479bfacb2c6..e7302d09e4e 100644 --- a/forge-gui/res/formats/Type 1.5, Invasion.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Invasion.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Invasion Type:Historic -Subtype:Rotating -Order:265 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV +Subtype:Vintage +Order:270 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Jan 2002.txt b/forge-gui/res/formats/Vintage/Type 1.5, Jan 2002.txt similarity index 76% rename from forge-gui/res/formats/Type 1.5, Jan 2002.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Jan 2002.txt index cc59161110b..cb6d72257d9 100644 --- a/forge-gui/res/formats/Type 1.5, Jan 2002.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Jan 2002.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Jan 2002 Type:Historic -Subtype:Rotating -Order:286 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY +Subtype:Vintage +Order:291 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Jan 2004.txt b/forge-gui/res/formats/Vintage/Type 1.5, Jan 2004.txt similarity index 75% rename from forge-gui/res/formats/Type 1.5, Jan 2004.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Jan 2004.txt index 78b9d19c7b6..425b4cf3a7f 100644 --- a/forge-gui/res/formats/Type 1.5, Jan 2004.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Jan 2004.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Jan 2004 Type:Historic -Subtype:Rotating -Order:328 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD +Subtype:Vintage +Order:333 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Burning Wish; Chrome Mox; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Earthcraft; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Gush; Jeweled Bird; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Judgment.txt b/forge-gui/res/formats/Vintage/Type 1.5, Judgment.txt similarity index 75% rename from forge-gui/res/formats/Type 1.5, Judgment.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Judgment.txt index a6fab760caa..da140560a51 100644 --- a/forge-gui/res/formats/Type 1.5, Judgment.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Judgment.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Judgment Type:Historic -Subtype:Rotating -Order:296 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD +Subtype:Vintage +Order:301 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Jul 2003.txt b/forge-gui/res/formats/Vintage/Type 1.5, Jul 2003.txt similarity index 74% rename from forge-gui/res/formats/Type 1.5, Jul 2003.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Jul 2003.txt index 308dde8dcc1..19525d8c53b 100644 --- a/forge-gui/res/formats/Type 1.5, Jul 2003.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Jul 2003.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Jul 2003 Type:Historic -Subtype:Rotating -Order:315 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG +Subtype:Vintage +Order:320 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Earthcraft; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Gush; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Legions.txt b/forge-gui/res/formats/Vintage/Type 1.5, Legions.txt similarity index 75% rename from forge-gui/res/formats/Type 1.5, Legions.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Legions.txt index e61dbd0af05..406d4696218 100644 --- a/forge-gui/res/formats/Type 1.5, Legions.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Legions.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Legions Type:Historic -Subtype:Rotating -Order:306 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, LGN +Subtype:Vintage +Order:311 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, LGN Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Mercadian Masques.txt b/forge-gui/res/formats/Vintage/Type 1.5, Mercadian Masques.txt similarity index 78% rename from forge-gui/res/formats/Type 1.5, Mercadian Masques.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Mercadian Masques.txt index c4844dfecd6..edca6b9a0f2 100644 --- a/forge-gui/res/formats/Type 1.5, Mercadian Masques.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Mercadian Masques.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Mercadian Masques Type:Historic -Subtype:Rotating -Order:247 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ +Subtype:Vintage +Order:252 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Rebirth; Regrowth; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Mirrodin.txt b/forge-gui/res/formats/Vintage/Type 1.5, Mirrodin.txt similarity index 74% rename from forge-gui/res/formats/Type 1.5, Mirrodin.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Mirrodin.txt index a1c8730d1cc..cd09cd48c6d 100644 --- a/forge-gui/res/formats/Type 1.5, Mirrodin.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Mirrodin.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Mirrodin Type:Historic -Subtype:Rotating -Order:325 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD +Subtype:Vintage +Order:330 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Earthcraft; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Gush; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Nemesis.txt b/forge-gui/res/formats/Vintage/Type 1.5, Nemesis.txt similarity index 77% rename from forge-gui/res/formats/Type 1.5, Nemesis.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Nemesis.txt index 2562ca59400..b87ba97a1d5 100644 --- a/forge-gui/res/formats/Type 1.5, Nemesis.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Nemesis.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Nemesis Type:Historic -Subtype:Rotating -Order:252 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS +Subtype:Vintage +Order:257 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Vintage/Type 1.5, Oct 1999.txt b/forge-gui/res/formats/Vintage/Type 1.5, Oct 1999.txt new file mode 100644 index 00000000000..358d0d446b9 --- /dev/null +++ b/forge-gui/res/formats/Vintage/Type 1.5, Oct 1999.txt @@ -0,0 +1,7 @@ +[format] +Name:Type 1.5, Oct 1999 +Type:Historic +Subtype:Vintage +Order:247 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS +Banned:Amulet of Quoz; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Rebirth; Regrowth; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Oct 2000.txt b/forge-gui/res/formats/Vintage/Type 1.5, Oct 2000.txt similarity index 78% rename from forge-gui/res/formats/Type 1.5, Oct 2000.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Oct 2000.txt index dde1d47d50d..53de0edb0c7 100644 --- a/forge-gui/res/formats/Type 1.5, Oct 2000.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Oct 2000.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Oct 2000 Type:Historic -Subtype:Rotating -Order:260 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY +Subtype:Vintage +Order:265 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Odyssey.txt b/forge-gui/res/formats/Vintage/Type 1.5, Odyssey.txt similarity index 75% rename from forge-gui/res/formats/Type 1.5, Odyssey.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Odyssey.txt index 7ec3fbb9661..c245bcb6839 100644 --- a/forge-gui/res/formats/Type 1.5, Odyssey.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Odyssey.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Odyssey Type:Historic -Subtype:Rotating -Order:284 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY +Subtype:Vintage +Order:289 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Onslaught.txt b/forge-gui/res/formats/Vintage/Type 1.5, Onslaught.txt similarity index 75% rename from forge-gui/res/formats/Type 1.5, Onslaught.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Onslaught.txt index 6cd7552e8e3..fd64178fd2d 100644 --- a/forge-gui/res/formats/Type 1.5, Onslaught.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Onslaught.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Onslaught Type:Historic -Subtype:Rotating -Order:301 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD +Subtype:Vintage +Order:306 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Planeshift.txt b/forge-gui/res/formats/Vintage/Type 1.5, Planeshift.txt similarity index 77% rename from forge-gui/res/formats/Type 1.5, Planeshift.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Planeshift.txt index 2af841ac5e2..7e3e8d9b9d6 100644 --- a/forge-gui/res/formats/Type 1.5, Planeshift.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Planeshift.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Planeshift Type:Historic -Subtype:Rotating -Order:270 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS +Subtype:Vintage +Order:275 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Prophecy.txt b/forge-gui/res/formats/Vintage/Type 1.5, Prophecy.txt similarity index 77% rename from forge-gui/res/formats/Type 1.5, Prophecy.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Prophecy.txt index fd47ddca56e..d7c781049bf 100644 --- a/forge-gui/res/formats/Type 1.5, Prophecy.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Prophecy.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Prophecy Type:Historic -Subtype:Rotating -Order:258 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY +Subtype:Vintage +Order:263 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Channel; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Scourge.txt b/forge-gui/res/formats/Vintage/Type 1.5, Scourge.txt similarity index 74% rename from forge-gui/res/formats/Type 1.5, Scourge.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Scourge.txt index fe83849cf4e..7775918c3df 100644 --- a/forge-gui/res/formats/Type 1.5, Scourge.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Scourge.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Scourge Type:Historic -Subtype:Rotating -Order:313 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG +Subtype:Vintage +Order:318 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Earthcraft; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Sep 2004.txt b/forge-gui/res/formats/Vintage/Type 1.5, Sep 2004.txt similarity index 77% rename from forge-gui/res/formats/Type 1.5, Sep 2004.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Sep 2004.txt index 210f45f7fc1..e8416cd8f06 100644 --- a/forge-gui/res/formats/Type 1.5, Sep 2004.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Sep 2004.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Sep 2004 Type:Historic -Subtype:Rotating -Order:343 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN +Subtype:Vintage +Order:348 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN Banned:Amulet of Quoz; Ancestral Recall; Balance; Bazaar of Baghdad; Black Vise; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dream Halls; Earthcraft; Entomb; Fastbond; Frantic Search; Goblin Recruiter; Grim Monolith; Gush; Hermit Druid; Illusionary Mask; Jeweled Bird; Land Tax; Library of Alexandria; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Metalworker; Mind Over Matter; Mind Twist; Mind's Desire; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystical Tutor; Necropotence; Oath of Druids; Rebirth; Replenish; Skullclamp; Sol Ring; Strip Mine; Tempest Efreet; Time Spiral; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Wheel of Fortune; Windfall; Worldgorger Dragon; Yawgmoth's Bargain; Yawgmoth's Will diff --git a/forge-gui/res/formats/Type 1.5, Seventh Edition.txt b/forge-gui/res/formats/Vintage/Type 1.5, Seventh Edition.txt similarity index 76% rename from forge-gui/res/formats/Type 1.5, Seventh Edition.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Seventh Edition.txt index 73713bea56e..bb2877ab59f 100644 --- a/forge-gui/res/formats/Type 1.5, Seventh Edition.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Seventh Edition.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Seventh Edition Type:Historic -Subtype:Rotating -Order:275 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED +Subtype:Vintage +Order:280 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, Torment.txt b/forge-gui/res/formats/Vintage/Type 1.5, Torment.txt similarity index 75% rename from forge-gui/res/formats/Type 1.5, Torment.txt rename to forge-gui/res/formats/Vintage/Type 1.5, Torment.txt index a10fe1123b0..efd1d89e2a4 100644 --- a/forge-gui/res/formats/Type 1.5, Torment.txt +++ b/forge-gui/res/formats/Vintage/Type 1.5, Torment.txt @@ -1,7 +1,7 @@ [format] Name:Type 1.5, Torment Type:Historic -Subtype:Rotating -Order:291 -Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR +Subtype:Vintage +Order:296 +Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR Banned:Amulet of Quoz; Balance; Black Vise; Braingeyser; Bronze Tablet; Contract from Below; Crop Rotation; Darkpact; Demonic Attorney; Demonic Consultation; Demonic Tutor; Doomsday; Dream Halls; Enlightened Tutor; Fact or Fiction; Fastbond; Fork; Frantic Search; Grim Monolith; Hurkyl's Recall; Jeweled Bird; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mind Over Matter; Mind Twist; Mox Diamond; Mystical Tutor; Necropotence; Rebirth; Regrowth; Sol Ring; Strip Mine; Stroke of Genius; Tempest Efreet; Time Spiral; Timmerian Fiends; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will; Zuran Orb diff --git a/forge-gui/res/formats/Type 1, Alliances.txt b/forge-gui/res/formats/Vintage/Type I, Alliances.txt similarity index 93% rename from forge-gui/res/formats/Type 1, Alliances.txt rename to forge-gui/res/formats/Vintage/Type I, Alliances.txt index 64ca2492c48..447dabe6deb 100644 --- a/forge-gui/res/formats/Type 1, Alliances.txt +++ b/forge-gui/res/formats/Vintage/Type I, Alliances.txt @@ -1,8 +1,8 @@ [format] -Name:Type 1, Alliances +Name:Type I, Alliances Type:Historic -Subtype:Rotating -Order:169 +Subtype:Vintage +Order:174 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Braingeyser; Candelabra of Tawnos; Chromium; Copy Artifact; Demonic Tutor; Feldon's Cane; Fork; Ivory Tower; Library of Alexandria; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Regrowth; Sol Ring; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Land Tax; Mind Twist; Rebirth; Shahrazad; Tempest Efreet diff --git a/forge-gui/res/formats/Type 1, Apr 1996.txt b/forge-gui/res/formats/Vintage/Type I, Apr 1996.txt similarity index 93% rename from forge-gui/res/formats/Type 1, Apr 1996.txt rename to forge-gui/res/formats/Vintage/Type I, Apr 1996.txt index aad9edbb203..fc096d55816 100644 --- a/forge-gui/res/formats/Type 1, Apr 1996.txt +++ b/forge-gui/res/formats/Vintage/Type I, Apr 1996.txt @@ -1,8 +1,8 @@ [format] -Name:Type 1, Apr 1996 +Name:Type I, Apr 1996 Type:Historic -Subtype:Rotating -Order:166 +Subtype:Vintage +Order:171 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML Restricted:Ancestral Recall; Balance; Berserk; Black Lotus; Braingeyser; Candelabra of Tawnos; Chromium; Copy Artifact; Demonic Tutor; Feldon's Cane; Fork; Ivory Tower; Library of Alexandria; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Regrowth; Sol Ring; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Shahrazad; Tempest Efreet diff --git a/forge-gui/res/formats/Type 1, Feb 1996.txt b/forge-gui/res/formats/Vintage/Type I, Feb 1996.txt similarity index 81% rename from forge-gui/res/formats/Type 1, Feb 1996.txt rename to forge-gui/res/formats/Vintage/Type I, Feb 1996.txt index 826c7cd3d39..0631f6d6713 100644 --- a/forge-gui/res/formats/Type 1, Feb 1996.txt +++ b/forge-gui/res/formats/Vintage/Type I, Feb 1996.txt @@ -1,8 +1,8 @@ [format] -Name:Type 1, Feb 1996 +Name:Type I, Feb 1996 Type:Historic -Subtype:Rotating -Order:164 +Subtype:Vintage +Order:169 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML -Restricted:Ali from Cairo; Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Candelabra of Tawnos; Chromium; Copy Artifact; Demonic Tutor; Feldon's Cane; Fork; Ivory Tower; Library of Alexandria; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Regrowth; Sol Ring; Sword of Ages; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune; Zuran Orb +Restricted:Ali from Cairo; Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Candelabra of Tawnos; Chromium; Copy Artifact; Demonic Tutor; Feldon's Cane; Fork; Ivory Tower; Library of Alexandria; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Regrowth; Sol Ring; Sword of the Ages; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Mind Twist; Rebirth; Shahrazad; Time Vault; Tempest Efreet diff --git a/forge-gui/res/formats/Type 1, Homelands.txt b/forge-gui/res/formats/Vintage/Type I, Homelands.txt similarity index 80% rename from forge-gui/res/formats/Type 1, Homelands.txt rename to forge-gui/res/formats/Vintage/Type I, Homelands.txt index 5de2715ad0d..5c08bd59618 100644 --- a/forge-gui/res/formats/Type 1, Homelands.txt +++ b/forge-gui/res/formats/Vintage/Type I, Homelands.txt @@ -1,8 +1,8 @@ [format] -Name:Type 1, Homelands +Name:Type I, Homelands Type:Historic -Subtype:Rotating -Order:162 +Subtype:Vintage +Order:167 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML -Restricted:Ali from Cairo; Ancestral Recall; Balance; Berserk; Black Lotus; Braingeyser; Candelabra of Tawnos; Chromium; Copy Artifact; Demonic Tutor; Feldon's Cane; Fork; Ivory Tower; Library of Alexandria; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Regrowth; Sol Ring; Sword of Ages; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune; Zuran Orb +Restricted:Ali from Cairo; Ancestral Recall; Balance; Berserk; Black Lotus; Braingeyser; Candelabra of Tawnos; Chromium; Copy Artifact; Demonic Tutor; Feldon's Cane; Fork; Ivory Tower; Library of Alexandria; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Regrowth; Sol Ring; Sword of the Ages; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Time Vault; Tempest Efreet diff --git a/forge-gui/res/formats/Type 1, Nov 1995.txt b/forge-gui/res/formats/Vintage/Type I, Nov 1995.txt similarity index 80% rename from forge-gui/res/formats/Type 1, Nov 1995.txt rename to forge-gui/res/formats/Vintage/Type I, Nov 1995.txt index d024e6a3119..385498527c6 100644 --- a/forge-gui/res/formats/Type 1, Nov 1995.txt +++ b/forge-gui/res/formats/Vintage/Type I, Nov 1995.txt @@ -1,8 +1,8 @@ [format] -Name:Type 1, Nov 1995 +Name:Type I, Nov 1995 Type:Historic -Subtype:Rotating -Order:160 +Subtype:Vintage +Order:165 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR -Restricted:Ali from Cairo; Ancestral Recall; Balance; Berserk; Black Lotus; Braingeyser; Candelabra of Tawnos; Chromium; Copy Artifact; Demonic Tutor; Feldon's Cane; Fork; Ivory Tower; Library of Alexandria; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Regrowth; Sol Ring; Sword of Ages; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune; Zuran Orb +Restricted:Ali from Cairo; Ancestral Recall; Balance; Berserk; Black Lotus; Braingeyser; Candelabra of Tawnos; Chromium; Copy Artifact; Demonic Tutor; Feldon's Cane; Fork; Ivory Tower; Library of Alexandria; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Regrowth; Sol Ring; Sword of the Ages; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Time Vault; Tempest Efreet diff --git a/forge-gui/res/formats/Type 1, October 1995.txt b/forge-gui/res/formats/Vintage/Type I, October 1995.txt similarity index 80% rename from forge-gui/res/formats/Type 1, October 1995.txt rename to forge-gui/res/formats/Vintage/Type I, October 1995.txt index b0750baab70..ea127480e84 100644 --- a/forge-gui/res/formats/Type 1, October 1995.txt +++ b/forge-gui/res/formats/Vintage/Type I, October 1995.txt @@ -1,8 +1,8 @@ [format] -Name:Type 1, October 1995 +Name:Type I, October 1995 Type:Historic -Subtype:Rotating -Order:158 +Subtype:Vintage +Order:163 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR -Restricted:Adun Oakenshield; Ali from Cairo; Ancestral Recall; Angus Mackenzie; Arcades Sabboth; Axelrod Gunnarson; Ayesha Tanaka; Balance; Barktooth Warbeard; Bartel Runeaxe; Berserk; Black Lotus; Boris Devilboon; Braingeyser; Candelabra of Tawnos; Channel; Chaos Orb; Chromium; Copy Artifact; Dakkon Blackblade; Demonic Tutor; Falling Star; Feldon's Cane; Fork; Gabriel Angelfire; Gosta Dirk; Gwendlyn Di Corci; Halfdane; Hammerheim; Hazezon Tamar; Hunding Gjornersen; Ivory Tower; Jacques le Vert; Jasmine Boreal; Jedit Ojanen; Jerrard of the Closed Fist; Johan; Karakas; Kasimir the Lone Wolf; Kei Takahashi; Lady Caleria; Lady Evangela; Lady Orca; Library of Alexandria; Livonya Silone; Lord Magnus; Marhault Elsdragon; Maze of Ith; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Nebuchadnezzar; Nicol Bolas; Palladia-Mors; Pavel Maliki; Pendelhaven; Princess Lucrezia; Ragnar; Ramirez DePietro; Ramses Overdark; Rasputin Dreamweaver; Regrowth; Riven Turnbull; Rohgahh of Kher Keep; Rubinia Soulsinger; Sir Shandlar of Eberyn; Sivitri Scarzam; Sol Ring; Sol'kanar the Swamp King; Stangg; Sunastian Falconer; Sword of Ages; Tetsuo Umezawa; The Lady of the Mountain; The Tabernacle at Pendrell Vale; Timetwister; Time Walk; Tobias Andrion; Tolaria; Tor Wauki; Torsten Von Ursus; Tuknir Deathlock; Underworld Dreams; Ur-Drago; Urborg; Vaevictis Asmadi; Wheel of Fortune; Xira Arien +Restricted:Adun Oakenshield; Ali from Cairo; Ancestral Recall; Angus Mackenzie; Arcades Sabboth; Axelrod Gunnarson; Ayesha Tanaka; Balance; Barktooth Warbeard; Bartel Runeaxe; Berserk; Black Lotus; Boris Devilboon; Braingeyser; Candelabra of Tawnos; Channel; Chaos Orb; Chromium; Copy Artifact; Dakkon Blackblade; Demonic Tutor; Falling Star; Feldon's Cane; Fork; Gabriel Angelfire; Gosta Dirk; Gwendlyn Di Corci; Halfdane; Hammerheim; Hazezon Tamar; Hunding Gjornersen; Ivory Tower; Jacques le Vert; Jasmine Boreal; Jedit Ojanen; Jerrard of the Closed Fist; Johan; Karakas; Kasimir the Lone Wolf; Kei Takahashi; Lady Caleria; Lady Evangela; Lady Orca; Library of Alexandria; Livonya Silone; Lord Magnus; Marhault Elsdragon; Maze of Ith; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Nebuchadnezzar; Nicol Bolas; Palladia-Mors; Pavel Maliki; Pendelhaven; Princess Lucrezia; Ragnar; Ramirez DePietro; Ramses Overdark; Rasputin Dreamweaver; Regrowth; Riven Turnbull; Rohgahh of Kher Keep; Rubinia Soulsinger; Sir Shandlar of Eberyn; Sivitri Scarzam; Sol Ring; Sol'kanar the Swamp King; Stangg; Sunastian Falconer; Sword of the Ages; Tetsuo Umezawa; The Lady of the Mountain; The Tabernacle at Pendrell Vale; Timetwister; Time Walk; Tobias Andrion; Tolaria; Tor Wauki; Torsten Von Ursus; Tuknir Deathlock; Underworld Dreams; Ur-Drago; Urborg; Vaevictis Asmadi; Wheel of Fortune; Xira Arien Banned:Amulet of Quoz; Bronze Tablet; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Jeweled Bird; Rebirth; Shahrazad; Time Vault; Tempest Efreet diff --git a/forge-gui/res/formats/Type 1.5, Alliances.txt b/forge-gui/res/formats/Vintage/Type I.5, Alliances.txt similarity index 93% rename from forge-gui/res/formats/Type 1.5, Alliances.txt rename to forge-gui/res/formats/Vintage/Type I.5, Alliances.txt index cc208c566d0..a3518306081 100644 --- a/forge-gui/res/formats/Type 1.5, Alliances.txt +++ b/forge-gui/res/formats/Vintage/Type I.5, Alliances.txt @@ -1,7 +1,7 @@ [format] -Name:Type 1.5, Alliances +Name:Type I.5, Alliances Type:Historic -Subtype:Rotating -Order:170 +Subtype:Vintage +Order:175 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL Banned:Amulet of Quoz; Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Bronze Tablet; Candelabra of Tawnos; Channel; Chaos Orb; Contract from Below; Copy Artifact; Darkpact; Demonic Attorney; Demonic Tutor; Divine Intervention; Falling Star; Feldon's Cane; Fork; Ivory Tower; Jeweled Bird; Library of Alexandria; Maze of Ith; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Rebirth; Recall; Regrowth; Shahrazad; Sol Ring; Tempest Efreet; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Type 1.5, May 1996.txt b/forge-gui/res/formats/Vintage/Type I.5, May 1996.txt similarity index 93% rename from forge-gui/res/formats/Type 1.5, May 1996.txt rename to forge-gui/res/formats/Vintage/Type I.5, May 1996.txt index 67867e3ecef..45ec17ae5c4 100644 --- a/forge-gui/res/formats/Type 1.5, May 1996.txt +++ b/forge-gui/res/formats/Vintage/Type I.5, May 1996.txt @@ -1,7 +1,7 @@ [format] -Name:Type 1.5, May 1996 +Name:Type I.5, May 1996 Type:Historic -Subtype:Rotating -Order:168 +Subtype:Vintage +Order:173 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML Banned:Amulet of Quoz; Ancestral Recall; Balance; Berserk; Black Lotus; Black Vise; Braingeyser; Bronze Tablet; Candelabra of Tawnos; Channel; Chaos Orb; Contract from Below; Copy Artifact; Darkpact; Demonic Attorney; Demonic Tutor; Divine Intervention; Falling Star; Feldon's Cane; Fork; Ivory Tower; Jeweled Bird; Library of Alexandria; Maze of Ith; Mind Twist; Mirror Universe; Mishra's Workshop; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Rebirth; Recall; Regrowth; Shahrazad; Sol Ring; Tempest Efreet; Timetwister; Time Walk; Underworld Dreams; Wheel of Fortune; Zuran Orb diff --git a/forge-gui/res/formats/Type 2, Alliances.txt b/forge-gui/res/formats/Vintage/Type II, Alliances.txt similarity index 79% rename from forge-gui/res/formats/Type 2, Alliances.txt rename to forge-gui/res/formats/Vintage/Type II, Alliances.txt index 2a753e0248f..34bf232a9b6 100644 --- a/forge-gui/res/formats/Type 2, Alliances.txt +++ b/forge-gui/res/formats/Vintage/Type II, Alliances.txt @@ -1,8 +1,8 @@ [format] -Name:Type 2, Alliances +Name:Type II, Alliances Type:Historic -Subtype:Eternal -Order:171 +Subtype:Vintage +Order:176 Sets:FEM, 4ED, ICE, CHR, HML, ALL Restricted:Balance; Black Vise; Ivory Tower; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Mind Twist; Rebirth; Tempest Efreet diff --git a/forge-gui/res/formats/Type 2, Apr 1996.txt b/forge-gui/res/formats/Vintage/Type II, Apr 1996.txt similarity index 79% rename from forge-gui/res/formats/Type 2, Apr 1996.txt rename to forge-gui/res/formats/Vintage/Type II, Apr 1996.txt index 669ef3454a8..c18f59ff13e 100644 --- a/forge-gui/res/formats/Type 2, Apr 1996.txt +++ b/forge-gui/res/formats/Vintage/Type II, Apr 1996.txt @@ -1,8 +1,8 @@ [format] -Name:Type 2, Apr 1996 +Name:Type II, Apr 1996 Type:Historic -Subtype:Eternal -Order:167 +Subtype:Vintage +Order:172 Sets:FEM, 4ED, ICE, CHR, HML Restricted:Balance; Black Vise; Ivory Tower; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Mind Twist; Rebirth; Tempest Efreet diff --git a/forge-gui/res/formats/Type 2, Feb 1996.txt b/forge-gui/res/formats/Vintage/Type II, Feb 1996.txt similarity index 80% rename from forge-gui/res/formats/Type 2, Feb 1996.txt rename to forge-gui/res/formats/Vintage/Type II, Feb 1996.txt index 883c3b7f081..4f976eb246a 100644 --- a/forge-gui/res/formats/Type 2, Feb 1996.txt +++ b/forge-gui/res/formats/Vintage/Type II, Feb 1996.txt @@ -1,8 +1,8 @@ [format] -Name:Type 2, Feb 1996 +Name:Type II, Feb 1996 Type:Historic -Subtype:Eternal -Order:165 +Subtype:Vintage +Order:170 Sets:FEM, 4ED, ICE, CHR, HML Restricted:Balance; Black Vise; Feldon's Cane; Ivory Tower; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Mind Twist; Rebirth; Tempest Efreet diff --git a/forge-gui/res/formats/Type 2, Homelands.txt b/forge-gui/res/formats/Vintage/Type II, Homelands.txt similarity index 79% rename from forge-gui/res/formats/Type 2, Homelands.txt rename to forge-gui/res/formats/Vintage/Type II, Homelands.txt index 7852113319b..561ba940679 100644 --- a/forge-gui/res/formats/Type 2, Homelands.txt +++ b/forge-gui/res/formats/Vintage/Type II, Homelands.txt @@ -1,8 +1,8 @@ [format] -Name:Type 2, Homelands +Name:Type II, Homelands Type:Historic -Subtype:Eternal -Order:163 +Subtype:Vintage +Order:168 Sets:FEM, 4ED, ICE, CHR, HML Restricted:Balance; Feldon's Cane; Ivory Tower; Mind Twist; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Rebirth; Tempest Efreet diff --git a/forge-gui/res/formats/Type 2, Nov 1995.txt b/forge-gui/res/formats/Vintage/Type II, Nov 1995.txt similarity index 79% rename from forge-gui/res/formats/Type 2, Nov 1995.txt rename to forge-gui/res/formats/Vintage/Type II, Nov 1995.txt index 54196cd8cbc..59c9f24d108 100644 --- a/forge-gui/res/formats/Type 2, Nov 1995.txt +++ b/forge-gui/res/formats/Vintage/Type II, Nov 1995.txt @@ -1,8 +1,8 @@ [format] -Name:Type 2, Nov 1995 +Name:Type II, Nov 1995 Type:Historic -Subtype:Eternal -Order:161 +Subtype:Vintage +Order:166 Sets:FEM, 4ED, ICE, CHR Restricted:Balance; Feldon's Cane; Ivory Tower; Mind Twist; Zuran Orb Banned:Amulet of Quoz; Bronze Tablet; Channel; Rebirth; Tempest Efreet diff --git a/forge-gui/res/formats/Type 2, October 1995.txt b/forge-gui/res/formats/Vintage/Type II, October 1995.txt similarity index 76% rename from forge-gui/res/formats/Type 2, October 1995.txt rename to forge-gui/res/formats/Vintage/Type II, October 1995.txt index 5baf5230a70..4ec859c0179 100644 --- a/forge-gui/res/formats/Type 2, October 1995.txt +++ b/forge-gui/res/formats/Vintage/Type II, October 1995.txt @@ -1,8 +1,8 @@ [format] -Name:Type 2, October 1995 +Name:Type II, October 1995 Type:Historic -Subtype:Eternal -Order:159 +Subtype:Vintage +Order:164 Sets:FEM, 4ED, ICE, CHR Restricted:Balance; Channel; Feldon's Cane; Ivory Tower; Mind Twist Banned:Amulet of Quoz; Bronze Tablet; Rebirth; Tempest Efreet diff --git a/forge-gui/res/formats/Vintage, Alara Reborn.txt b/forge-gui/res/formats/Vintage/Vintage, Alara Reborn.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Alara Reborn.txt rename to forge-gui/res/formats/Vintage/Vintage, Alara Reborn.txt index 30ef9e376f1..e3624b8f85c 100644 --- a/forge-gui/res/formats/Vintage, Alara Reborn.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Alara Reborn.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Alara Reborn Type:Historic -Subtype:Eternal -Order:449 +Subtype:Vintage +Order:454 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Flash; Frantic Search; Gifts Ungiven; Grim Monolith; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Avacyn Restored.txt b/forge-gui/res/formats/Vintage/Vintage, Avacyn Restored.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Avacyn Restored.txt rename to forge-gui/res/formats/Vintage/Vintage, Avacyn Restored.txt index 6e613c48495..021c62ff744 100644 --- a/forge-gui/res/formats/Vintage, Avacyn Restored.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Avacyn Restored.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Avacyn Restored Type:Historic -Subtype:Eternal -Order:522 +Subtype:Vintage +Order:527 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Demonic Consultation; Demonic Tutor; Fastbond; Flash; Gifts Ungiven; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Thirst for Knowledge; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Betrayers of Kamigawa.txt b/forge-gui/res/formats/Vintage/Vintage, Betrayers of Kamigawa.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Betrayers of Kamigawa.txt rename to forge-gui/res/formats/Vintage/Vintage, Betrayers of Kamigawa.txt index 122daf57199..7de5551f255 100644 --- a/forge-gui/res/formats/Vintage, Betrayers of Kamigawa.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Betrayers of Kamigawa.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Betrayers of Kamigawa Type:Historic -Subtype:Eternal -Order:354 +Subtype:Vintage +Order:359 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Grim Monolith; Gush; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Champions of Kamigawa.txt b/forge-gui/res/formats/Vintage/Vintage, Champions of Kamigawa.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Champions of Kamigawa.txt rename to forge-gui/res/formats/Vintage/Vintage, Champions of Kamigawa.txt index 5c8bb19ce2c..0c2b164334c 100644 --- a/forge-gui/res/formats/Vintage, Champions of Kamigawa.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Champions of Kamigawa.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Champions of Kamigawa Type:Historic -Subtype:Eternal -Order:348 +Subtype:Vintage +Order:353 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Grim Monolith; Gush; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Coldsnap.txt b/forge-gui/res/formats/Vintage/Vintage, Coldsnap.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Coldsnap.txt rename to forge-gui/res/formats/Vintage/Vintage, Coldsnap.txt index 69fb75609aa..bb1f17e58c7 100644 --- a/forge-gui/res/formats/Vintage, Coldsnap.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Coldsnap.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Coldsnap Type:Historic -Subtype:Eternal -Order:388 +Subtype:Vintage +Order:393 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Grim Monolith; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Personal Tutor; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Conflux.txt b/forge-gui/res/formats/Vintage/Vintage, Conflux.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Conflux.txt rename to forge-gui/res/formats/Vintage/Vintage, Conflux.txt index 7872dbb7b74..2b7a46a5d67 100644 --- a/forge-gui/res/formats/Vintage, Conflux.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Conflux.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Conflux Type:Historic -Subtype:Eternal -Order:444 +Subtype:Vintage +Order:449 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Flash; Frantic Search; Gifts Ungiven; Grim Monolith; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Dark Ascension.txt b/forge-gui/res/formats/Vintage/Vintage, Dark Ascension.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Dark Ascension.txt rename to forge-gui/res/formats/Vintage/Vintage, Dark Ascension.txt index b17f3880bab..b9f4ea4bc8d 100644 --- a/forge-gui/res/formats/Vintage, Dark Ascension.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Dark Ascension.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Dark Ascension Type:Historic -Subtype:Eternal -Order:515 +Subtype:Vintage +Order:520 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Demonic Consultation; Demonic Tutor; Fastbond; Flash; Gifts Ungiven; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Thirst for Knowledge; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Dec 2004.txt b/forge-gui/res/formats/Vintage/Vintage, Dec 2004.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Dec 2004.txt rename to forge-gui/res/formats/Vintage/Vintage, Dec 2004.txt index 902d4ece943..ce40b749d9f 100644 --- a/forge-gui/res/formats/Vintage, Dec 2004.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Dec 2004.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Dec 2004 Type:Historic -Subtype:Eternal -Order:349 +Subtype:Vintage +Order:354 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Grim Monolith; Gush; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Dissension.txt b/forge-gui/res/formats/Vintage/Vintage, Dissension.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Dissension.txt rename to forge-gui/res/formats/Vintage/Vintage, Dissension.txt index 5f22db525dc..3f1708715de 100644 --- a/forge-gui/res/formats/Vintage, Dissension.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Dissension.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Dissension Type:Historic -Subtype:Eternal -Order:383 +Subtype:Vintage +Order:388 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Grim Monolith; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Personal Tutor; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Eventide.txt b/forge-gui/res/formats/Vintage/Vintage, Eventide.txt similarity index 98% rename from forge-gui/res/formats/Vintage, Eventide.txt rename to forge-gui/res/formats/Vintage/Vintage, Eventide.txt index b61dfe3f0d7..d6f4c974a24 100644 --- a/forge-gui/res/formats/Vintage, Eventide.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Eventide.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Eventide Type:Historic -Subtype:Eternal -Order:430 +Subtype:Vintage +Order:435 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Flash; Frantic Search; Gifts Ungiven; Grim Monolith; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Personal Tutor; Ponder; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Future Sight.txt b/forge-gui/res/formats/Vintage/Vintage, Future Sight.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Future Sight.txt rename to forge-gui/res/formats/Vintage/Vintage, Future Sight.txt index 0bd05d48ec5..be0287c17a4 100644 --- a/forge-gui/res/formats/Vintage, Future Sight.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Future Sight.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Future Sight Type:Historic -Subtype:Eternal -Order:403 +Subtype:Vintage +Order:408 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Grim Monolith; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Personal Tutor; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Guildpact.txt b/forge-gui/res/formats/Vintage/Vintage, Guildpact.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Guildpact.txt rename to forge-gui/res/formats/Vintage/Vintage, Guildpact.txt index a7c9e43b186..284f74fe9db 100644 --- a/forge-gui/res/formats/Vintage, Guildpact.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Guildpact.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Guildpact Type:Historic -Subtype:Eternal -Order:377 +Subtype:Vintage +Order:382 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Grim Monolith; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Personal Tutor; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Innistrad.txt b/forge-gui/res/formats/Vintage/Vintage, Innistrad.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Innistrad.txt rename to forge-gui/res/formats/Vintage/Vintage, Innistrad.txt index 9cce55066ae..7526e373431 100644 --- a/forge-gui/res/formats/Vintage, Innistrad.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Innistrad.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Innistrad Type:Historic -Subtype:Eternal -Order:505 +Subtype:Vintage +Order:510 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Demonic Consultation; Demonic Tutor; Fact or Fiction; Fastbond; Flash; Gifts Ungiven; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Thirst for Knowledge; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, July 2009.txt b/forge-gui/res/formats/Vintage/Vintage, July 2009.txt similarity index 97% rename from forge-gui/res/formats/Vintage, July 2009.txt rename to forge-gui/res/formats/Vintage/Vintage, July 2009.txt index a5cf77ea69b..74e454ea0d4 100644 --- a/forge-gui/res/formats/Vintage, July 2009.txt +++ b/forge-gui/res/formats/Vintage/Vintage, July 2009.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, July 2009 Type:Historic -Subtype:Eternal -Order:451 +Subtype:Vintage +Order:456 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Demonic Consultation; Demonic Tutor; Fact or Fiction; Fastbond; Flash; Frantic Search; Gifts Ungiven; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Thirst for Knowledge; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Jun 2007.txt b/forge-gui/res/formats/Vintage/Vintage, Jun 2007.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Jun 2007.txt rename to forge-gui/res/formats/Vintage/Vintage, Jun 2007.txt index 486cc28dbc4..854eca8b9d0 100644 --- a/forge-gui/res/formats/Vintage, Jun 2007.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Jun 2007.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Jun 2007 Type:Historic -Subtype:Eternal -Order:404 +Subtype:Vintage +Order:409 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT Restricted:Ancestral Recall; Balance; Black Lotus; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Gifts Ungiven; Grim Monolith; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Personal Tutor; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Jun 2008.txt b/forge-gui/res/formats/Vintage/Vintage, Jun 2008.txt similarity index 98% rename from forge-gui/res/formats/Vintage, Jun 2008.txt rename to forge-gui/res/formats/Vintage/Vintage, Jun 2008.txt index 07067b1312c..bfd9ef96288 100644 --- a/forge-gui/res/formats/Vintage, Jun 2008.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Jun 2008.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Jun 2008 Type:Historic -Subtype:Eternal -Order:427 +Subtype:Vintage +Order:432 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Flash; Frantic Search; Gifts Ungiven; Grim Monolith; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Personal Tutor; Ponder; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Lorwyn.txt b/forge-gui/res/formats/Vintage/Vintage, Lorwyn.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Lorwyn.txt rename to forge-gui/res/formats/Vintage/Vintage, Lorwyn.txt index 5d13916a1da..00406c2174d 100644 --- a/forge-gui/res/formats/Vintage, Lorwyn.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Lorwyn.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Lorwyn Type:Historic -Subtype:Eternal -Order:414 +Subtype:Vintage +Order:419 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW Restricted:Ancestral Recall; Balance; Black Lotus; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Gifts Ungiven; Grim Monolith; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Personal Tutor; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Magic 2010.txt b/forge-gui/res/formats/Vintage/Vintage, Magic 2010.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Magic 2010.txt rename to forge-gui/res/formats/Vintage/Vintage, Magic 2010.txt index d91112814da..35c27ab7b1c 100644 --- a/forge-gui/res/formats/Vintage, Magic 2010.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Magic 2010.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Magic 2010 Type:Historic -Subtype:Eternal -Order:455 +Subtype:Vintage +Order:460 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10 Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Demonic Consultation; Demonic Tutor; Fact or Fiction; Fastbond; Flash; Frantic Search; Gifts Ungiven; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Thirst for Knowledge; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Magic 2011.txt b/forge-gui/res/formats/Vintage/Vintage, Magic 2011.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Magic 2011.txt rename to forge-gui/res/formats/Vintage/Vintage, Magic 2011.txt index 11204bc9ff9..9a2b107caf7 100644 --- a/forge-gui/res/formats/Vintage, Magic 2011.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Magic 2011.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Magic 2011 Type:Historic -Subtype:Eternal -Order:477 +Subtype:Vintage +Order:482 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11 Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Demonic Consultation; Demonic Tutor; Fact or Fiction; Fastbond; Flash; Frantic Search; Gifts Ungiven; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Thirst for Knowledge; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Magic 2012.txt b/forge-gui/res/formats/Vintage/Vintage, Magic 2012.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Magic 2012.txt rename to forge-gui/res/formats/Vintage/Vintage, Magic 2012.txt index d722da630a3..7d2d1e510c8 100644 --- a/forge-gui/res/formats/Vintage, Magic 2012.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Magic 2012.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Magic 2012 Type:Historic -Subtype:Eternal -Order:498 +Subtype:Vintage +Order:503 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12 Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Demonic Consultation; Demonic Tutor; Fact or Fiction; Fastbond; Flash; Gifts Ungiven; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Thirst for Knowledge; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Magic 2013.txt b/forge-gui/res/formats/Vintage/Vintage, Magic 2013.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Magic 2013.txt rename to forge-gui/res/formats/Vintage/Vintage, Magic 2013.txt index 910a7e74757..84d12a655dd 100644 --- a/forge-gui/res/formats/Vintage, Magic 2013.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Magic 2013.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Magic 2013 Type:Historic -Subtype:Eternal -Order:528 +Subtype:Vintage +Order:533 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Demonic Consultation; Demonic Tutor; Fastbond; Flash; Gifts Ungiven; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Thirst for Knowledge; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Mar 2005.txt b/forge-gui/res/formats/Vintage/Vintage, Mar 2005.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Mar 2005.txt rename to forge-gui/res/formats/Vintage/Vintage, Mar 2005.txt index f76228e258d..cba6dfb4ba2 100644 --- a/forge-gui/res/formats/Vintage, Mar 2005.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Mar 2005.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Mar 2005 Type:Historic -Subtype:Eternal -Order:356 +Subtype:Vintage +Order:361 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Grim Monolith; Gush; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Mirrodin Besieged.txt b/forge-gui/res/formats/Vintage/Vintage, Mirrodin Besieged.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Mirrodin Besieged.txt rename to forge-gui/res/formats/Vintage/Vintage, Mirrodin Besieged.txt index d338199f8ec..5c20c24eff8 100644 --- a/forge-gui/res/formats/Vintage, Mirrodin Besieged.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Mirrodin Besieged.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Mirrodin Besieged Type:Historic -Subtype:Eternal -Order:488 +Subtype:Vintage +Order:493 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Demonic Consultation; Demonic Tutor; Fact or Fiction; Fastbond; Flash; Gifts Ungiven; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Thirst for Knowledge; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Morningtide.txt b/forge-gui/res/formats/Vintage/Vintage, Morningtide.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Morningtide.txt rename to forge-gui/res/formats/Vintage/Vintage, Morningtide.txt index 6c4ee87a473..46329d6db4f 100644 --- a/forge-gui/res/formats/Vintage, Morningtide.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Morningtide.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Morningtide Type:Historic -Subtype:Eternal -Order:419 +Subtype:Vintage +Order:424 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR Restricted:Ancestral Recall; Balance; Black Lotus; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Gifts Ungiven; Grim Monolith; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Personal Tutor; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, New Phyrexia.txt b/forge-gui/res/formats/Vintage/Vintage, New Phyrexia.txt similarity index 97% rename from forge-gui/res/formats/Vintage, New Phyrexia.txt rename to forge-gui/res/formats/Vintage/Vintage, New Phyrexia.txt index 75af6112c4d..930dd3cdcd9 100644 --- a/forge-gui/res/formats/Vintage, New Phyrexia.txt +++ b/forge-gui/res/formats/Vintage/Vintage, New Phyrexia.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, New Phyrexia Type:Historic -Subtype:Eternal -Order:493 +Subtype:Vintage +Order:498 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Demonic Consultation; Demonic Tutor; Fact or Fiction; Fastbond; Flash; Gifts Ungiven; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Thirst for Knowledge; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Ninth Edition.txt b/forge-gui/res/formats/Vintage/Vintage, Ninth Edition.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Ninth Edition.txt rename to forge-gui/res/formats/Vintage/Vintage, Ninth Edition.txt index 0e6d753bf5e..88f4ce7c230 100644 --- a/forge-gui/res/formats/Vintage, Ninth Edition.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Ninth Edition.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Ninth Edition Type:Historic -Subtype:Eternal -Order:365 +Subtype:Vintage +Order:370 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Grim Monolith; Gush; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, October 2011.txt b/forge-gui/res/formats/Vintage/Vintage, October 2011.txt similarity index 97% rename from forge-gui/res/formats/Vintage, October 2011.txt rename to forge-gui/res/formats/Vintage/Vintage, October 2011.txt index 04b6b8fc7dd..8d03b1d4002 100644 --- a/forge-gui/res/formats/Vintage, October 2011.txt +++ b/forge-gui/res/formats/Vintage/Vintage, October 2011.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, October 2011 Type:Historic -Subtype:Eternal -Order:508 +Subtype:Vintage +Order:513 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Demonic Consultation; Demonic Tutor; Fastbond; Flash; Gifts Ungiven; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Thirst for Knowledge; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Planar Chaos.txt b/forge-gui/res/formats/Vintage/Vintage, Planar Chaos.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Planar Chaos.txt rename to forge-gui/res/formats/Vintage/Vintage, Planar Chaos.txt index 94420afeb02..f8e77af4fb3 100644 --- a/forge-gui/res/formats/Vintage, Planar Chaos.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Planar Chaos.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Planar Chaos Type:Historic -Subtype:Eternal -Order:398 +Subtype:Vintage +Order:403 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Grim Monolith; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Personal Tutor; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Ravnica_ City of Guilds.txt b/forge-gui/res/formats/Vintage/Vintage, Ravnica City of Guilds.txt similarity index 94% rename from forge-gui/res/formats/Vintage, Ravnica_ City of Guilds.txt rename to forge-gui/res/formats/Vintage/Vintage, Ravnica City of Guilds.txt index fd9892236dd..18d9366c503 100644 --- a/forge-gui/res/formats/Vintage, Ravnica_ City of Guilds.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Ravnica City of Guilds.txt @@ -1,8 +1,8 @@ [format] -Name:Vintage, Ravnica: City of Guilds +Name:Vintage, Ravnica City of Guilds Type:Historic -Subtype:Eternal -Order:942 +Subtype:Vintage +Order:377 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00 Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Grim Monolith; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Personal Tutor; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Rise of the Eldrazi.txt b/forge-gui/res/formats/Vintage/Vintage, Rise of the Eldrazi.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Rise of the Eldrazi.txt rename to forge-gui/res/formats/Vintage/Vintage, Rise of the Eldrazi.txt index 1e7719393c5..35eba977e00 100644 --- a/forge-gui/res/formats/Vintage, Rise of the Eldrazi.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Rise of the Eldrazi.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Rise of the Eldrazi Type:Historic -Subtype:Eternal -Order:471 +Subtype:Vintage +Order:476 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Demonic Consultation; Demonic Tutor; Fact or Fiction; Fastbond; Flash; Frantic Search; Gifts Ungiven; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Thirst for Knowledge; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Saviors of Kamigawa.txt b/forge-gui/res/formats/Vintage/Vintage, Saviors of Kamigawa.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Saviors of Kamigawa.txt rename to forge-gui/res/formats/Vintage/Vintage, Saviors of Kamigawa.txt index 8da82c4c63d..8164ce7e420 100644 --- a/forge-gui/res/formats/Vintage, Saviors of Kamigawa.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Saviors of Kamigawa.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Saviors of Kamigawa Type:Historic -Subtype:Eternal -Order:361 +Subtype:Vintage +Order:366 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Grim Monolith; Gush; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Scars of Mirrodin.txt b/forge-gui/res/formats/Vintage/Vintage, Scars of Mirrodin.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Scars of Mirrodin.txt rename to forge-gui/res/formats/Vintage/Vintage, Scars of Mirrodin.txt index d0cd5cf1fd2..c343e7c0d05 100644 --- a/forge-gui/res/formats/Vintage, Scars of Mirrodin.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Scars of Mirrodin.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Scars of Mirrodin Type:Historic -Subtype:Eternal -Order:482 +Subtype:Vintage +Order:487 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Demonic Consultation; Demonic Tutor; Fact or Fiction; Fastbond; Flash; Gifts Ungiven; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Thirst for Knowledge; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Sep 2004.txt b/forge-gui/res/formats/Vintage/Vintage, Sep 2004.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Sep 2004.txt rename to forge-gui/res/formats/Vintage/Vintage, Sep 2004.txt index b917329f9d8..1725c304ac7 100644 --- a/forge-gui/res/formats/Vintage, Sep 2004.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Sep 2004.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Sep 2004 Type:Historic -Subtype:Eternal -Order:342 +Subtype:Vintage +Order:347 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Grim Monolith; Gush; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Over Matter; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Regrowth; Sol Ring; Stroke of Genius; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Sep 2005.txt b/forge-gui/res/formats/Vintage/Vintage, Sep 2005.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Sep 2005.txt rename to forge-gui/res/formats/Vintage/Vintage, Sep 2005.txt index c3481120da8..05e5780586c 100644 --- a/forge-gui/res/formats/Vintage, Sep 2005.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Sep 2005.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Sep 2005 Type:Historic -Subtype:Eternal -Order:367 +Subtype:Vintage +Order:372 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Grim Monolith; Gush; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Sep 2007.txt b/forge-gui/res/formats/Vintage/Vintage, Sep 2007.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Sep 2007.txt rename to forge-gui/res/formats/Vintage/Vintage, Sep 2007.txt index 1ec629e5d9a..5f6da0e1ce4 100644 --- a/forge-gui/res/formats/Vintage, Sep 2007.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Sep 2007.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Sep 2007 Type:Historic -Subtype:Eternal -Order:410 +Subtype:Vintage +Order:415 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E Restricted:Ancestral Recall; Balance; Black Lotus; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Gifts Ungiven; Grim Monolith; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Personal Tutor; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Sep 2008.txt b/forge-gui/res/formats/Vintage/Vintage, Sep 2008.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Sep 2008.txt rename to forge-gui/res/formats/Vintage/Vintage, Sep 2008.txt index e27cb65557b..7680765f6a9 100644 --- a/forge-gui/res/formats/Vintage, Sep 2008.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Sep 2008.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Sep 2008 Type:Historic -Subtype:Eternal -Order:435 +Subtype:Vintage +Order:440 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Flash; Frantic Search; Gifts Ungiven; Grim Monolith; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Shadowmoor.txt b/forge-gui/res/formats/Vintage/Vintage, Shadowmoor.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Shadowmoor.txt rename to forge-gui/res/formats/Vintage/Vintage, Shadowmoor.txt index 04b86551ad4..7243f89d5db 100644 --- a/forge-gui/res/formats/Vintage, Shadowmoor.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Shadowmoor.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Shadowmoor Type:Historic -Subtype:Eternal -Order:424 +Subtype:Vintage +Order:429 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM Restricted:Ancestral Recall; Balance; Black Lotus; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Gifts Ungiven; Grim Monolith; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Personal Tutor; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Shards of Alara.txt b/forge-gui/res/formats/Vintage/Vintage, Shards of Alara.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Shards of Alara.txt rename to forge-gui/res/formats/Vintage/Vintage, Shards of Alara.txt index af538d9e6b8..c33c3869d9a 100644 --- a/forge-gui/res/formats/Vintage, Shards of Alara.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Shards of Alara.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Shards of Alara Type:Historic -Subtype:Eternal -Order:439 +Subtype:Vintage +Order:444 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Crop Rotation; Demonic Consultation; Demonic Tutor; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Flash; Frantic Search; Gifts Ungiven; Grim Monolith; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Tenth Edition.txt b/forge-gui/res/formats/Vintage/Vintage, Tenth Edition.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Tenth Edition.txt rename to forge-gui/res/formats/Vintage/Vintage, Tenth Edition.txt index 77077c94658..444b3db5387 100644 --- a/forge-gui/res/formats/Vintage, Tenth Edition.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Tenth Edition.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Tenth Edition Type:Historic -Subtype:Eternal -Order:408 +Subtype:Vintage +Order:413 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E Restricted:Ancestral Recall; Balance; Black Lotus; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Gifts Ungiven; Grim Monolith; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Personal Tutor; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Time Spiral.txt b/forge-gui/res/formats/Vintage/Vintage, Time Spiral.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Time Spiral.txt rename to forge-gui/res/formats/Vintage/Vintage, Time Spiral.txt index e88b9bd6c6f..f102955c498 100644 --- a/forge-gui/res/formats/Vintage, Time Spiral.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Time Spiral.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Time Spiral Type:Historic -Subtype:Eternal -Order:393 +Subtype:Vintage +Order:398 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB Restricted:Ancestral Recall; Balance; Black Lotus; Black Vise; Burning Wish; Channel; Chrome Mox; Crop Rotation; Demonic Consultation; Demonic Tutor; Dream Halls; Enlightened Tutor; Entomb; Fact or Fiction; Fastbond; Frantic Search; Grim Monolith; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Mind Twist; Mind's Desire; Mox Diamond; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Personal Tutor; Regrowth; Sol Ring; Time Spiral; Timetwister; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Voltaic Key; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Worldwake.txt b/forge-gui/res/formats/Vintage/Vintage, Worldwake.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Worldwake.txt rename to forge-gui/res/formats/Vintage/Vintage, Worldwake.txt index 2d69d346657..72f35b8fd19 100644 --- a/forge-gui/res/formats/Vintage, Worldwake.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Worldwake.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Worldwake Type:Historic -Subtype:Eternal -Order:466 +Subtype:Vintage +Order:471 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Demonic Consultation; Demonic Tutor; Fact or Fiction; Fastbond; Flash; Frantic Search; Gifts Ungiven; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Thirst for Knowledge; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends diff --git a/forge-gui/res/formats/Vintage, Zendikar.txt b/forge-gui/res/formats/Vintage/Vintage, Zendikar.txt similarity index 97% rename from forge-gui/res/formats/Vintage, Zendikar.txt rename to forge-gui/res/formats/Vintage/Vintage, Zendikar.txt index b5a8ef5c7a8..40d92ac555d 100644 --- a/forge-gui/res/formats/Vintage, Zendikar.txt +++ b/forge-gui/res/formats/Vintage/Vintage, Zendikar.txt @@ -1,8 +1,8 @@ [format] Name:Vintage, Zendikar Type:Historic -Subtype:Eternal -Order:461 +Subtype:Vintage +Order:466 Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, POR, PO2, PTK, S99, S00, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Burning Wish; Channel; Demonic Consultation; Demonic Tutor; Fact or Fiction; Fastbond; Flash; Frantic Search; Gifts Ungiven; Gush; Imperial Seal; Library of Alexandria; Lion's Eye Diamond; Lotus Petal; Mana Crypt; Mana Vault; Merchant Scroll; Mind's Desire; Mox Pearl; Mox Emerald; Mox Ruby; Mox Sapphire; Mox Jet; Mystical Tutor; Necropotence; Ponder; Regrowth; Sol Ring; Thirst for Knowledge; Timetwister; Time Vault; Time Walk; Tinker; Tolarian Academy; Trinisphere; Vampiric Tutor; Wheel of Fortune; Windfall; Yawgmoth's Bargain; Yawgmoth's Will Banned:Amulet of Quoz; Bronze Tablet; Chaos Orb; Contract from Below; Darkpact; Demonic Attorney; Divine Intervention; Falling Star; Jeweled Bird; Rebirth; Shahrazad; Tempest Efreet; Timmerian Fiends