From d9626a27741a43ecb7c396f29027ce9dca5f856c Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 12 Nov 2016 23:57:22 +0000 Subject: [PATCH] Fix more misspellings and differentiate Ashling and Maralen decks a bit --- .gitattributes | 10 +++++----- .../Lorwyn-Shadowmoor/Ancient Amphitheater/_events.txt | 2 +- ... the Mornsong-vanguard.dck => Maralen Vanguard.dck} | 0 ...of the Mornsong.dck => Maralen of the Mornsong.dck} | 0 .../Lorwyn-Shadowmoor/Gilt-Leaf Palace/_events.txt | 4 ++-- ...shling, the Pilgrim.dck => Ashling the Pilgrim.dck} | 0 ...g the Extinguisher-VAN.dck => The Extinguisher.dck} | 0 .../{Ashling the Pilgrim-VAN.dck => The Pilgrim.dck} | 0 .../planes/Lorwyn-Shadowmoor/Primal Beyond/_events.txt | 6 +++--- 9 files changed, 11 insertions(+), 11 deletions(-) rename forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf Palace/{Maralen of the Mornsong-vanguard.dck => Maralen Vanguard.dck} (100%) rename forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf Palace/{Malaren of the Mornsong.dck => Maralen of the Mornsong.dck} (100%) rename forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/{Ashling, the Pilgrim.dck => Ashling the Pilgrim.dck} (100%) rename forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/{Ashling the Extinguisher-VAN.dck => The Extinguisher.dck} (100%) rename forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/{Ashling the Pilgrim-VAN.dck => The Pilgrim.dck} (100%) diff --git a/.gitattributes b/.gitattributes index 7a3b390f7fa..7b43b1c6aba 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17847,8 +17847,8 @@ forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf[!!-~]Palace/Dwynen,[!! forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf[!!-~]Palace/Elvish[!!-~]Persistence.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf[!!-~]Palace/Eyeblight[!!-~]Hunters.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf[!!-~]Palace/Liliana[!!-~]Vess.dck -text -forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf[!!-~]Palace/Malaren[!!-~]of[!!-~]the[!!-~]Mornsong.dck -text -forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf[!!-~]Palace/Maralen[!!-~]of[!!-~]the[!!-~]Mornsong-vanguard.dck -text +forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf[!!-~]Palace/Maralen[!!-~]Vanguard.dck -text +forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf[!!-~]Palace/Maralen[!!-~]of[!!-~]the[!!-~]Mornsong.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf[!!-~]Palace/Nath[!!-~]of[!!-~]the[!!-~]Gilt-Leaf.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf[!!-~]Palace/Rhys[!!-~]the[!!-~]Exiled.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf[!!-~]Palace/Rhys[!!-~]the[!!-~]Redeemed.dck -text @@ -17863,15 +17863,15 @@ forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Murmuring[!!-~]Bosk/Shields[!!-~ forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Murmuring[!!-~]Bosk/Towers[!!-~]of[!!-~]Siege.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Murmuring[!!-~]Bosk/Under[!!-~]the[!!-~]Bridge.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Murmuring[!!-~]Bosk/_events.txt -text -forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal[!!-~]Beyond/Ashling[!!-~]the[!!-~]Extinguisher-VAN.dck -text -forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal[!!-~]Beyond/Ashling[!!-~]the[!!-~]Pilgrim-VAN.dck -text +forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal[!!-~]Beyond/Ashling[!!-~]the[!!-~]Pilgrim.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal[!!-~]Beyond/Ashling,[!!-~]the[!!-~]Extinguisher.dck -text -forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal[!!-~]Beyond/Ashling,[!!-~]the[!!-~]Pilgrim.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal[!!-~]Beyond/Elementals[!!-~]of[!!-~]Lorwyn.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal[!!-~]Beyond/Horde[!!-~]of[!!-~]Notions.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal[!!-~]Beyond/Marath,[!!-~]Will[!!-~]of[!!-~]the[!!-~]Wild.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal[!!-~]Beyond/Mirror[!!-~]Entity-VAN.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal[!!-~]Beyond/Reaper[!!-~]King.dck -text +forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal[!!-~]Beyond/The[!!-~]Extinguisher.dck -text +forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal[!!-~]Beyond/The[!!-~]Pilgrim.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal[!!-~]Beyond/_events.txt -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Rustic[!!-~]Clachan/Ajani[!!-~]Goldmane.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Rustic[!!-~]Clachan/Brigid,[!!-~]Hero[!!-~]of[!!-~]Kinsbaile.dck -text diff --git a/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Ancient Amphitheater/_events.txt b/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Ancient Amphitheater/_events.txt index 621faf881f3..9911cf6f290 100644 --- a/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Ancient Amphitheater/_events.txt +++ b/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Ancient Amphitheater/_events.txt @@ -1,4 +1,4 @@ -Name:Brion Stoutarm|Deck:Brion Stoutarm.dck|Variant:Commander|Avatar:Brion Soutarm|Desc: +Name:Brion Stoutarm|Deck:Brion Stoutarm.dck|Variant:Commander|Avatar:Brion Stoutarm|Desc: Name:Chandra|Deck:Chandra.dck|Variant:Planeswalker|Avatar:Chandra Nalaar|Desc: Name:Giants & Kithkin|Deck:Giants & Kithkin.dck|Variant:None|Avatar:Cloudgoat Ranger|Desc: Name:Giants|Deck:Giants.dck|Variant:None|Avatar:Hamletback Goliath|Desc: diff --git a/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf Palace/Maralen of the Mornsong-vanguard.dck b/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf Palace/Maralen Vanguard.dck similarity index 100% rename from forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf Palace/Maralen of the Mornsong-vanguard.dck rename to forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf Palace/Maralen Vanguard.dck diff --git a/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf Palace/Malaren of the Mornsong.dck b/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf Palace/Maralen of the Mornsong.dck similarity index 100% rename from forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf Palace/Malaren of the Mornsong.dck rename to forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf Palace/Maralen of the Mornsong.dck diff --git a/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf Palace/_events.txt b/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf Palace/_events.txt index aa2c2bc7eed..6f754882405 100644 --- a/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf Palace/_events.txt +++ b/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Gilt-Leaf Palace/_events.txt @@ -2,8 +2,8 @@ Name:Dwynen, Gilt-Leaf Daen|Deck:Dwynen, Gilt-Leaf Daen.dck|Variant:Commander|Av Name:Elvish Persistence|Deck:Elvish Persistence.dck|Variant:None|Avatar:Medicine Runner|Desc: Name:Eyeblight Hunters|Deck:Eyeblight Hunters.dck|Variant:None|Avatar:Hunter of Eyeblights|Desc: Name:Liliana Vess|Deck:Liliana Vess.dck|Variant:Planeswalker|Avatar:Liliana Vess|Desc: -Name:Malaren of the Mornsong|Deck:Malaren of the Mornsong-vanguard.dck|Variant:Vanguard|Avatar:Malaren of the Mornsong|Desc: -Name:Malaren of the Mornsong|Deck:Malaren of the Mornsong.dck|Variant:Commander|Avatar:Malaren of the Mornsong|Desc: +Name:Maralen|Deck:Maralen Vanguard.dck|Variant:Vanguard|Avatar:Maralen of the Mornsong|Desc: Name:Nath of the Gilt-Leaf|Nath of the Gilt-Leaf.dck|Variant:Commander|Avatar:Nath of the Gilt-Leaf|Desc: +Name:Maralen of the Mornsong|Deck:Maralen of the Mornsong.dck|Variant:Commander|Avatar:Maralen of the Mornsong|Desc: Name:Rhys the Exiled|Rhys the Exiled.dck|Variant:Commander|Avatar:Rhys the Exiled|Desc: Name:Rhys the Redeemed|Rhys the Redeemed.dck|Variant:Commander|Avatar:Rhys the Redeemed|Desc: \ No newline at end of file diff --git a/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/Ashling, the Pilgrim.dck b/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/Ashling the Pilgrim.dck similarity index 100% rename from forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/Ashling, the Pilgrim.dck rename to forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/Ashling the Pilgrim.dck diff --git a/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/Ashling the Extinguisher-VAN.dck b/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/The Extinguisher.dck similarity index 100% rename from forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/Ashling the Extinguisher-VAN.dck rename to forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/The Extinguisher.dck diff --git a/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/Ashling the Pilgrim-VAN.dck b/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/The Pilgrim.dck similarity index 100% rename from forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/Ashling the Pilgrim-VAN.dck rename to forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/The Pilgrim.dck diff --git a/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/_events.txt b/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/_events.txt index 0695b7b5794..eee97826c6a 100644 --- a/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/_events.txt +++ b/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Primal Beyond/_events.txt @@ -1,9 +1,9 @@ Name:Elementals of Lorwyn|Deck:Elementals of Lorwyn.dck|Variant:None|Avatar:Supreme Exemplar|Desc: Name:Ashling, the Extinguisher|Deck:Ashling, the Extinguisher.dck|Variant:Commander|Avatar:Ashling, the Extinguisher|Desc: -Name:Ashling, the Pilgrim|Deck:Ashling, the Pilgrim.dck|Variant:Commander|Avatar:Ashling, the Pilgrim|Desc: +Name:Ashling the Pilgrim|Deck:Ashling the Pilgrim.dck|Variant:Commander|Avatar:Ashling the Pilgrim|Desc: Name:Horde of Notions|Deck:Horde of Notions.dck|Variant:Commander|Avatar:Horde of Notions|Desc: Name:Marath, Will of the Wild|Deck:Marath, Will of the Wild.dck|Variant:Commander|Avatar:Marath, Will of the Wild|Desc: Name:Reaper King|Deck:Reaper King.dck|Variant:Commander|Avatar:Reaper King|Desc: -Name:Ashling the Extinguisher|Deck:Ashling the Extinguisher-VAN.dck|Variant:Vanguard|Avatar:Ashling the Extinguisher|Desc: -Name:Ashling the Pilgrim|Deck:Ashling the Pilgrim-VAN.dck|Variant:Vanguard|Avatar:Ashling the Pilgrim|Desc: +Name:The Extinguisher|Deck:The Extinguisher.dck|Variant:Vanguard|Avatar:Ashling, the Extinguisher|Desc: +Name:The Pilgrim|Deck:The Pilgrim.dck|Variant:Vanguard|Avatar:Ashling the Pilgrim|Desc: Name:Mirror Entity|Deck:Mirror Entity-VAN.dck|Variant:Vanguard|Avatar:Mirror Entity|Desc: \ No newline at end of file