blocks and new standard

2025-11-20 20:58:03 +00:00 · 2022-02-03 11:23:57 +00:00
parent 725566ff00
commit 6b5c86a677
94 changed files with 220 additions and 179 deletions
--- a/forge-gui/res/formats/Historic/DCI/Block/Amonkhet/2017-04-28.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Amonkhet/2017-04-28.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Amonkhet Block (Amonkhet)
+Name:Block: Amonkhet (AKH)
 Type:Historic
 Subtype:Block
 Effective:2017-04-28
-Sets:AKH
+Sets:AKH
--- a/forge-gui/res/formats/Historic/DCI/Block/Amonkhet/2017-07-14.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Amonkhet/2017-07-14.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Amonkhet Block (Hour of Devastation)
+Name:Block: Amonkhet (HOU)
 Type:Historic
 Subtype:Block
 Effective:2017-07-14
-Sets:AKH, HOU
+Sets:AKH, HOU
--- a/forge-gui/res/formats/Historic/DCI/Block/Battle
+++ b/forge-gui/res/formats/Historic/DCI/Block/Battle
@@ -1,6 +1,6 @@
 [format]
-Name:Battle for Zendikar Block (Battle for Zendikar)
+Name:Block: Battle for Zendikar (BFZ)
 Type:Historic
 Subtype:Block
 Effective:2015-10-02
-Sets:BFZ
+Sets:BFZ
--- a/forge-gui/res/formats/Historic/DCI/Block/Battle
+++ b/forge-gui/res/formats/Historic/DCI/Block/Battle
@@ -1,6 +1,6 @@
 [format]
-Name:Battle for Zendikar Block (Oath of the Gatewatch)
+Name:Block: Battle for Zendikar (OGW)
 Type:Historic
 Subtype:Block
 Effective:2016-01-22
-Sets:BFZ, OGW
+Sets:BFZ, OGW
--- a/forge-gui/res/formats/Historic/DCI/Block/Ice
+++ b/forge-gui/res/formats/Historic/DCI/Block/Ice
@@ -1,8 +1,8 @@
 [format]
-Name:Ice Age/Alliances (1996-10-01)
+Name:Block: Ice Age (ALL)
 Type:Historic
 Subtype:Block
 Effective:1996-10-01
 Sets:ICE, ALL
 Restricted:Zuran Orb
-Banned:Amulet of Quoz
+Banned:Amulet of Quoz
--- a/forge-gui/res/formats/Historic/DCI/Block/Ice
+++ b/forge-gui/res/formats/Historic/DCI/Block/Ice
@@ -0,0 +1,7 @@
 [format]
 Name:Block: Ice Age (ICE)
 Type:Historic
 Subtype:Block
 Effective:1997-05-01
 Sets:ICE
 Banned:Amulet of Quoz, Thawing Glaciers, Zuran Orb
--- a/forge-gui/res/formats/Historic/DCI/Block/Ice
+++ b/forge-gui/res/formats/Historic/DCI/Block/Ice
@@ -1,7 +1,7 @@
 [format]
-Name:Ice Age/Homelands/Alliances (1997-07-01)
+Name:Block: Ice Age (HML)
 Type:Historic
 Subtype:Block
 Effective:1997-07-01
 Sets:ICE, HML, ALL
-Banned:Amulet of Quoz, Thawing Glaciers, Timmerian Fiends, Zuran Orb
+Banned:Amulet of Quoz, Thawing Glaciers, Timmerian Fiends, Zuran Orb
--- a/forge-gui/res/formats/Historic/DCI/Block/Ice
+++ b/forge-gui/res/formats/Historic/DCI/Block/Ice
@@ -1,7 +1,7 @@
 [format]
-Name:Ice Age (Coldsnap)
+Name:Block: Ice Age (CSP)
 Type:Historic
 Subtype:Block
 Effective:2006-08-20
 Sets:ICE, ALL, CSP
-Banned:Amulet of Quoz, Thawing Glaciers, Zuran Orb
+Banned:Amulet of Quoz, Thawing Glaciers, Zuran Orb
--- a/forge-gui/res/formats/Historic/DCI/Block/Innistrad/2011-09-30.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Innistrad/2011-09-30.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Innistrad Block (Innistrad)
+Name:Block: Innistrad (ISD)
 Type:Historic
 Subtype:Block
 Effective:2011-09-30
-Sets:ISD
+Sets:ISD
--- a/forge-gui/res/formats/Historic/DCI/Block/Innistrad/2012-02-03.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Innistrad/2012-02-03.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Innistrad Block (Dark Ascension)
+Name:Block: Innistrad (DKA)
 Type:Historic
 Subtype:Block
 Effective:2012-02-03
-Sets:ISD, DKA
+Sets:ISD, DKA
--- a/forge-gui/res/formats/Historic/DCI/Block/Innistrad/2012-04-02.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Innistrad/2012-04-02.txt
@@ -1,7 +1,7 @@
 [format]
-Name:Innistrad Block (2012-04-02)
+Name:Block: Innistrad (2012-04-02)
 Type:Historic
 Subtype:Block
 Effective:2012-04-02
 Sets:ISD, DKA
-Banned:Intangible Virtue; Lingering Souls
+Banned:Intangible Virtue; Lingering Souls
--- a/forge-gui/res/formats/Historic/DCI/Block/Innistrad/2012-05-04.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Innistrad/2012-05-04.txt
@@ -1,7 +1,7 @@
 [format]
-Name:Innistrad Block (Avacyn Restored)
+Name:Block: Innistrad (AVR)
 Type:Historic
 Subtype:Block
 Effective:2012-05-04
 Sets:ISD, DKA, AVR
-Banned:Intangible Virtue; Lingering Souls
+Banned:Intangible Virtue; Lingering Souls
--- a/forge-gui/res/formats/Historic/DCI/Block/Invasion/2000-11-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Invasion/2000-11-01.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Invasion Block (Invasion)
+Name:Block: Invasion (INV)
 Type:Historic
 Subtype:Block
 Effective:2000-11-01
-Sets:INV
+Sets:INV
--- a/forge-gui/res/formats/Historic/DCI/Block/Invasion/2001-03-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Invasion/2001-03-01.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Invasion Block (Planeshift)
+Name:Block: Invasion (PLS)
 Type:Historic
 Subtype:Block
 Effective:2001-03-01
-Sets:INV, PLS
+Sets:INV, PLS
--- a/forge-gui/res/formats/Historic/DCI/Block/Invasion/2001-07-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Invasion/2001-07-01.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Invasion Block (Apocalypse)
+Name:Block: Invasion (APC)
 Type:Historic
 Subtype:Block
 Effective:2001-07-01
-Sets:INV, PLS, APC
+Sets:INV, PLS, APC
--- a/forge-gui/res/formats/Historic/DCI/Block/Ixalan/2017-09-29.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Ixalan/2017-09-29.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Ixalan Block (Ixalan)
+Name:Block: Ixalan (XLN)
 Type:Historic
 Subtype:Block
 Effective:2017-09-29
-Sets:XLN
+Sets:XLN
--- a/forge-gui/res/formats/Historic/DCI/Block/Ixalan/2018-01-19.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Ixalan/2018-01-19.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Ixalan Block (Rivals of Ixalan)
+Name:Block: Ixalan (RIX)
 Type:Historic
 Subtype:Block
 Effective:2018-01-19
-Sets:XLN, RIX
+Sets:XLN, RIX
--- a/forge-gui/res/formats/Historic/DCI/Block/Kaladesh/2016-09-30.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Kaladesh/2016-09-30.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Kaladesh Block (Kaladesh)
+Name:Block: Kaladesh (KLD)
 Type:Historic
 Subtype:Block
 Effective:2016-09-30
-Sets:KLD
+Sets:KLD
--- a/forge-gui/res/formats/Historic/DCI/Block/Kaladesh/2017-01-20.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Kaladesh/2017-01-20.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Kaladesh Block (Aether Revolt)
+Name:Block: Kaladesh (AER)
 Type:Historic
 Subtype:Block
 Effective:2017-01-20
-Sets:KLD, AER
+Sets:KLD, AER
--- a/forge-gui/res/formats/Historic/DCI/Block/Kamigawa/2004-10-20.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Kamigawa/2004-10-20.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Kamigawa Block (Champions of Kamigawa)
+Name:Block: Kamigawa (CHK)
 Type:Historic
 Subtype:Block
 Effective:2004-10-20
-Sets:CHK
+Sets:CHK
--- a/forge-gui/res/formats/Historic/DCI/Block/Kamigawa/2005-02-20.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Kamigawa/2005-02-20.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Kamigawa Block (Betrayers of Kamigawa)
+Name:Block: Kamigawa (BOK)
 Type:Historic
 Subtype:Block
 Effective:2005-02-20
-Sets:CHK, BOK
+Sets:CHK, BOK
--- a/forge-gui/res/formats/Historic/DCI/Block/Kamigawa/2005-06-20.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Kamigawa/2005-06-20.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Kamigawa Block (Saviors of Kamigawa)
+Name:Block: Kamigawa (SOK)
 Type:Historic
 Subtype:Block
 Effective:2005-06-20
-Sets:CHK, BOK, SOK
+Sets:CHK, BOK, SOK
--- a/forge-gui/res/formats/Historic/DCI/Block/Khans
+++ b/forge-gui/res/formats/Historic/DCI/Block/Khans
@@ -1,6 +1,6 @@
 [format]
-Name:Khans of Tarkir Block (Khans of Tarkir)
+Name:Block: Khans of Tarkir (KTK)
 Type:Historic
 Subtype:Block
 Effective:2014-09-26
-Sets:KTK
+Sets:KTK
--- a/forge-gui/res/formats/Historic/DCI/Block/Khans
+++ b/forge-gui/res/formats/Historic/DCI/Block/Khans
@@ -1,6 +1,6 @@
 [format]
-Name:Khans of Tarkir Block (Fate Reforged)
+Name:Block: Khans of Tarkir (FRF)
 Type:Historic
 Subtype:Block
 Effective:2015-01-23
-Sets:KTK, FRF
+Sets:KTK, FRF
--- a/forge-gui/res/formats/Historic/DCI/Block/Khans
+++ b/forge-gui/res/formats/Historic/DCI/Block/Khans
@@ -1,6 +1,6 @@
 [format]
-Name:Khans of Tarkir Block (Dragons of Tarkir)
+Name:Block: Khans of Tarkir (DTK)
 Type:Historic
 Subtype:Block
 Effective:2015-03-27
-Sets:KTK, FRF, DTK
+Sets:KTK, FRF, DTK
--- a/forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2007-10-20.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2007-10-20.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Lorwyn Block (Lorwyn)
+Name:Block: Lorwyn (LRW)
 Type:Historic
 Subtype:Block
 Effective:2007-10-20
-Sets:LRW
+Sets:LRW
--- a/forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2008-02-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2008-02-01.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Lorwyn Block (Morningtide)
+Name:Block: Lorwyn (MOR)
 Type:Historic
 Subtype:Block
 Effective:2008-02-01
-Sets:LRW, MOR
+Sets:LRW, MOR
--- a/forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2008-05-02.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2008-05-02.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Lorwyn-Shadowmoor Block (Shadowmoor)
+Name:Block: Lorwyn;Shadowmoor (SHM)
 Type:Historic
 Subtype:Block
 Effective:2008-05-02
-Sets:LRW, MOR, SHM
+Sets:LRW, MOR, SHM
--- a/forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2008-07-25.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2008-07-25.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Lorwyn-Shadowmoor Block (Eventide)
+Name:Block: Lorwyn;Shadowmoor (EVE)
 Type:Historic
 Subtype:Block
 Effective:2008-07-25
-Sets:LRW, MOR, SHM, EVE
+Sets:LRW, MOR, SHM, EVE
--- a/forge-gui/res/formats/Historic/DCI/Block/Masques/1999-11-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Masques/1999-11-01.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Masques Block (Mercadian Masques)
+Name:Block: Masques (MMQ)
 Type:Historic
 Subtype:Block
 Effective:1999-11-01
-Sets:MMQ
+Sets:MMQ
--- a/forge-gui/res/formats/Historic/DCI/Block/Masques/2000-03-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Masques/2000-03-01.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Masques Block (Nemesis)
+Name:Block: Masques (NMS)
 Type:Historic
 Subtype:Block
 Effective:2000-03-01
-Sets:MMQ, NMS
+Sets:MMQ, NMS
--- a/forge-gui/res/formats/Historic/DCI/Block/Masques/2000-07-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Masques/2000-07-01.txt
@@ -1,7 +1,7 @@
 [format]
-Name:Masques Block (Prophecy)
+Name:Block: Masques (PCY)
 Type:Historic
 Subtype:Block
 Effective:2000-07-01
 Sets:MMQ, NMS, PCY
-Banned:Lin Sivvi, Defiant Hero; Rishadan Port
+Banned:Lin Sivvi, Defiant Hero; Rishadan Port
--- a/forge-gui/res/formats/Historic/DCI/Block/Mirage-Visions-Weatherlight/1997-07-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Mirage-Visions-Weatherlight/1997-07-01.txt
@@ -1,7 +1,7 @@
 [format]
-Name:Mirage/Visions/Weatherlight Block (Weatherlight)
+Name:Block: Mirage;Visions;Weatherlight (WTH)
 Type:Historic
 Subtype:Block
 Effective:1997-07-01
 Sets:MIR, VIS, WTH
-Banned:Squandered Resources
+Banned:Squandered Resources
--- a/forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2003-10-20.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2003-10-20.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Mirrodin Block (Mirrodin)
+Name:Block: Mirrodin (MRD)
 Type:Historic
 Subtype:Block
 Effective:2003-10-20
-Sets:MRD
+Sets:MRD
--- a/forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2004-02-20.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2004-02-20.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Mirrodin Block (Darksteel)
+Name:Block: Mirrodin (DST)
 Type:Historic
 Subtype:Block
 Effective:2004-02-20
-Sets:MRD, DST
+Sets:MRD, DST
--- a/forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2004-06-20.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2004-06-20.txt
@@ -1,7 +1,7 @@
 [format]
-Name:Mirrodin Block (Fifth Dawn)
+Name:Block: Mirrodin (5DN)
 Type:Historic
 Subtype:Block
 Effective:2004-06-20
 Sets:MRD, DST, 5DN
-Banned:Skullclamp
+Banned:Skullclamp
--- a/forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2006-02-20.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2006-02-20.txt
@@ -1,7 +1,7 @@
 [format]
-Name:Mirrodin Block (2006-03-20)
+Name:Block: Mirrodin (2006-03-20)
 Type:Historic
 Subtype:Block
 Effective:2006-03-20
 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
+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
--- a/forge-gui/res/formats/Historic/DCI/Block/Odyssey/2001-11-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Odyssey/2001-11-01.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Odyssey Block (Odyssey)
+Name:Block: Odyssey (ODY)
 Type:Historic
 Subtype:Block
 Effective:2001-11-01
-Sets:ODY
+Sets:ODY
--- a/forge-gui/res/formats/Historic/DCI/Block/Odyssey/2002-03-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Odyssey/2002-03-01.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Odyssey Block (Torment)
+Name:Block: Odyssey (TOR)
 Type:Historic
 Subtype:Block
 Effective:2002-03-01
-Sets:ODY, TOR
+Sets:ODY, TOR
--- a/forge-gui/res/formats/Historic/DCI/Block/Odyssey/2002-07-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Odyssey/2002-07-01.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Odyssey Block (Judgment)
+Name:Block: Odyssey (JUD)
 Type:Historic
 Subtype:Block
 Effective:2002-07-01
-Sets:ODY, TOR, JUD
+Sets:ODY, TOR, JUD
--- a/forge-gui/res/formats/Historic/DCI/Block/Onslaught/2002-11-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Onslaught/2002-11-01.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Onslaught Block (Onslaught)
+Name:Block: Onslaught (ONS)
 Type:Historic
 Subtype:Block
 Effective:2002-11-01
-Sets:ONS
+Sets:ONS
--- a/forge-gui/res/formats/Historic/DCI/Block/Onslaught/2003-03-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Onslaught/2003-03-01.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Onslaught Block (Legions)
+Name:Block: Onslaught (LGN)
 Type:Historic
 Subtype:Block
 Effective:2003-03-01
-Sets:ONS, LGN
+Sets:ONS, LGN
--- a/forge-gui/res/formats/Historic/DCI/Block/Onslaught/2003-07-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Onslaught/2003-07-01.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Onslaught Block (Scourge)
+Name:Block: Onslaught (SCG)
 Type:Historic
 Subtype:Block
 Effective:2003-07-01
-Sets:ONS, LGN, SCG
+Sets:ONS, LGN, SCG
--- a/forge-gui/res/formats/Historic/DCI/Block/Rath
+++ b/forge-gui/res/formats/Historic/DCI/Block/Rath
@@ -1,6 +1,6 @@
 [format]
-Name:Tempest Block (Tempest)
+Name:Block: Tempest (TMP)
 Type:Historic
 Subtype:Block
 Effective:1997-11-01
-Sets:TMP
+Sets:TMP
--- a/forge-gui/res/formats/Historic/DCI/Block/Rath
+++ b/forge-gui/res/formats/Historic/DCI/Block/Rath
@@ -1,6 +1,6 @@
 [format]
-Name:Tempest/Stronghold Block (Stronghold)
+Name:Block: Tempest;Stronghold (TMP)
 Type:Historic
 Subtype:Block
 Effective:1998-04-01
-Sets:TMP, STH
+Sets:TMP, STH
--- a/forge-gui/res/formats/Historic/DCI/Block/Rath
+++ b/forge-gui/res/formats/Historic/DCI/Block/Rath
@@ -1,7 +1,7 @@
 [format]
-Name:Tempest/Stronghold/Exodus Block (Exodus)
+Name:Block: Tempest;Stronghold;Exodus (EXO)
 Type:Historic
 Subtype:Block
 Effective:1998-07-01
 Sets:TMP, STH, EXO
-Banned:Cursed Scroll
+Banned:Cursed Scroll
--- a/forge-gui/res/formats/Historic/DCI/Block/Ravnica/2005-10-20.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Ravnica/2005-10-20.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Ravnica Block (Ravnica: City of Guilds)
+Name:Block: Ravnica (RAV)
 Type:Historic
 Subtype:Block
 Effective:2005-10-20
-Sets:RAV
+Sets:RAV
--- a/forge-gui/res/formats/Historic/DCI/Block/Ravnica/2006-02-20.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Ravnica/2006-02-20.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Ravnica Block (Guildpact)
+Name:Block: Ravnica (GPT)
 Type:Historic
 Subtype:Block
 Effective:2006-02-20
-Sets:RAV, GPT
+Sets:RAV, GPT
--- a/forge-gui/res/formats/Historic/DCI/Block/Ravnica/2006-05-20.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Ravnica/2006-05-20.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Ravnica Block (Dissension)
+Name:Block: Ravnica (DIS)
 Type:Historic
 Subtype:Block
 Effective:2006-05-20
-Sets:RAV, GPT, DIS
+Sets:RAV, GPT, DIS
--- a/forge-gui/res/formats/Historic/DCI/Block/Return
+++ b/forge-gui/res/formats/Historic/DCI/Block/Return
@@ -1,6 +1,6 @@
 [format]
-Name:Return to Ravnica Block (Return to Ravnica)
+Name:Block: Return to Ravnica (RTR)
 Type:Historic
 Subtype:Block
 Effective:2012-10-05
-Sets:RTR
+Sets:RTR
--- a/forge-gui/res/formats/Historic/DCI/Block/Return
+++ b/forge-gui/res/formats/Historic/DCI/Block/Return
@@ -1,6 +1,6 @@
 [format]
-Name:Return to Ravnica Block (Gatecrash)
+Name:Block: Return to Ravnica (GTC)
 Type:Historic
 Subtype:Block
 Effective:2013-02-01
-Sets:RTR, GTC
+Sets:RTR, GTC
--- a/forge-gui/res/formats/Historic/DCI/Block/Return
+++ b/forge-gui/res/formats/Historic/DCI/Block/Return
@@ -1,6 +1,6 @@
 [format]
-Name:Return to Ravnica Block (Dragon's Maze)
+Name:Block: Return to Ravnica (DGM)
 Type:Historic
 Subtype:Block
 Effective:2013-05-03
-Sets:RTR, GTC, DGM
+Sets:RTR, GTC, DGM
--- a/forge-gui/res/formats/Historic/DCI/Block/Scars
+++ b/forge-gui/res/formats/Historic/DCI/Block/Scars
@@ -1,6 +1,6 @@
 [format]
-Name:Scars of Mirrodin Block (Scars of Mirrodin)
+Name:Block: Scars of Mirrodin (SOM)
 Type:Historic
 Subtype:Block
 Effective:2010-10-01
-Sets:SOM
+Sets:SOM
--- a/forge-gui/res/formats/Historic/DCI/Block/Scars
+++ b/forge-gui/res/formats/Historic/DCI/Block/Scars
@@ -1,6 +1,6 @@
 [format]
-Name:Scars of Mirrodin Block (Mirrodin Besieged)
+Name:Block: Scars of Mirrodin (MBS)
 Type:Historic
 Subtype:Block
 Effective:2011-02-04
-Sets:SOM, MBS
+Sets:SOM, MBS
--- a/forge-gui/res/formats/Historic/DCI/Block/Scars
+++ b/forge-gui/res/formats/Historic/DCI/Block/Scars
@@ -1,6 +1,6 @@
 [format]
-Name:Scars of Mirrodin Block (New Phyrexia)
+Name:Block: Scars of Mirrodin (NPH)
 Type:Historic
 Subtype:Block
 Effective:2011-05-13
-Sets:SOM, MBS, NPH
+Sets:SOM, MBS, NPH
--- a/forge-gui/res/formats/Historic/DCI/Block/Shadows
+++ b/forge-gui/res/formats/Historic/DCI/Block/Shadows
@@ -1,6 +1,6 @@
 [format]
-Name:Shadows over Innistrad Block (Shadows over Innistrad)
+Name:Block: Shadows over Innistrad (SOI)
 Type:Historic
 Subtype:Block
 Effective:2016-04-08
-Sets:SOI
+Sets:SOI
--- a/forge-gui/res/formats/Historic/DCI/Block/Shadows
+++ b/forge-gui/res/formats/Historic/DCI/Block/Shadows
@@ -1,6 +1,6 @@
 [format]
-Name:Shadows over Innistrad Block (Eldritch Moon)
+Name:Block: Shadows over Innistrad (EMN)
 Type:Historic
 Subtype:Block
 Effective:2016-07-22
-Sets:SOI, EMN
+Sets:SOI, EMN
--- a/forge-gui/res/formats/Historic/DCI/Block/Shards
+++ b/forge-gui/res/formats/Historic/DCI/Block/Shards
@@ -1,6 +1,6 @@
 [format]
-Name:Shards of Alara Block (Shards of Alara)
+Name:Block: Shards of Alara (ALA)
 Type:Historic
 Subtype:Block
 Effective:2008-10-03
-Sets:ALA
+Sets:ALA
--- a/forge-gui/res/formats/Historic/DCI/Block/Shards
+++ b/forge-gui/res/formats/Historic/DCI/Block/Shards
@@ -1,6 +1,6 @@
 [format]
-Name:Shards of Alara Block (Conflux)
+Name:Block: Shards of Alara (CFX)
 Type:Historic
 Subtype:Block
 Effective:2009-02-06
-Sets:ALA, CFX
+Sets:ALA, CFX
--- a/forge-gui/res/formats/Historic/DCI/Block/Shards
+++ b/forge-gui/res/formats/Historic/DCI/Block/Shards
@@ -1,6 +1,6 @@
 [format]
-Name:Shards of Alara Block (Alara Reborn)
+Name:Block: Shards of Alara (ARB)
 Type:Historic
 Subtype:Block
 Effective:2009-04-30
-Sets:ALA, CFX, ARB
+Sets:ALA, CFX, ARB
--- a/forge-gui/res/formats/Historic/DCI/Block/Theros/2013-09-27.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Theros/2013-09-27.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Theros Block (Theros)
+Name:Block: Theros (THS)
 Type:Historic
 Subtype:Block
 Effective:2013-09-23
-Sets:THS
+Sets:THS
--- a/forge-gui/res/formats/Historic/DCI/Block/Theros/2014-02-07.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Theros/2014-02-07.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Theros Block (Born of the Gods)
+Name:Block: Theros (BNG)
 Type:Historic
 Subtype:Block
 Effective:2014-02-07
-Sets:THS, BNG
+Sets:THS, BNG
--- a/forge-gui/res/formats/Historic/DCI/Block/Theros/2014-05-02.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Theros/2014-05-02.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Theros Block (Journey into Nyx)
+Name:Block: Theros (JOU)
 Type:Historic
 Subtype:Block
 Effective:2014-05-02
-Sets:THS, BNG, JOU
+Sets:THS, BNG, JOU
--- a/forge-gui/res/formats/Historic/DCI/Block/Time
+++ b/forge-gui/res/formats/Historic/DCI/Block/Time
@@ -1,6 +1,6 @@
 [format]
-Name:Time Spiral Block (Time Spiral)
+Name:Block: Time Spiral (TSP)
 Type:Historic
 Subtype:Block
 Effective:2006-10-20
-Sets:TSP, TSB
+Sets:TSP, TSB
--- a/forge-gui/res/formats/Historic/DCI/Block/Time
+++ b/forge-gui/res/formats/Historic/DCI/Block/Time
@@ -1,6 +1,6 @@
 [format]
-Name:Time Spiral Block (Planar Chaos)
+Name:Block: Time Spiral (PLC)
 Type:Historic
 Subtype:Block
 Effective:2007-02-20
-Sets:TSP, TSB, PLC
+Sets:TSP, TSB, PLC
--- a/forge-gui/res/formats/Historic/DCI/Block/Time
+++ b/forge-gui/res/formats/Historic/DCI/Block/Time
@@ -1,6 +1,6 @@
 [format]
-Name:Time Spiral Block (Future Sight)
+Name:Block: Time Spiral (FUT)
 Type:Historic
 Subtype:Block
 Effective:2007-05-20
-Sets:TSP, TSB, PLC, FUT
+Sets:TSP, TSB, PLC, FUT
--- a/forge-gui/res/formats/Historic/DCI/Block/Urza/1999-01-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Urza/1999-01-01.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Urza's Saga Standalone (1999-01-01)
+Name:Block: Urza (USG)
 Type:Historic
 Subtype:Block
 Effective:1999-01-01
-Sets:USG
+Sets:USG
--- a/forge-gui/res/formats/Historic/DCI/Block/Urza/1999-03-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Urza/1999-03-01.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Urza's Saga/Urza's Legacy Standalone (Urza's Legacy)
+Name:Block: Urza (ULG)
 Type:Historic
 Subtype:Block
 Effective:1999-03-01
-Sets:USG, ULG
+Sets:USG, ULG
--- a/forge-gui/res/formats/Historic/DCI/Block/Urza/1999-04-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Urza/1999-04-01.txt
@@ -1,7 +1,7 @@
 [format]
-Name:Urza Block (1999-04-01)
+Name:Block: Urza (1999-04-01)
 Type:Historic
 Subtype:Block
 Effective:1999-04-01
 Sets:USG, ULG
-Banned:Memory Jar, Time Spiral, Windfall
+Banned:Memory Jar, Time Spiral, Windfall
--- a/forge-gui/res/formats/Historic/DCI/Block/Urza/1999-07-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Urza/1999-07-01.txt
@@ -1,7 +1,7 @@
 [format]
-Name:Urza Block (Urza's Destiny)
+Name:Block: Urza (UDS)
 Type:Historic
 Subtype:Block
 Effective:1999-07-01
 Sets:USG, ULG, UDS
-Banned:Gaea's Cradle, Memory Jar, Serra's Sanctum, Time Spiral, Tolarian Academy, Voltaic Key, Windfall
+Banned:Gaea's Cradle, Memory Jar, Serra's Sanctum, Time Spiral, Tolarian Academy, Voltaic Key, Windfall
--- a/forge-gui/res/formats/Historic/DCI/Block/Zendikar/2009-10-02.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Zendikar/2009-10-02.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Zendikar Block (Zendikar)
+Name:Block: Zendikar (ZEN)
 Type:Historic
 Subtype:Block
 Effective:2009-10-02
-Sets:ZEN
+Sets:ZEN
--- a/forge-gui/res/formats/Historic/DCI/Block/Zendikar/2010-02-05.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Zendikar/2010-02-05.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Zendikar Block (Worldwake)
+Name:Block: Zendikar (WWK)
 Type:Historic
 Subtype:Block
 Effective:2010-02-05
-Sets:ZEN, WWK
+Sets:ZEN, WWK
--- a/forge-gui/res/formats/Historic/DCI/Block/Zendikar/2010-04-23.txt
+++ b/forge-gui/res/formats/Historic/DCI/Block/Zendikar/2010-04-23.txt
@@ -1,6 +1,6 @@
 [format]
-Name:Zendikar Block (Rise of the Eldrazi)
+Name:Block: Zendikar (ROE)
 Type:Historic
 Subtype:Block
 Effective:2010-04-23
-Sets:ZEN, WWK, ROE
+Sets:ZEN, WWK, ROE
--- a/forge-gui/res/formats/Historic/DCI/Ice
+++ b/forge-gui/res/formats/Historic/DCI/Ice
@@ -1,8 +0,0 @@
 [format]
 Name:Ice Age
 Type:Historic
 Subtype:Ice Age
 Effective:1997-05-01
 Retired:1997-07-01
 Sets:ICE
 Banned:Amulet of Quoz, Thawing Glaciers, Zuran Orb
--- a/forge-gui/res/formats/Historic/DCI/Standard/1995-01-10.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/1995-01-10.txt
@@ -5,4 +5,4 @@ Subtype:Standard
 Effective:1995-01-10
 Sets:3ED, DRK, FEM
 Restricted:Braingeyser, Channel, Copy Artifact, Demonic Tutor, Ivory Tower, Maze of Ith, Mind Twist, Regrowth, Sol Ring, Wheel of Fortune
-Banned:Contract from Below, Darkpact, Demonic Attorney, Rebirth
+Banned:Contract from Below, Darkpact, Demonic Attorney, Rebirth
--- a/forge-gui/res/formats/Historic/DCI/Standard/1995-01.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/1995-01.txt
@@ -1,5 +1,5 @@
 [format]
-Name:Type II (Fourth Edition)
+Name:Type II (4ED)
 Type:Historic
 Subtype:Standard
 Effective:1995-01
--- a/forge-gui/res/formats/Historic/DCI/Standard/1995-06.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/1995-06.txt
@@ -1,5 +1,5 @@
 [format]
-Name:Type II (Ice Age)
+Name:Type II (ICE)
 Type:Historic
 Subtype:Standard
 Effective:1995-06
--- a/forge-gui/res/formats/Historic/DCI/Standard/1995-11-13.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/1995-11-13.txt
@@ -1,5 +1,5 @@
 [format]
-Name:Type II (Homelands)
+Name:Type II (HML)
 Type:Historic
 Subtype:Standard
 Effective:1995-11-13
--- a/forge-gui/res/formats/Historic/DCI/Standard/2018-07-13.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/2018-07-13.txt
@@ -2,6 +2,6 @@
 Name:Standard (Core Set 2019)
 Type:Historic
 Subtype:Standard
-Effective:2018-07-14
+Effective:2018-07-13
 Sets:KLD, AER, W17, AKH, HOU, XLN, RIX, DOM, M19
 Banned:Aetherworks Marvel; Attune with Aether; Felidar Guardian; Rampaging Ferocidon; Ramunap Ruins; Rogue Refiner; Smuggler's Copter
--- a/forge-gui/res/formats/Historic/DCI/Standard/2018-10-05.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/2018-10-05.txt
@@ -2,6 +2,6 @@
 Name:Standard (Guilds of Ravnica)
 Type:Historic
 Subtype:Standard
-Effective:2018-10-06
+Effective:2018-10-05
 Sets:XLN, RIX, DOM, M19, GRN
 Banned:Rampaging Ferocidon
--- a/forge-gui/res/formats/Historic/DCI/Standard/2019-05-03.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/2019-05-03.txt
@@ -2,6 +2,6 @@
 Name:Standard (War of the Spark)
 Type:Historic
 Subtype:Standard
-Effective:2019-05-24
+Effective:2019-05-03
 Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR
-Banned:Rampaging Ferocidon
+Banned:Rampaging Ferocidon
--- a/forge-gui/res/formats/Historic/DCI/Standard/2021-07-23.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/2021-07-23.txt
@@ -0,0 +1,7 @@
 [format]
 Name:Standard (AFR)
 Type:Historic
 Subtype:Standard
 Effective:2021-07-23
 Sets:ELD, THB, IKO, M21, ZNR, KHM, STX, AFR
 Banned: Cauldron Familiar; Escape to the Wilds; Fires of Invention; Lucky Clover; Oko, Thief of Crowns; Omnath, Locus of Creation; Once Upon a Time; Uro, Titan of Nature's Wrath
--- a/forge-gui/res/formats/Historic/DCI/Standard/2021-09-24.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/2021-09-24.txt
@@ -0,0 +1,7 @@
 [format]
 Name:Standard (MID)
 Type:Historic
 Subtype:Standard
 Effective:2021-09-24
 Sets:ZNR, KHM, STX, AFR, MID
 Banned: Omnath, Locus of Creation
--- a/forge-gui/res/formats/Historic/DCI/Standard/2021-11-19.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/2021-11-19.txt
@@ -0,0 +1,7 @@
 [format]
 Name:Standard (VOW)
 Type:Historic
 Subtype:Standard
 Effective:2021-11-19
 Sets:ZNR, KHM, STX, AFR, MID, VOW
 Banned: Omnath, Locus of Creation
--- a/forge-gui/res/formats/Historic/DCI/Standard/2022-01-25.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/2022-01-25.txt
@@ -0,0 +1,7 @@
 [format]
 Name:Standard (2022-01-25)
 Type:Historic
 Subtype:Standard
 Effective:2022-01-25
 Sets:ZNR, KHM, STX, AFR, MID, VOW
 Banned:Alrund's Epiphany; Divide by Zero; Faceless Haven; Omnath, Locus of Creation
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2018-06-22.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/China/2018-06-22.txt
@@ -1,7 +1,7 @@
 [format]
-Name:China Standard (Jiang Yanggu & Mu Yanling)
+Name:China Standard (GS1)
 Type:Historic
 Subtype:Standard
 Effective:2018-06-22
 Sets:KLD, AER, W17, AKH, HOU, XLN, RIX, DOM, GS1
-Banned:Aetherworks Marvel; Attune with Aether; Felidar Guardian; Rampaging Ferocidon; Ramunap Ruins; Rogue Refiner; Smuggler's Copter
+Banned:Aetherworks Marvel; Attune with Aether; Felidar Guardian; Rampaging Ferocidon; Ramunap Ruins; Rogue Refiner; Smuggler's Copter
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2018-07-13.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/China/2018-07-13.txt
@@ -1,7 +1,7 @@
 [format]
-Name:China Standard (Core Set 2019)
+Name:China Standard (M19)
 Type:Historic
 Subtype:Standard
-Effective:2018-07-14
+Effective:2018-07-13
 Sets:KLD, AER, W17, AKH, HOU, XLN, RIX, DOM, GS1, M19
-Banned:Aetherworks Marvel; Attune with Aether; Felidar Guardian; Rampaging Ferocidon; Ramunap Ruins; Rogue Refiner; Smuggler's Copter
+Banned:Aetherworks Marvel; Attune with Aether; Felidar Guardian; Rampaging Ferocidon; Ramunap Ruins; Rogue Refiner; Smuggler's Copter
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2018-10-05.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/China/2018-10-05.txt
@@ -0,0 +1,7 @@
 [format]
 Name:China Standard (GRN)
 Type:Historic
 Subtype:Standard
 Effective:2018-10-05
 Sets:XLN, RIX, DOM, GS1, M19, GRN
 Banned:Rampaging Ferocidon
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2018-10-06.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/China/2018-10-06.txt
@@ -1,7 +0,0 @@
 [format]
 Name:China Standard (Guilds of Ravnica)
 Type:Historic
 Subtype:Standard
 Effective:2018-10-06
 Sets:XLN, RIX, DOM, GS1, M19, GRN
 Banned:Rampaging Ferocidon
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2018-11-16.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/China/2018-11-16.txt
@@ -1,7 +1,7 @@
 [format]
-Name:China Standard (Gift Pack 2018)
+Name:China Standard (G18)
 Type:Historic
 Subtype:Standard
 Effective:2018-11-16
 Sets:XLN, RIX, DOM, GS1, M19, GRN, G18
-Banned:Rampaging Ferocidon
+Banned:Rampaging Ferocidon
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2019-01-25.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/China/2019-01-25.txt
@@ -1,7 +1,7 @@
 [format]
-Name:China Standard (Ravnica Allegiance)
+Name:China Standard (RNA)
 Type:Historic
 Subtype:Standard
 Effective:2019-01-25
 Sets:XLN, RIX, DOM, GS1, M19, GRN, G18, RNA
-Banned:Rampaging Ferocidon
+Banned:Rampaging Ferocidon
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2019-05-03.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/China/2019-05-03.txt
@@ -1,7 +1,7 @@
 [format]
-Name:China Standard (War of the Spark)
+Name:China Standard (WAR)
 Type:Historic
 Subtype:Standard
-Effective:2019-05-24
+Effective:2019-05-03
 Sets:XLN, RIX, DOM, GS1, M19, GRN, G18, RNA, WAR
-Banned:Rampaging Ferocidon
+Banned:Rampaging Ferocidon
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2019-07-12.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/China/2019-07-12.txt
@@ -0,0 +1,7 @@
 [format]
 Name:China Standard (M20)
 Type:Historic
 Subtype:Standard
 Effective:2019-07-12
 Sets:XLN, RIX, DOM, GS1, M19, GRN, G18, RNA, WAR, M20
 Banned:Rampaging Ferocidon
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2019-08-30.txt
+++ b/forge-gui/res/formats/Historic/DCI/Standard/China/2019-08-30.txt
@@ -0,0 +1,7 @@
 [format]
 Name:China Standard (2019-08-30)
 Type:Historic
 Subtype:Standard
 Effective:2019-08-30
 Retired:2019-10-03
 Sets:XLN, RIX, DOM, GS1, M19, GRN, G18, RNA, WAR, M20