From f05d8e9b80f00cc5379242c518bfe78fc79a1bfb Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Wed, 5 Jun 2013 19:42:25 +0000 Subject: [PATCH] renamed again... previous name was too similiar to cardsfolder --- .gitattributes | 220 +++++++++--------- .../Alara Reborn.txt | 0 res/{cardeditions => editions}/Alliances.txt | 0 .../Antiquities.txt | 0 res/{cardeditions => editions}/Apocalypse.txt | 0 .../Arabian Nights.txt | 0 res/{cardeditions => editions}/Archenemy.txt | 0 .../Avacyn Restored.txt | 0 .../Betrayers of Kamigawa.txt | 0 .../Champions of Kamigawa.txt | 0 res/{cardeditions => editions}/Chronicles.txt | 0 .../Classic Sixth Edition.txt | 0 res/{cardeditions => editions}/Coldsnap.txt | 0 .../Commander's Arsenal.txt | 0 res/{cardeditions => editions}/Commander.txt | 0 res/{cardeditions => editions}/Conflux.txt | 0 .../Dark Ascension.txt | 0 res/{cardeditions => editions}/Darksteel.txt | 0 res/{cardeditions => editions}/Dissension.txt | 0 .../Dragon's Maze.txt | 0 .../Duel Decks Ajani vs. Nicol Bolas.txt | 0 .../Duel Decks Divine vs. Demonic.txt | 0 .../Duel Decks Elspeth vs. Tezzeret.txt | 0 .../Duel Decks Elves vs. Goblins.txt | 0 .../Duel Decks Garruk vs. Liliana.txt | 0 .../Duel Decks Izzet vs. Golgari.txt | 0 .../Duel Decks Jace vs. Chandra.txt | 0 .../Duel Decks Knights vs. Dragons.txt | 0 .../Duel Decks Phyrexia vs. the Coalition.txt | 0 .../Duel Decks Sorin vs. Tibalt.txt | 0 .../Duel Decks Venser vs. Koth.txt | 0 .../Eighth Edition.txt | 0 res/{cardeditions => editions}/Eventide.txt | 0 res/{cardeditions => editions}/Exodus.txt | 0 .../Fallen Empires.txt | 0 res/{cardeditions => editions}/Fifth Dawn.txt | 0 .../Fifth Edition.txt | 0 .../Fourth Edition.txt | 0 .../From the Vault Dragons.txt | 0 .../From the Vault Exiled.txt | 0 .../From the Vault Legends.txt | 0 .../From the Vault Realms.txt | 0 .../From the Vault Relics.txt | 0 .../Future Sight.txt | 0 res/{cardeditions => editions}/Gatecrash.txt | 0 res/{cardeditions => editions}/Guildpact.txt | 0 res/{cardeditions => editions}/Homelands.txt | 0 res/{cardeditions => editions}/Ice Age.txt | 0 res/{cardeditions => editions}/Innistrad.txt | 0 res/{cardeditions => editions}/Invasion.txt | 0 res/{cardeditions => editions}/Judgment.txt | 0 res/{cardeditions => editions}/Legends.txt | 0 res/{cardeditions => editions}/Legions.txt | 0 .../Limited Edition Alpha.txt | 0 .../Limited Edition Beta.txt | 0 res/{cardeditions => editions}/Lorwyn.txt | 0 res/{cardeditions => editions}/Magic 2010.txt | 0 res/{cardeditions => editions}/Magic 2011.txt | 0 res/{cardeditions => editions}/Magic 2012.txt | 0 res/{cardeditions => editions}/Magic 2013.txt | 0 .../Mercadian Masques.txt | 0 res/{cardeditions => editions}/Mirage.txt | 0 .../Mirrodin Besieged.txt | 0 res/{cardeditions => editions}/Mirrodin.txt | 0 .../Modern Masters.txt | 0 .../Morningtide.txt | 0 res/{cardeditions => editions}/Nemesis.txt | 0 .../New Phyrexia.txt | 0 .../Ninth Edition.txt | 0 res/{cardeditions => editions}/Odyssey.txt | 0 res/{cardeditions => editions}/Onslaught.txt | 0 .../Planar Chaos.txt | 0 .../Planechase 2012 Edition.txt | 0 res/{cardeditions => editions}/Planechase.txt | 0 res/{cardeditions => editions}/Planeshift.txt | 0 .../Portal Second Age.txt | 0 .../Portal Three Kingdoms.txt | 0 res/{cardeditions => editions}/Portal.txt | 0 ...Premium Deck Series Fire and Lightning.txt | 0 .../Premium Deck Series Graveborn.txt | 0 .../Premium Deck Series Slivers.txt | 0 .../Promo set for Gatherer.txt | 0 res/{cardeditions => editions}/Prophecy.txt | 0 .../Ravnica City of Guilds.txt | 0 .../Return to Ravnica.txt | 0 .../Revised Edition.txt | 0 .../Rise of the Eldrazi.txt | 0 .../Saviors of Kamigawa.txt | 0 .../Scars of Mirrodin.txt | 0 res/{cardeditions => editions}/Scourge.txt | 0 .../Seventh Edition.txt | 0 res/{cardeditions => editions}/Shadowmoor.txt | 0 .../Shards of Alara.txt | 0 .../Starter 1999.txt | 0 .../Starter 2000.txt | 0 res/{cardeditions => editions}/Stronghold.txt | 0 res/{cardeditions => editions}/Tempest.txt | 0 .../Tenth Edition.txt | 0 res/{cardeditions => editions}/The Dark.txt | 0 .../Time Spiral Timeshifted.txt | 0 .../Time Spiral.txt | 0 res/{cardeditions => editions}/Torment.txt | 0 .../Unlimited Edition.txt | 0 .../Urza's Destiny.txt | 0 .../Urza's Legacy.txt | 0 .../Urza's Saga.txt | 0 res/{cardeditions => editions}/Vanguard.txt | 0 res/{cardeditions => editions}/Visions.txt | 0 .../Weatherlight.txt | 0 res/{cardeditions => editions}/Worldwake.txt | 0 res/{cardeditions => editions}/Zendikar.txt | 0 src/main/java/forge/model/FModel.java | 2 +- tools/mtgdata-sets-to-forge.txt | 2 +- 113 files changed, 112 insertions(+), 112 deletions(-) rename res/{cardeditions => editions}/Alara Reborn.txt (100%) rename res/{cardeditions => editions}/Alliances.txt (100%) rename res/{cardeditions => editions}/Antiquities.txt (100%) rename res/{cardeditions => editions}/Apocalypse.txt (100%) rename res/{cardeditions => editions}/Arabian Nights.txt (100%) rename res/{cardeditions => editions}/Archenemy.txt (100%) rename res/{cardeditions => editions}/Avacyn Restored.txt (100%) rename res/{cardeditions => editions}/Betrayers of Kamigawa.txt (100%) rename res/{cardeditions => editions}/Champions of Kamigawa.txt (100%) rename res/{cardeditions => editions}/Chronicles.txt (100%) rename res/{cardeditions => editions}/Classic Sixth Edition.txt (100%) rename res/{cardeditions => editions}/Coldsnap.txt (100%) rename res/{cardeditions => editions}/Commander's Arsenal.txt (100%) rename res/{cardeditions => editions}/Commander.txt (100%) rename res/{cardeditions => editions}/Conflux.txt (100%) rename res/{cardeditions => editions}/Dark Ascension.txt (100%) rename res/{cardeditions => editions}/Darksteel.txt (100%) rename res/{cardeditions => editions}/Dissension.txt (100%) rename res/{cardeditions => editions}/Dragon's Maze.txt (100%) rename res/{cardeditions => editions}/Duel Decks Ajani vs. Nicol Bolas.txt (100%) rename res/{cardeditions => editions}/Duel Decks Divine vs. Demonic.txt (100%) rename res/{cardeditions => editions}/Duel Decks Elspeth vs. Tezzeret.txt (100%) rename res/{cardeditions => editions}/Duel Decks Elves vs. Goblins.txt (100%) rename res/{cardeditions => editions}/Duel Decks Garruk vs. Liliana.txt (100%) rename res/{cardeditions => editions}/Duel Decks Izzet vs. Golgari.txt (100%) rename res/{cardeditions => editions}/Duel Decks Jace vs. Chandra.txt (100%) rename res/{cardeditions => editions}/Duel Decks Knights vs. Dragons.txt (100%) rename res/{cardeditions => editions}/Duel Decks Phyrexia vs. the Coalition.txt (100%) rename res/{cardeditions => editions}/Duel Decks Sorin vs. Tibalt.txt (100%) rename res/{cardeditions => editions}/Duel Decks Venser vs. Koth.txt (100%) rename res/{cardeditions => editions}/Eighth Edition.txt (100%) rename res/{cardeditions => editions}/Eventide.txt (100%) rename res/{cardeditions => editions}/Exodus.txt (100%) rename res/{cardeditions => editions}/Fallen Empires.txt (100%) rename res/{cardeditions => editions}/Fifth Dawn.txt (100%) rename res/{cardeditions => editions}/Fifth Edition.txt (100%) rename res/{cardeditions => editions}/Fourth Edition.txt (100%) rename res/{cardeditions => editions}/From the Vault Dragons.txt (100%) rename res/{cardeditions => editions}/From the Vault Exiled.txt (100%) rename res/{cardeditions => editions}/From the Vault Legends.txt (100%) rename res/{cardeditions => editions}/From the Vault Realms.txt (100%) rename res/{cardeditions => editions}/From the Vault Relics.txt (100%) rename res/{cardeditions => editions}/Future Sight.txt (100%) rename res/{cardeditions => editions}/Gatecrash.txt (100%) rename res/{cardeditions => editions}/Guildpact.txt (100%) rename res/{cardeditions => editions}/Homelands.txt (100%) rename res/{cardeditions => editions}/Ice Age.txt (100%) rename res/{cardeditions => editions}/Innistrad.txt (100%) rename res/{cardeditions => editions}/Invasion.txt (100%) rename res/{cardeditions => editions}/Judgment.txt (100%) rename res/{cardeditions => editions}/Legends.txt (100%) rename res/{cardeditions => editions}/Legions.txt (100%) rename res/{cardeditions => editions}/Limited Edition Alpha.txt (100%) rename res/{cardeditions => editions}/Limited Edition Beta.txt (100%) rename res/{cardeditions => editions}/Lorwyn.txt (100%) rename res/{cardeditions => editions}/Magic 2010.txt (100%) rename res/{cardeditions => editions}/Magic 2011.txt (100%) rename res/{cardeditions => editions}/Magic 2012.txt (100%) rename res/{cardeditions => editions}/Magic 2013.txt (100%) rename res/{cardeditions => editions}/Mercadian Masques.txt (100%) rename res/{cardeditions => editions}/Mirage.txt (100%) rename res/{cardeditions => editions}/Mirrodin Besieged.txt (100%) rename res/{cardeditions => editions}/Mirrodin.txt (100%) rename res/{cardeditions => editions}/Modern Masters.txt (100%) rename res/{cardeditions => editions}/Morningtide.txt (100%) rename res/{cardeditions => editions}/Nemesis.txt (100%) rename res/{cardeditions => editions}/New Phyrexia.txt (100%) rename res/{cardeditions => editions}/Ninth Edition.txt (100%) rename res/{cardeditions => editions}/Odyssey.txt (100%) rename res/{cardeditions => editions}/Onslaught.txt (100%) rename res/{cardeditions => editions}/Planar Chaos.txt (100%) rename res/{cardeditions => editions}/Planechase 2012 Edition.txt (100%) rename res/{cardeditions => editions}/Planechase.txt (100%) rename res/{cardeditions => editions}/Planeshift.txt (100%) rename res/{cardeditions => editions}/Portal Second Age.txt (100%) rename res/{cardeditions => editions}/Portal Three Kingdoms.txt (100%) rename res/{cardeditions => editions}/Portal.txt (100%) rename res/{cardeditions => editions}/Premium Deck Series Fire and Lightning.txt (100%) rename res/{cardeditions => editions}/Premium Deck Series Graveborn.txt (100%) rename res/{cardeditions => editions}/Premium Deck Series Slivers.txt (100%) rename res/{cardeditions => editions}/Promo set for Gatherer.txt (100%) rename res/{cardeditions => editions}/Prophecy.txt (100%) rename res/{cardeditions => editions}/Ravnica City of Guilds.txt (100%) rename res/{cardeditions => editions}/Return to Ravnica.txt (100%) rename res/{cardeditions => editions}/Revised Edition.txt (100%) rename res/{cardeditions => editions}/Rise of the Eldrazi.txt (100%) rename res/{cardeditions => editions}/Saviors of Kamigawa.txt (100%) rename res/{cardeditions => editions}/Scars of Mirrodin.txt (100%) rename res/{cardeditions => editions}/Scourge.txt (100%) rename res/{cardeditions => editions}/Seventh Edition.txt (100%) rename res/{cardeditions => editions}/Shadowmoor.txt (100%) rename res/{cardeditions => editions}/Shards of Alara.txt (100%) rename res/{cardeditions => editions}/Starter 1999.txt (100%) rename res/{cardeditions => editions}/Starter 2000.txt (100%) rename res/{cardeditions => editions}/Stronghold.txt (100%) rename res/{cardeditions => editions}/Tempest.txt (100%) rename res/{cardeditions => editions}/Tenth Edition.txt (100%) rename res/{cardeditions => editions}/The Dark.txt (100%) rename res/{cardeditions => editions}/Time Spiral Timeshifted.txt (100%) rename res/{cardeditions => editions}/Time Spiral.txt (100%) rename res/{cardeditions => editions}/Torment.txt (100%) rename res/{cardeditions => editions}/Unlimited Edition.txt (100%) rename res/{cardeditions => editions}/Urza's Destiny.txt (100%) rename res/{cardeditions => editions}/Urza's Legacy.txt (100%) rename res/{cardeditions => editions}/Urza's Saga.txt (100%) rename res/{cardeditions => editions}/Vanguard.txt (100%) rename res/{cardeditions => editions}/Visions.txt (100%) rename res/{cardeditions => editions}/Weatherlight.txt (100%) rename res/{cardeditions => editions}/Worldwake.txt (100%) rename res/{cardeditions => editions}/Zendikar.txt (100%) diff --git a/.gitattributes b/.gitattributes index 49ad8772ec5..78a9d9d66ba 100644 --- a/.gitattributes +++ b/.gitattributes @@ -18,116 +18,6 @@ res/blockdata/fatpacks.txt -text res/blockdata/formats.txt -text res/blockdata/printsheets.txt -text res/blockdata/starters.txt -text -res/cardeditions/Alara[!!-~]Reborn.txt -text -res/cardeditions/Alliances.txt -text -res/cardeditions/Antiquities.txt -text -res/cardeditions/Apocalypse.txt -text -res/cardeditions/Arabian[!!-~]Nights.txt -text -res/cardeditions/Archenemy.txt -text -res/cardeditions/Avacyn[!!-~]Restored.txt -text -res/cardeditions/Betrayers[!!-~]of[!!-~]Kamigawa.txt -text -res/cardeditions/Champions[!!-~]of[!!-~]Kamigawa.txt -text -res/cardeditions/Chronicles.txt -text -res/cardeditions/Classic[!!-~]Sixth[!!-~]Edition.txt -text -res/cardeditions/Coldsnap.txt -text -res/cardeditions/Commander's[!!-~]Arsenal.txt -text -res/cardeditions/Commander.txt -text -res/cardeditions/Conflux.txt -text -res/cardeditions/Dark[!!-~]Ascension.txt -text -res/cardeditions/Darksteel.txt -text -res/cardeditions/Dissension.txt -text -res/cardeditions/Dragon's[!!-~]Maze.txt -text -res/cardeditions/Duel[!!-~]Decks[!!-~]Ajani[!!-~]vs.[!!-~]Nicol[!!-~]Bolas.txt -text -res/cardeditions/Duel[!!-~]Decks[!!-~]Divine[!!-~]vs.[!!-~]Demonic.txt -text -res/cardeditions/Duel[!!-~]Decks[!!-~]Elspeth[!!-~]vs.[!!-~]Tezzeret.txt -text -res/cardeditions/Duel[!!-~]Decks[!!-~]Elves[!!-~]vs.[!!-~]Goblins.txt -text -res/cardeditions/Duel[!!-~]Decks[!!-~]Garruk[!!-~]vs.[!!-~]Liliana.txt -text -res/cardeditions/Duel[!!-~]Decks[!!-~]Izzet[!!-~]vs.[!!-~]Golgari.txt -text -res/cardeditions/Duel[!!-~]Decks[!!-~]Jace[!!-~]vs.[!!-~]Chandra.txt -text -res/cardeditions/Duel[!!-~]Decks[!!-~]Knights[!!-~]vs.[!!-~]Dragons.txt -text -res/cardeditions/Duel[!!-~]Decks[!!-~]Phyrexia[!!-~]vs.[!!-~]the[!!-~]Coalition.txt -text -res/cardeditions/Duel[!!-~]Decks[!!-~]Sorin[!!-~]vs.[!!-~]Tibalt.txt -text -res/cardeditions/Duel[!!-~]Decks[!!-~]Venser[!!-~]vs.[!!-~]Koth.txt -text -res/cardeditions/Eighth[!!-~]Edition.txt -text -res/cardeditions/Eventide.txt -text -res/cardeditions/Exodus.txt -text -res/cardeditions/Fallen[!!-~]Empires.txt -text -res/cardeditions/Fifth[!!-~]Dawn.txt -text -res/cardeditions/Fifth[!!-~]Edition.txt -text -res/cardeditions/Fourth[!!-~]Edition.txt -text -res/cardeditions/From[!!-~]the[!!-~]Vault[!!-~]Dragons.txt -text -res/cardeditions/From[!!-~]the[!!-~]Vault[!!-~]Exiled.txt -text -res/cardeditions/From[!!-~]the[!!-~]Vault[!!-~]Legends.txt -text -res/cardeditions/From[!!-~]the[!!-~]Vault[!!-~]Realms.txt -text -res/cardeditions/From[!!-~]the[!!-~]Vault[!!-~]Relics.txt -text -res/cardeditions/Future[!!-~]Sight.txt -text -res/cardeditions/Gatecrash.txt -text -res/cardeditions/Guildpact.txt -text -res/cardeditions/Homelands.txt -text -res/cardeditions/Ice[!!-~]Age.txt -text -res/cardeditions/Innistrad.txt -text -res/cardeditions/Invasion.txt -text -res/cardeditions/Judgment.txt -text -res/cardeditions/Legends.txt -text -res/cardeditions/Legions.txt -text -res/cardeditions/Limited[!!-~]Edition[!!-~]Alpha.txt -text -res/cardeditions/Limited[!!-~]Edition[!!-~]Beta.txt -text -res/cardeditions/Lorwyn.txt -text -res/cardeditions/Magic[!!-~]2010.txt -text -res/cardeditions/Magic[!!-~]2011.txt -text -res/cardeditions/Magic[!!-~]2012.txt -text -res/cardeditions/Magic[!!-~]2013.txt -text -res/cardeditions/Mercadian[!!-~]Masques.txt -text -res/cardeditions/Mirage.txt -text -res/cardeditions/Mirrodin[!!-~]Besieged.txt -text -res/cardeditions/Mirrodin.txt -text -res/cardeditions/Modern[!!-~]Masters.txt -text -res/cardeditions/Morningtide.txt -text -res/cardeditions/Nemesis.txt -text -res/cardeditions/New[!!-~]Phyrexia.txt -text -res/cardeditions/Ninth[!!-~]Edition.txt -text -res/cardeditions/Odyssey.txt -text -res/cardeditions/Onslaught.txt -text -res/cardeditions/Planar[!!-~]Chaos.txt -text -res/cardeditions/Planechase[!!-~]2012[!!-~]Edition.txt -text -res/cardeditions/Planechase.txt -text -res/cardeditions/Planeshift.txt -text -res/cardeditions/Portal[!!-~]Second[!!-~]Age.txt -text -res/cardeditions/Portal[!!-~]Three[!!-~]Kingdoms.txt -text -res/cardeditions/Portal.txt -text -res/cardeditions/Premium[!!-~]Deck[!!-~]Series[!!-~]Fire[!!-~]and[!!-~]Lightning.txt -text -res/cardeditions/Premium[!!-~]Deck[!!-~]Series[!!-~]Graveborn.txt -text -res/cardeditions/Premium[!!-~]Deck[!!-~]Series[!!-~]Slivers.txt -text -res/cardeditions/Promo[!!-~]set[!!-~]for[!!-~]Gatherer.txt -text -res/cardeditions/Prophecy.txt -text -res/cardeditions/Ravnica[!!-~]City[!!-~]of[!!-~]Guilds.txt -text -res/cardeditions/Return[!!-~]to[!!-~]Ravnica.txt -text -res/cardeditions/Revised[!!-~]Edition.txt -text -res/cardeditions/Rise[!!-~]of[!!-~]the[!!-~]Eldrazi.txt -text -res/cardeditions/Saviors[!!-~]of[!!-~]Kamigawa.txt -text -res/cardeditions/Scars[!!-~]of[!!-~]Mirrodin.txt -text -res/cardeditions/Scourge.txt -text -res/cardeditions/Seventh[!!-~]Edition.txt -text -res/cardeditions/Shadowmoor.txt -text -res/cardeditions/Shards[!!-~]of[!!-~]Alara.txt -text -res/cardeditions/Starter[!!-~]1999.txt -text -res/cardeditions/Starter[!!-~]2000.txt -text -res/cardeditions/Stronghold.txt -text -res/cardeditions/Tempest.txt -text -res/cardeditions/Tenth[!!-~]Edition.txt -text -res/cardeditions/The[!!-~]Dark.txt -text -res/cardeditions/Time[!!-~]Spiral[!!-~]Timeshifted.txt -text -res/cardeditions/Time[!!-~]Spiral.txt -text -res/cardeditions/Torment.txt -text -res/cardeditions/Unlimited[!!-~]Edition.txt -text -res/cardeditions/Urza's[!!-~]Destiny.txt -text -res/cardeditions/Urza's[!!-~]Legacy.txt -text -res/cardeditions/Urza's[!!-~]Saga.txt -text -res/cardeditions/Vanguard.txt -text -res/cardeditions/Visions.txt -text -res/cardeditions/Weatherlight.txt -text -res/cardeditions/Worldwake.txt -text -res/cardeditions/Zendikar.txt -text res/cardsfolder/a/a_display_of_my_dark_power.txt -text res/cardsfolder/a/abandon_hope.txt -text res/cardsfolder/a/abandoned_outpost.txt svneol=native#text/plain @@ -12916,6 +12806,116 @@ res/defaults/match.xml svneol=native#text/xml res/draft/cube_juzamjedi.draft -text res/draft/cube_skiera.draft -text res/draft/rankings.txt -text +res/editions/Alara[!!-~]Reborn.txt -text +res/editions/Alliances.txt -text +res/editions/Antiquities.txt -text +res/editions/Apocalypse.txt -text +res/editions/Arabian[!!-~]Nights.txt -text +res/editions/Archenemy.txt -text +res/editions/Avacyn[!!-~]Restored.txt -text +res/editions/Betrayers[!!-~]of[!!-~]Kamigawa.txt -text +res/editions/Champions[!!-~]of[!!-~]Kamigawa.txt -text +res/editions/Chronicles.txt -text +res/editions/Classic[!!-~]Sixth[!!-~]Edition.txt -text +res/editions/Coldsnap.txt -text +res/editions/Commander's[!!-~]Arsenal.txt -text +res/editions/Commander.txt -text +res/editions/Conflux.txt -text +res/editions/Dark[!!-~]Ascension.txt -text +res/editions/Darksteel.txt -text +res/editions/Dissension.txt -text +res/editions/Dragon's[!!-~]Maze.txt -text +res/editions/Duel[!!-~]Decks[!!-~]Ajani[!!-~]vs.[!!-~]Nicol[!!-~]Bolas.txt -text +res/editions/Duel[!!-~]Decks[!!-~]Divine[!!-~]vs.[!!-~]Demonic.txt -text +res/editions/Duel[!!-~]Decks[!!-~]Elspeth[!!-~]vs.[!!-~]Tezzeret.txt -text +res/editions/Duel[!!-~]Decks[!!-~]Elves[!!-~]vs.[!!-~]Goblins.txt -text +res/editions/Duel[!!-~]Decks[!!-~]Garruk[!!-~]vs.[!!-~]Liliana.txt -text +res/editions/Duel[!!-~]Decks[!!-~]Izzet[!!-~]vs.[!!-~]Golgari.txt -text +res/editions/Duel[!!-~]Decks[!!-~]Jace[!!-~]vs.[!!-~]Chandra.txt -text +res/editions/Duel[!!-~]Decks[!!-~]Knights[!!-~]vs.[!!-~]Dragons.txt -text +res/editions/Duel[!!-~]Decks[!!-~]Phyrexia[!!-~]vs.[!!-~]the[!!-~]Coalition.txt -text +res/editions/Duel[!!-~]Decks[!!-~]Sorin[!!-~]vs.[!!-~]Tibalt.txt -text +res/editions/Duel[!!-~]Decks[!!-~]Venser[!!-~]vs.[!!-~]Koth.txt -text +res/editions/Eighth[!!-~]Edition.txt -text +res/editions/Eventide.txt -text +res/editions/Exodus.txt -text +res/editions/Fallen[!!-~]Empires.txt -text +res/editions/Fifth[!!-~]Dawn.txt -text +res/editions/Fifth[!!-~]Edition.txt -text +res/editions/Fourth[!!-~]Edition.txt -text +res/editions/From[!!-~]the[!!-~]Vault[!!-~]Dragons.txt -text +res/editions/From[!!-~]the[!!-~]Vault[!!-~]Exiled.txt -text +res/editions/From[!!-~]the[!!-~]Vault[!!-~]Legends.txt -text +res/editions/From[!!-~]the[!!-~]Vault[!!-~]Realms.txt -text +res/editions/From[!!-~]the[!!-~]Vault[!!-~]Relics.txt -text +res/editions/Future[!!-~]Sight.txt -text +res/editions/Gatecrash.txt -text +res/editions/Guildpact.txt -text +res/editions/Homelands.txt -text +res/editions/Ice[!!-~]Age.txt -text +res/editions/Innistrad.txt -text +res/editions/Invasion.txt -text +res/editions/Judgment.txt -text +res/editions/Legends.txt -text +res/editions/Legions.txt -text +res/editions/Limited[!!-~]Edition[!!-~]Alpha.txt -text +res/editions/Limited[!!-~]Edition[!!-~]Beta.txt -text +res/editions/Lorwyn.txt -text +res/editions/Magic[!!-~]2010.txt -text +res/editions/Magic[!!-~]2011.txt -text +res/editions/Magic[!!-~]2012.txt -text +res/editions/Magic[!!-~]2013.txt -text +res/editions/Mercadian[!!-~]Masques.txt -text +res/editions/Mirage.txt -text +res/editions/Mirrodin[!!-~]Besieged.txt -text +res/editions/Mirrodin.txt -text +res/editions/Modern[!!-~]Masters.txt -text +res/editions/Morningtide.txt -text +res/editions/Nemesis.txt -text +res/editions/New[!!-~]Phyrexia.txt -text +res/editions/Ninth[!!-~]Edition.txt -text +res/editions/Odyssey.txt -text +res/editions/Onslaught.txt -text +res/editions/Planar[!!-~]Chaos.txt -text +res/editions/Planechase[!!-~]2012[!!-~]Edition.txt -text +res/editions/Planechase.txt -text +res/editions/Planeshift.txt -text +res/editions/Portal[!!-~]Second[!!-~]Age.txt -text +res/editions/Portal[!!-~]Three[!!-~]Kingdoms.txt -text +res/editions/Portal.txt -text +res/editions/Premium[!!-~]Deck[!!-~]Series[!!-~]Fire[!!-~]and[!!-~]Lightning.txt -text +res/editions/Premium[!!-~]Deck[!!-~]Series[!!-~]Graveborn.txt -text +res/editions/Premium[!!-~]Deck[!!-~]Series[!!-~]Slivers.txt -text +res/editions/Promo[!!-~]set[!!-~]for[!!-~]Gatherer.txt -text +res/editions/Prophecy.txt -text +res/editions/Ravnica[!!-~]City[!!-~]of[!!-~]Guilds.txt -text +res/editions/Return[!!-~]to[!!-~]Ravnica.txt -text +res/editions/Revised[!!-~]Edition.txt -text +res/editions/Rise[!!-~]of[!!-~]the[!!-~]Eldrazi.txt -text +res/editions/Saviors[!!-~]of[!!-~]Kamigawa.txt -text +res/editions/Scars[!!-~]of[!!-~]Mirrodin.txt -text +res/editions/Scourge.txt -text +res/editions/Seventh[!!-~]Edition.txt -text +res/editions/Shadowmoor.txt -text +res/editions/Shards[!!-~]of[!!-~]Alara.txt -text +res/editions/Starter[!!-~]1999.txt -text +res/editions/Starter[!!-~]2000.txt -text +res/editions/Stronghold.txt -text +res/editions/Tempest.txt -text +res/editions/Tenth[!!-~]Edition.txt -text +res/editions/The[!!-~]Dark.txt -text +res/editions/Time[!!-~]Spiral[!!-~]Timeshifted.txt -text +res/editions/Time[!!-~]Spiral.txt -text +res/editions/Torment.txt -text +res/editions/Unlimited[!!-~]Edition.txt -text +res/editions/Urza's[!!-~]Destiny.txt -text +res/editions/Urza's[!!-~]Legacy.txt -text +res/editions/Urza's[!!-~]Saga.txt -text +res/editions/Vanguard.txt -text +res/editions/Visions.txt -text +res/editions/Weatherlight.txt -text +res/editions/Worldwake.txt -text +res/editions/Zendikar.txt -text res/howto.txt svneol=native#text/plain res/licenses/java-yield-license.txt svneol=native#text/plain res/licenses/log4j-license.txt svneol=native#text/plain diff --git a/res/cardeditions/Alara Reborn.txt b/res/editions/Alara Reborn.txt similarity index 100% rename from res/cardeditions/Alara Reborn.txt rename to res/editions/Alara Reborn.txt diff --git a/res/cardeditions/Alliances.txt b/res/editions/Alliances.txt similarity index 100% rename from res/cardeditions/Alliances.txt rename to res/editions/Alliances.txt diff --git a/res/cardeditions/Antiquities.txt b/res/editions/Antiquities.txt similarity index 100% rename from res/cardeditions/Antiquities.txt rename to res/editions/Antiquities.txt diff --git a/res/cardeditions/Apocalypse.txt b/res/editions/Apocalypse.txt similarity index 100% rename from res/cardeditions/Apocalypse.txt rename to res/editions/Apocalypse.txt diff --git a/res/cardeditions/Arabian Nights.txt b/res/editions/Arabian Nights.txt similarity index 100% rename from res/cardeditions/Arabian Nights.txt rename to res/editions/Arabian Nights.txt diff --git a/res/cardeditions/Archenemy.txt b/res/editions/Archenemy.txt similarity index 100% rename from res/cardeditions/Archenemy.txt rename to res/editions/Archenemy.txt diff --git a/res/cardeditions/Avacyn Restored.txt b/res/editions/Avacyn Restored.txt similarity index 100% rename from res/cardeditions/Avacyn Restored.txt rename to res/editions/Avacyn Restored.txt diff --git a/res/cardeditions/Betrayers of Kamigawa.txt b/res/editions/Betrayers of Kamigawa.txt similarity index 100% rename from res/cardeditions/Betrayers of Kamigawa.txt rename to res/editions/Betrayers of Kamigawa.txt diff --git a/res/cardeditions/Champions of Kamigawa.txt b/res/editions/Champions of Kamigawa.txt similarity index 100% rename from res/cardeditions/Champions of Kamigawa.txt rename to res/editions/Champions of Kamigawa.txt diff --git a/res/cardeditions/Chronicles.txt b/res/editions/Chronicles.txt similarity index 100% rename from res/cardeditions/Chronicles.txt rename to res/editions/Chronicles.txt diff --git a/res/cardeditions/Classic Sixth Edition.txt b/res/editions/Classic Sixth Edition.txt similarity index 100% rename from res/cardeditions/Classic Sixth Edition.txt rename to res/editions/Classic Sixth Edition.txt diff --git a/res/cardeditions/Coldsnap.txt b/res/editions/Coldsnap.txt similarity index 100% rename from res/cardeditions/Coldsnap.txt rename to res/editions/Coldsnap.txt diff --git a/res/cardeditions/Commander's Arsenal.txt b/res/editions/Commander's Arsenal.txt similarity index 100% rename from res/cardeditions/Commander's Arsenal.txt rename to res/editions/Commander's Arsenal.txt diff --git a/res/cardeditions/Commander.txt b/res/editions/Commander.txt similarity index 100% rename from res/cardeditions/Commander.txt rename to res/editions/Commander.txt diff --git a/res/cardeditions/Conflux.txt b/res/editions/Conflux.txt similarity index 100% rename from res/cardeditions/Conflux.txt rename to res/editions/Conflux.txt diff --git a/res/cardeditions/Dark Ascension.txt b/res/editions/Dark Ascension.txt similarity index 100% rename from res/cardeditions/Dark Ascension.txt rename to res/editions/Dark Ascension.txt diff --git a/res/cardeditions/Darksteel.txt b/res/editions/Darksteel.txt similarity index 100% rename from res/cardeditions/Darksteel.txt rename to res/editions/Darksteel.txt diff --git a/res/cardeditions/Dissension.txt b/res/editions/Dissension.txt similarity index 100% rename from res/cardeditions/Dissension.txt rename to res/editions/Dissension.txt diff --git a/res/cardeditions/Dragon's Maze.txt b/res/editions/Dragon's Maze.txt similarity index 100% rename from res/cardeditions/Dragon's Maze.txt rename to res/editions/Dragon's Maze.txt diff --git a/res/cardeditions/Duel Decks Ajani vs. Nicol Bolas.txt b/res/editions/Duel Decks Ajani vs. Nicol Bolas.txt similarity index 100% rename from res/cardeditions/Duel Decks Ajani vs. Nicol Bolas.txt rename to res/editions/Duel Decks Ajani vs. Nicol Bolas.txt diff --git a/res/cardeditions/Duel Decks Divine vs. Demonic.txt b/res/editions/Duel Decks Divine vs. Demonic.txt similarity index 100% rename from res/cardeditions/Duel Decks Divine vs. Demonic.txt rename to res/editions/Duel Decks Divine vs. Demonic.txt diff --git a/res/cardeditions/Duel Decks Elspeth vs. Tezzeret.txt b/res/editions/Duel Decks Elspeth vs. Tezzeret.txt similarity index 100% rename from res/cardeditions/Duel Decks Elspeth vs. Tezzeret.txt rename to res/editions/Duel Decks Elspeth vs. Tezzeret.txt diff --git a/res/cardeditions/Duel Decks Elves vs. Goblins.txt b/res/editions/Duel Decks Elves vs. Goblins.txt similarity index 100% rename from res/cardeditions/Duel Decks Elves vs. Goblins.txt rename to res/editions/Duel Decks Elves vs. Goblins.txt diff --git a/res/cardeditions/Duel Decks Garruk vs. Liliana.txt b/res/editions/Duel Decks Garruk vs. Liliana.txt similarity index 100% rename from res/cardeditions/Duel Decks Garruk vs. Liliana.txt rename to res/editions/Duel Decks Garruk vs. Liliana.txt diff --git a/res/cardeditions/Duel Decks Izzet vs. Golgari.txt b/res/editions/Duel Decks Izzet vs. Golgari.txt similarity index 100% rename from res/cardeditions/Duel Decks Izzet vs. Golgari.txt rename to res/editions/Duel Decks Izzet vs. Golgari.txt diff --git a/res/cardeditions/Duel Decks Jace vs. Chandra.txt b/res/editions/Duel Decks Jace vs. Chandra.txt similarity index 100% rename from res/cardeditions/Duel Decks Jace vs. Chandra.txt rename to res/editions/Duel Decks Jace vs. Chandra.txt diff --git a/res/cardeditions/Duel Decks Knights vs. Dragons.txt b/res/editions/Duel Decks Knights vs. Dragons.txt similarity index 100% rename from res/cardeditions/Duel Decks Knights vs. Dragons.txt rename to res/editions/Duel Decks Knights vs. Dragons.txt diff --git a/res/cardeditions/Duel Decks Phyrexia vs. the Coalition.txt b/res/editions/Duel Decks Phyrexia vs. the Coalition.txt similarity index 100% rename from res/cardeditions/Duel Decks Phyrexia vs. the Coalition.txt rename to res/editions/Duel Decks Phyrexia vs. the Coalition.txt diff --git a/res/cardeditions/Duel Decks Sorin vs. Tibalt.txt b/res/editions/Duel Decks Sorin vs. Tibalt.txt similarity index 100% rename from res/cardeditions/Duel Decks Sorin vs. Tibalt.txt rename to res/editions/Duel Decks Sorin vs. Tibalt.txt diff --git a/res/cardeditions/Duel Decks Venser vs. Koth.txt b/res/editions/Duel Decks Venser vs. Koth.txt similarity index 100% rename from res/cardeditions/Duel Decks Venser vs. Koth.txt rename to res/editions/Duel Decks Venser vs. Koth.txt diff --git a/res/cardeditions/Eighth Edition.txt b/res/editions/Eighth Edition.txt similarity index 100% rename from res/cardeditions/Eighth Edition.txt rename to res/editions/Eighth Edition.txt diff --git a/res/cardeditions/Eventide.txt b/res/editions/Eventide.txt similarity index 100% rename from res/cardeditions/Eventide.txt rename to res/editions/Eventide.txt diff --git a/res/cardeditions/Exodus.txt b/res/editions/Exodus.txt similarity index 100% rename from res/cardeditions/Exodus.txt rename to res/editions/Exodus.txt diff --git a/res/cardeditions/Fallen Empires.txt b/res/editions/Fallen Empires.txt similarity index 100% rename from res/cardeditions/Fallen Empires.txt rename to res/editions/Fallen Empires.txt diff --git a/res/cardeditions/Fifth Dawn.txt b/res/editions/Fifth Dawn.txt similarity index 100% rename from res/cardeditions/Fifth Dawn.txt rename to res/editions/Fifth Dawn.txt diff --git a/res/cardeditions/Fifth Edition.txt b/res/editions/Fifth Edition.txt similarity index 100% rename from res/cardeditions/Fifth Edition.txt rename to res/editions/Fifth Edition.txt diff --git a/res/cardeditions/Fourth Edition.txt b/res/editions/Fourth Edition.txt similarity index 100% rename from res/cardeditions/Fourth Edition.txt rename to res/editions/Fourth Edition.txt diff --git a/res/cardeditions/From the Vault Dragons.txt b/res/editions/From the Vault Dragons.txt similarity index 100% rename from res/cardeditions/From the Vault Dragons.txt rename to res/editions/From the Vault Dragons.txt diff --git a/res/cardeditions/From the Vault Exiled.txt b/res/editions/From the Vault Exiled.txt similarity index 100% rename from res/cardeditions/From the Vault Exiled.txt rename to res/editions/From the Vault Exiled.txt diff --git a/res/cardeditions/From the Vault Legends.txt b/res/editions/From the Vault Legends.txt similarity index 100% rename from res/cardeditions/From the Vault Legends.txt rename to res/editions/From the Vault Legends.txt diff --git a/res/cardeditions/From the Vault Realms.txt b/res/editions/From the Vault Realms.txt similarity index 100% rename from res/cardeditions/From the Vault Realms.txt rename to res/editions/From the Vault Realms.txt diff --git a/res/cardeditions/From the Vault Relics.txt b/res/editions/From the Vault Relics.txt similarity index 100% rename from res/cardeditions/From the Vault Relics.txt rename to res/editions/From the Vault Relics.txt diff --git a/res/cardeditions/Future Sight.txt b/res/editions/Future Sight.txt similarity index 100% rename from res/cardeditions/Future Sight.txt rename to res/editions/Future Sight.txt diff --git a/res/cardeditions/Gatecrash.txt b/res/editions/Gatecrash.txt similarity index 100% rename from res/cardeditions/Gatecrash.txt rename to res/editions/Gatecrash.txt diff --git a/res/cardeditions/Guildpact.txt b/res/editions/Guildpact.txt similarity index 100% rename from res/cardeditions/Guildpact.txt rename to res/editions/Guildpact.txt diff --git a/res/cardeditions/Homelands.txt b/res/editions/Homelands.txt similarity index 100% rename from res/cardeditions/Homelands.txt rename to res/editions/Homelands.txt diff --git a/res/cardeditions/Ice Age.txt b/res/editions/Ice Age.txt similarity index 100% rename from res/cardeditions/Ice Age.txt rename to res/editions/Ice Age.txt diff --git a/res/cardeditions/Innistrad.txt b/res/editions/Innistrad.txt similarity index 100% rename from res/cardeditions/Innistrad.txt rename to res/editions/Innistrad.txt diff --git a/res/cardeditions/Invasion.txt b/res/editions/Invasion.txt similarity index 100% rename from res/cardeditions/Invasion.txt rename to res/editions/Invasion.txt diff --git a/res/cardeditions/Judgment.txt b/res/editions/Judgment.txt similarity index 100% rename from res/cardeditions/Judgment.txt rename to res/editions/Judgment.txt diff --git a/res/cardeditions/Legends.txt b/res/editions/Legends.txt similarity index 100% rename from res/cardeditions/Legends.txt rename to res/editions/Legends.txt diff --git a/res/cardeditions/Legions.txt b/res/editions/Legions.txt similarity index 100% rename from res/cardeditions/Legions.txt rename to res/editions/Legions.txt diff --git a/res/cardeditions/Limited Edition Alpha.txt b/res/editions/Limited Edition Alpha.txt similarity index 100% rename from res/cardeditions/Limited Edition Alpha.txt rename to res/editions/Limited Edition Alpha.txt diff --git a/res/cardeditions/Limited Edition Beta.txt b/res/editions/Limited Edition Beta.txt similarity index 100% rename from res/cardeditions/Limited Edition Beta.txt rename to res/editions/Limited Edition Beta.txt diff --git a/res/cardeditions/Lorwyn.txt b/res/editions/Lorwyn.txt similarity index 100% rename from res/cardeditions/Lorwyn.txt rename to res/editions/Lorwyn.txt diff --git a/res/cardeditions/Magic 2010.txt b/res/editions/Magic 2010.txt similarity index 100% rename from res/cardeditions/Magic 2010.txt rename to res/editions/Magic 2010.txt diff --git a/res/cardeditions/Magic 2011.txt b/res/editions/Magic 2011.txt similarity index 100% rename from res/cardeditions/Magic 2011.txt rename to res/editions/Magic 2011.txt diff --git a/res/cardeditions/Magic 2012.txt b/res/editions/Magic 2012.txt similarity index 100% rename from res/cardeditions/Magic 2012.txt rename to res/editions/Magic 2012.txt diff --git a/res/cardeditions/Magic 2013.txt b/res/editions/Magic 2013.txt similarity index 100% rename from res/cardeditions/Magic 2013.txt rename to res/editions/Magic 2013.txt diff --git a/res/cardeditions/Mercadian Masques.txt b/res/editions/Mercadian Masques.txt similarity index 100% rename from res/cardeditions/Mercadian Masques.txt rename to res/editions/Mercadian Masques.txt diff --git a/res/cardeditions/Mirage.txt b/res/editions/Mirage.txt similarity index 100% rename from res/cardeditions/Mirage.txt rename to res/editions/Mirage.txt diff --git a/res/cardeditions/Mirrodin Besieged.txt b/res/editions/Mirrodin Besieged.txt similarity index 100% rename from res/cardeditions/Mirrodin Besieged.txt rename to res/editions/Mirrodin Besieged.txt diff --git a/res/cardeditions/Mirrodin.txt b/res/editions/Mirrodin.txt similarity index 100% rename from res/cardeditions/Mirrodin.txt rename to res/editions/Mirrodin.txt diff --git a/res/cardeditions/Modern Masters.txt b/res/editions/Modern Masters.txt similarity index 100% rename from res/cardeditions/Modern Masters.txt rename to res/editions/Modern Masters.txt diff --git a/res/cardeditions/Morningtide.txt b/res/editions/Morningtide.txt similarity index 100% rename from res/cardeditions/Morningtide.txt rename to res/editions/Morningtide.txt diff --git a/res/cardeditions/Nemesis.txt b/res/editions/Nemesis.txt similarity index 100% rename from res/cardeditions/Nemesis.txt rename to res/editions/Nemesis.txt diff --git a/res/cardeditions/New Phyrexia.txt b/res/editions/New Phyrexia.txt similarity index 100% rename from res/cardeditions/New Phyrexia.txt rename to res/editions/New Phyrexia.txt diff --git a/res/cardeditions/Ninth Edition.txt b/res/editions/Ninth Edition.txt similarity index 100% rename from res/cardeditions/Ninth Edition.txt rename to res/editions/Ninth Edition.txt diff --git a/res/cardeditions/Odyssey.txt b/res/editions/Odyssey.txt similarity index 100% rename from res/cardeditions/Odyssey.txt rename to res/editions/Odyssey.txt diff --git a/res/cardeditions/Onslaught.txt b/res/editions/Onslaught.txt similarity index 100% rename from res/cardeditions/Onslaught.txt rename to res/editions/Onslaught.txt diff --git a/res/cardeditions/Planar Chaos.txt b/res/editions/Planar Chaos.txt similarity index 100% rename from res/cardeditions/Planar Chaos.txt rename to res/editions/Planar Chaos.txt diff --git a/res/cardeditions/Planechase 2012 Edition.txt b/res/editions/Planechase 2012 Edition.txt similarity index 100% rename from res/cardeditions/Planechase 2012 Edition.txt rename to res/editions/Planechase 2012 Edition.txt diff --git a/res/cardeditions/Planechase.txt b/res/editions/Planechase.txt similarity index 100% rename from res/cardeditions/Planechase.txt rename to res/editions/Planechase.txt diff --git a/res/cardeditions/Planeshift.txt b/res/editions/Planeshift.txt similarity index 100% rename from res/cardeditions/Planeshift.txt rename to res/editions/Planeshift.txt diff --git a/res/cardeditions/Portal Second Age.txt b/res/editions/Portal Second Age.txt similarity index 100% rename from res/cardeditions/Portal Second Age.txt rename to res/editions/Portal Second Age.txt diff --git a/res/cardeditions/Portal Three Kingdoms.txt b/res/editions/Portal Three Kingdoms.txt similarity index 100% rename from res/cardeditions/Portal Three Kingdoms.txt rename to res/editions/Portal Three Kingdoms.txt diff --git a/res/cardeditions/Portal.txt b/res/editions/Portal.txt similarity index 100% rename from res/cardeditions/Portal.txt rename to res/editions/Portal.txt diff --git a/res/cardeditions/Premium Deck Series Fire and Lightning.txt b/res/editions/Premium Deck Series Fire and Lightning.txt similarity index 100% rename from res/cardeditions/Premium Deck Series Fire and Lightning.txt rename to res/editions/Premium Deck Series Fire and Lightning.txt diff --git a/res/cardeditions/Premium Deck Series Graveborn.txt b/res/editions/Premium Deck Series Graveborn.txt similarity index 100% rename from res/cardeditions/Premium Deck Series Graveborn.txt rename to res/editions/Premium Deck Series Graveborn.txt diff --git a/res/cardeditions/Premium Deck Series Slivers.txt b/res/editions/Premium Deck Series Slivers.txt similarity index 100% rename from res/cardeditions/Premium Deck Series Slivers.txt rename to res/editions/Premium Deck Series Slivers.txt diff --git a/res/cardeditions/Promo set for Gatherer.txt b/res/editions/Promo set for Gatherer.txt similarity index 100% rename from res/cardeditions/Promo set for Gatherer.txt rename to res/editions/Promo set for Gatherer.txt diff --git a/res/cardeditions/Prophecy.txt b/res/editions/Prophecy.txt similarity index 100% rename from res/cardeditions/Prophecy.txt rename to res/editions/Prophecy.txt diff --git a/res/cardeditions/Ravnica City of Guilds.txt b/res/editions/Ravnica City of Guilds.txt similarity index 100% rename from res/cardeditions/Ravnica City of Guilds.txt rename to res/editions/Ravnica City of Guilds.txt diff --git a/res/cardeditions/Return to Ravnica.txt b/res/editions/Return to Ravnica.txt similarity index 100% rename from res/cardeditions/Return to Ravnica.txt rename to res/editions/Return to Ravnica.txt diff --git a/res/cardeditions/Revised Edition.txt b/res/editions/Revised Edition.txt similarity index 100% rename from res/cardeditions/Revised Edition.txt rename to res/editions/Revised Edition.txt diff --git a/res/cardeditions/Rise of the Eldrazi.txt b/res/editions/Rise of the Eldrazi.txt similarity index 100% rename from res/cardeditions/Rise of the Eldrazi.txt rename to res/editions/Rise of the Eldrazi.txt diff --git a/res/cardeditions/Saviors of Kamigawa.txt b/res/editions/Saviors of Kamigawa.txt similarity index 100% rename from res/cardeditions/Saviors of Kamigawa.txt rename to res/editions/Saviors of Kamigawa.txt diff --git a/res/cardeditions/Scars of Mirrodin.txt b/res/editions/Scars of Mirrodin.txt similarity index 100% rename from res/cardeditions/Scars of Mirrodin.txt rename to res/editions/Scars of Mirrodin.txt diff --git a/res/cardeditions/Scourge.txt b/res/editions/Scourge.txt similarity index 100% rename from res/cardeditions/Scourge.txt rename to res/editions/Scourge.txt diff --git a/res/cardeditions/Seventh Edition.txt b/res/editions/Seventh Edition.txt similarity index 100% rename from res/cardeditions/Seventh Edition.txt rename to res/editions/Seventh Edition.txt diff --git a/res/cardeditions/Shadowmoor.txt b/res/editions/Shadowmoor.txt similarity index 100% rename from res/cardeditions/Shadowmoor.txt rename to res/editions/Shadowmoor.txt diff --git a/res/cardeditions/Shards of Alara.txt b/res/editions/Shards of Alara.txt similarity index 100% rename from res/cardeditions/Shards of Alara.txt rename to res/editions/Shards of Alara.txt diff --git a/res/cardeditions/Starter 1999.txt b/res/editions/Starter 1999.txt similarity index 100% rename from res/cardeditions/Starter 1999.txt rename to res/editions/Starter 1999.txt diff --git a/res/cardeditions/Starter 2000.txt b/res/editions/Starter 2000.txt similarity index 100% rename from res/cardeditions/Starter 2000.txt rename to res/editions/Starter 2000.txt diff --git a/res/cardeditions/Stronghold.txt b/res/editions/Stronghold.txt similarity index 100% rename from res/cardeditions/Stronghold.txt rename to res/editions/Stronghold.txt diff --git a/res/cardeditions/Tempest.txt b/res/editions/Tempest.txt similarity index 100% rename from res/cardeditions/Tempest.txt rename to res/editions/Tempest.txt diff --git a/res/cardeditions/Tenth Edition.txt b/res/editions/Tenth Edition.txt similarity index 100% rename from res/cardeditions/Tenth Edition.txt rename to res/editions/Tenth Edition.txt diff --git a/res/cardeditions/The Dark.txt b/res/editions/The Dark.txt similarity index 100% rename from res/cardeditions/The Dark.txt rename to res/editions/The Dark.txt diff --git a/res/cardeditions/Time Spiral Timeshifted.txt b/res/editions/Time Spiral Timeshifted.txt similarity index 100% rename from res/cardeditions/Time Spiral Timeshifted.txt rename to res/editions/Time Spiral Timeshifted.txt diff --git a/res/cardeditions/Time Spiral.txt b/res/editions/Time Spiral.txt similarity index 100% rename from res/cardeditions/Time Spiral.txt rename to res/editions/Time Spiral.txt diff --git a/res/cardeditions/Torment.txt b/res/editions/Torment.txt similarity index 100% rename from res/cardeditions/Torment.txt rename to res/editions/Torment.txt diff --git a/res/cardeditions/Unlimited Edition.txt b/res/editions/Unlimited Edition.txt similarity index 100% rename from res/cardeditions/Unlimited Edition.txt rename to res/editions/Unlimited Edition.txt diff --git a/res/cardeditions/Urza's Destiny.txt b/res/editions/Urza's Destiny.txt similarity index 100% rename from res/cardeditions/Urza's Destiny.txt rename to res/editions/Urza's Destiny.txt diff --git a/res/cardeditions/Urza's Legacy.txt b/res/editions/Urza's Legacy.txt similarity index 100% rename from res/cardeditions/Urza's Legacy.txt rename to res/editions/Urza's Legacy.txt diff --git a/res/cardeditions/Urza's Saga.txt b/res/editions/Urza's Saga.txt similarity index 100% rename from res/cardeditions/Urza's Saga.txt rename to res/editions/Urza's Saga.txt diff --git a/res/cardeditions/Vanguard.txt b/res/editions/Vanguard.txt similarity index 100% rename from res/cardeditions/Vanguard.txt rename to res/editions/Vanguard.txt diff --git a/res/cardeditions/Visions.txt b/res/editions/Visions.txt similarity index 100% rename from res/cardeditions/Visions.txt rename to res/editions/Visions.txt diff --git a/res/cardeditions/Weatherlight.txt b/res/editions/Weatherlight.txt similarity index 100% rename from res/cardeditions/Weatherlight.txt rename to res/editions/Weatherlight.txt diff --git a/res/cardeditions/Worldwake.txt b/res/editions/Worldwake.txt similarity index 100% rename from res/cardeditions/Worldwake.txt rename to res/editions/Worldwake.txt diff --git a/res/cardeditions/Zendikar.txt b/res/editions/Zendikar.txt similarity index 100% rename from res/cardeditions/Zendikar.txt rename to res/editions/Zendikar.txt diff --git a/src/main/java/forge/model/FModel.java b/src/main/java/forge/model/FModel.java index d39e2f70d56..0c1024eeb8b 100644 --- a/src/main/java/forge/model/FModel.java +++ b/src/main/java/forge/model/FModel.java @@ -140,7 +140,7 @@ public enum FModel { this.questPreferences = new QuestPreferences(); this.gauntletData = new GauntletData(); - this.editions = new EditionCollection(new File("res/cardeditions")); + this.editions = new EditionCollection(new File("res/editions")); // Loads all cards (using progress bar). FThreads.assertExecutedByEdt(false); diff --git a/tools/mtgdata-sets-to-forge.txt b/tools/mtgdata-sets-to-forge.txt index f620733c415..52359bb3c73 100644 --- a/tools/mtgdata-sets-to-forge.txt +++ b/tools/mtgdata-sets-to-forge.txt @@ -54,7 +54,7 @@ FE FEM # Fallen Empires ===GPT # Guildpact ===GTC # Gatecrash GU ULG # Urza's Legacy -===H09 # Premium Deck Series: Slivers +PDS H09 # Premium Deck Series: Slivers HM HML # Homelands ===HOP # Planechase IA ICE # Ice Age