diff --git a/oracle/sets.xml b/oracle/sets.xml
index 30a57698..ab9302f2 100644
--- a/oracle/sets.xml
+++ b/oracle/sets.xml
@@ -4,324 +4,364 @@
http://mtgpics.chutography.com/!set!/!name!.full.jpg
http://mtgpics.chutography.com/!set!/!name!.jpg
http://gatherer.wizards.com/Pages/Search/Default.aspx?output=spoiler&method=text&set=["!longname!"]&special=true
-
- ARB
- Alara Reborn
-
-
- AL
- Alliances
-
-
- AQ
- Antiquities
-
-
- AP
- Apocalypse
-
-
- AN
- Arabian Nights
-
+
+ ARB
+ Alara Reborn
+
+
+ AL
+ Alliances
+
+
+ AQ
+ Antiquities
+
+
+ AP
+ Apocalypse
+
+
+ AN
+ Arabian Nights
+
AE
Archenemy
-
- BOK
- Betrayers of Kamigawa
-
-
- CHK
- Champions of Kamigawa
-
-
- CH
- Chronicles
-
-
- 6E
- Classic Sixth Edition
-
-
- CS
- Coldsnap
-
-
- CFX
- Conflux
-
-
- DS
- Darksteel
-
-
- DIS
- Dissension
-
-
- 8E
- Eighth Edition
-
-
- EVE
- Eventide
-
-
- EX
- Exodus
-
-
- FE
- Fallen Empires
-
-
- FD
- Fifth Dawn
-
-
- 5E
- Fifth Edition
-
-
- 4E
- Fourth Edition
-
-
- FUT
- Future Sight
-
-
- GP
- Guildpact
-
-
- HL
- Homelands
-
-
- IA
- Ice Age
-
-
- IN
- Invasion
-
-
- JU
- Judgment
-
-
- LG
- Legends
-
-
- LE
- Legions
-
-
- A
- Limited Edition Alpha
-
-
- B
- Limited Edition Beta
-
-
- LRW
- Lorwyn
-
-
- M10
- Magic 2010
-
+
+ BOK
+ Betrayers of Kamigawa
+
+
+ CHK
+ Champions of Kamigawa
+
+
+ CH
+ Chronicles
+
+
+ 6E
+ Classic Sixth Edition
+
+
+ CS
+ Coldsnap
+
+
+ CFX
+ Conflux
+
+
+ DS
+ Darksteel
+
+
+ DIS
+ Dissension
+
+
+ DVD
+ Duel Decks: Divine vs. Demonic
+
+
+ DDE
+ Duel Decks: Elspeth vs. Tezzeret
+
+
+ EVG
+ Duel Decks: Elves vs. Goblins
+
+
+ DD2
+ Duel Decks: Jace vs. Chandra
+
+
+ DDD
+ Duel Decks: Phyrexia vs. the Coalition
+
+
+ 8E
+ Eighth Edition
+
+
+ EVE
+ Eventide
+
+
+ EX
+ Exodus
+
+
+ FE
+ Fallen Empires
+
+
+ FD
+ Fifth Dawn
+
+
+ 5E
+ Fifth Edition
+
+
+ 4E
+ Fourth Edition
+
+
+ DRB
+ From the Vault: Dragons
+
+
+ FVE
+ From the Vault: Exiled
+
+
+ V10
+ From the Vault: Relics
+
+
+ FUT
+ Future Sight
+
+
+ GP
+ Guildpact
+
+
+ HL
+ Homelands
+
+
+ IA
+ Ice Age
+
+
+ IN
+ Invasion
+
+
+ JU
+ Judgment
+
+
+ LG
+ Legends
+
+
+ LE
+ Legions
+
+
+ A
+ Limited Edition Alpha
+
+
+ B
+ Limited Edition Beta
+
+
+ LRW
+ Lorwyn
+
+
+ M10
+ Magic 2010
+
M11
Magic 2011
-
- MM
- Mercadian Masques
-
-
- MI
- Mirage
-
-
- MR
- Mirrodin
-
+
+ MM
+ Mercadian Masques
+
+
+ MI
+ Mirage
+
+
+ MR
+ Mirrodin
+
MBS
Mirrodin Besieged
-
- MOR
- Morningtide
-
-
- NE
- Nemesis
-
-
- 9E
- Ninth Edition
-
-
- OD
- Odyssey
-
-
- ON
- Onslaught
-
-
- PLC
- Planar Chaos
-
+
+ MOR
+ Morningtide
+
+
+ NE
+ Nemesis
+
+
+ 9E
+ Ninth Edition
+
+
+ OD
+ Odyssey
+
+
+ ON
+ Onslaught
+
+
+ PLC
+ Planar Chaos
+
PCH
Planechase
-
- PS
- Planeshift
-
-
- PT
- Portal
-
-
- P2
- Portal Second Age
-
-
- P3
- Portal Three Kingdoms
-
+
+ PS
+ Planeshift
+
+
+ PT
+ Portal
+
+
+ P2
+ Portal Second Age
+
+
+ P3
+ Portal Three Kingdoms
+
+
+ PD2
+ Premium Deck Series: Fire and Lightning
+
+
+ H09
+ Premium Deck Series: Slivers
+
PR
Promo set for Gatherer
-
- PY
- Prophecy
-
-
- RAV
- Ravnica: City of Guilds
-
-
- R
- Revised Edition
-
-
- ROE
- Rise of the Eldrazi
-
-
- SOK
- Saviors of Kamigawa
-
+
+ PY
+ Prophecy
+
+
+ RAV
+ Ravnica: City of Guilds
+
+
+ R
+ Revised Edition
+
+
+ ROE
+ Rise of the Eldrazi
+
+
+ SOK
+ Saviors of Kamigawa
+
SOM
Scars of Mirrodin
-
- SC
- Scourge
-
-
- 7E
- Seventh Edition
-
-
- SHM
- Shadowmoor
-
-
- ALA
- Shards of Alara
-
+
+ SC
+ Scourge
+
+
+ 7E
+ Seventh Edition
+
+
+ SHM
+ Shadowmoor
+
+
+ ALA
+ Shards of Alara
+
ST
Starter 1999
-
- ST2K
- Starter 2000
-
-
- SH
- Stronghold
-
-
- TE
- Tempest
-
-
- 10E
- Tenth Edition
-
-
- DK
- The Dark
-
-
- TSP
- Time Spiral
-
+
+ ST2K
+ Starter 2000
+
+
+ SH
+ Stronghold
+
+
+ TE
+ Tempest
+
+
+ 10E
+ Tenth Edition
+
+
+ DK
+ The Dark
+
+
+ TSP
+ Time Spiral
+
TSB
Time Spiral "Timeshifted"
-
- TO
- Torment
-
-
- UG
- Unglued
-
-
- UNH
- Unhinged
-
-
- U
- Unlimited Edition
-
-
- UD
- Urza's Destiny
-
-
- UL
- Urza's Legacy
-
-
- US
- Urza's Saga
-
+
+ TO
+ Torment
+
+
+ UG
+ Unglued
+
+
+ UNH
+ Unhinged
+
+
+ U
+ Unlimited Edition
+
+
+ UD
+ Urza's Destiny
+
+
+ UL
+ Urza's Legacy
+
+
+ US
+ Urza's Saga
+
VG
Vanguard
-
- VI
- Visions
-
-
- WL
- Weatherlight
-
+
+ VI
+ Visions
+
+
+ WL
+ Weatherlight
+
WWK
Worldwake
-
- ZEN
- Zendikar
-
+
+ ZEN
+ Zendikar
+
diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp
index ea627c12..5aa2b99f 100644
--- a/oracle/src/oracleimporter.cpp
+++ b/oracle/src/oracleimporter.cpp
@@ -77,6 +77,10 @@ CardInfo *OracleImporter::addCard(const QString &setName, QString cardName, int
cardName.remove(QRegExp(" \\(.*\\)"));
splitCard = true;
}
+ // Workaround for card name weirdness
+ if (cardName.contains("XX"))
+ cardName.remove("XX");
+ cardName = cardName.replace("Æ", "AE");
CardInfo *card;
if (cardHash.contains(cardName)) {
@@ -84,11 +88,6 @@ CardInfo *OracleImporter::addCard(const QString &setName, QString cardName, int
if (splitCard && !card->getText().contains(fullCardText))
card->setText(card->getText() + "\n---\n" + fullCardText);
} else {
- // Workaround for card name weirdness
- if (cardName.contains("XX"))
- cardName.remove("XX");
- cardName = cardName.replace("Æ", "AE");
-
bool mArtifact = false;
if (cardType.endsWith("Artifact"))
for (int i = 0; i < cardText.size(); ++i)