Merge branch 'master' into cmake

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [latest-master] (https://github.com/WagicProject/wagic/tree/latest-master)
 
+#### 6/30/16
+- *Merged pull-request:* Sorted Primitives [#\711] (https://github.com/WagicProject/wagic/pull/711) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* Add Shackle Ability [#\710] (https://github.com/WagicProject/wagic/pull/710) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* Fix Cascade, Crash fix on lastController and some corrections [#\709] (https://github.com/WagicProject/wagic/pull/709) ([kevlahnota](https://github.com/kevlahnota))
+
 #### 6/29/16
 - *Merged pull-request:* Updated Primitives and Hide Highlight Border [#\707] (https://github.com/WagicProject/wagic/pull/707) ([kevlahnota](https://github.com/kevlahnota))
 

projects/mtg/bin/Res/sets/10E/_cards.dat

@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-name=10th Edition
+name=Tenth Edition
 year=2007
+total=383
 [/meta]
 [card]
 primitive=Abundance
@@ -59,6 +60,11 @@ id=129465
 rarity=U
 [/card]
 [card]
+primitive=Angel's Feather
+id=129466
+rarity=U
+[/card]
+[card]
 primitive=Angelic Blessing
 id=129711
 rarity=C
@@ -74,11 +80,6 @@ id=129671
 rarity=C
 [/card]
 [card]
-primitive=Angel's Feather
-id=129466
-rarity=U
-[/card]
-[card]
 primitive=Arcane Teachings
 id=130530
 rarity=U
@@ -574,16 +575,16 @@ id=134762
 rarity=C
 [/card]
 [card]
-primitive=Furnace of Rath
-id=129566
-rarity=R
-[/card]
-[card]
 primitive=Furnace Whelp
 id=130386
 rarity=U
 [/card]
 [card]
+primitive=Furnace of Rath
+id=129566
+rarity=R
+[/card]
+[card]
 primitive=Gaea's Herald
 id=129789
 rarity=R
@@ -959,16 +960,16 @@ id=135272
 rarity=R
 [/card]
 [card]
-primitive=Might of Oaks
-id=129642
-rarity=R
-[/card]
-[card]
 primitive=Might Weaver
 id=130996
 rarity=U
 [/card]
 [card]
+primitive=Might of Oaks
+id=129642
+rarity=R
+[/card]
+[card]
 primitive=Millstone
 id=129643
 rarity=R

projects/mtg/bin/Res/sets/2ED/_cards.dat

@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-name=2nd Edition
+name=Unlimited Edition
 year=1993
+total=302
 [/meta]
 [card]
 primitive=Air Elemental
@@ -460,7 +461,7 @@ rarity=R
 [/card]
 [card]
 primitive=Forest
-id=890
+id=888
 rarity=L
 [/card]
 [card]
@@ -470,7 +471,7 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=888
+id=890
 rarity=L
 [/card]
 [card]
@@ -644,8 +645,13 @@ id=756
 rarity=C
 [/card]
 [card]
+primitive=Island Sanctuary
+id=854
+rarity=R
+[/card]
+[card]
 primitive=Island
-id=896
+id=894
 rarity=L
 [/card]
 [card]
@@ -655,15 +661,10 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=894
+id=896
 rarity=L
 [/card]
 [card]
-primitive=Island Sanctuary
-id=854
-rarity=R
-[/card]
-[card]
 primitive=Ivory Cup
 id=619
 rarity=U
@@ -845,7 +846,7 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=893
+id=891
 rarity=L
 [/card]
 [card]
@@ -855,7 +856,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=891
+id=893
 rarity=L
 [/card]
 [card]
@@ -975,7 +976,7 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=899
+id=897
 rarity=L
 [/card]
 [card]
@@ -985,7 +986,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=897
+id=899
 rarity=L
 [/card]
 [card]
@@ -1104,13 +1105,13 @@ id=866
 rarity=C
 [/card]
 [card]
-primitive=Savannah
+primitive=Savannah Lions
-id=881
+id=867
 rarity=R
 [/card]
 [card]
-primitive=Savannah Lions
+primitive=Savannah
-id=867
+id=881
 rarity=R
 [/card]
 [card]
@@ -1240,7 +1241,7 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=877
+id=875
 rarity=L
 [/card]
 [card]
@@ -1250,7 +1251,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=875
+id=877
 rarity=L
 [/card]
 [card]

projects/mtg/bin/Res/sets/4ED/_cards.dat

@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-name=4th Edition
+name=Fourth Edition
 year=1995
+total=378
 [/meta]
 [card]
 primitive=Abomination
@@ -74,13 +75,13 @@ id=2144
 rarity=C
 [/card]
 [card]
-primitive=Armageddon
+primitive=Armageddon Clock
-id=2320
+id=2018
 rarity=R
 [/card]
 [card]
-primitive=Armageddon Clock
+primitive=Armageddon
-id=2018
+id=2320
 rarity=R
 [/card]
 [card]
@@ -509,13 +510,13 @@ id=2041
 rarity=R
 [/card]
 [card]
-primitive=Elder Land Wurm
+primitive=El-Hajjaj
-id=2339
+id=2101
 rarity=R
 [/card]
 [card]
-primitive=El-Hajjaj
+primitive=Elder Land Wurm
-id=2101
+id=2339
 rarity=R
 [/card]
 [card]
@@ -630,7 +631,7 @@ rarity=R
 [/card]
 [card]
 primitive=Forest
-id=2379
+id=2377
 rarity=L
 [/card]
 [card]
@@ -640,7 +641,7 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=2377
+id=2379
 rarity=L
 [/card]
 [card]
@@ -839,8 +840,18 @@ id=2220
 rarity=C
 [/card]
 [card]
+primitive=Island Fish Jasconius
+id=2161
+rarity=R
+[/card]
+[card]
+primitive=Island Sanctuary
+id=2346
+rarity=R
+[/card]
+[card]
 primitive=Island
-id=2391
+id=2389
 rarity=L
 [/card]
 [card]
@@ -850,20 +861,10 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=2389
+id=2391
 rarity=L
 [/card]
 [card]
-primitive=Island Fish Jasconius
-id=2161
-rarity=R
-[/card]
-[card]
-primitive=Island Sanctuary
-id=2346
-rarity=R
-[/card]
-[card]
 primitive=Ivory Cup
 id=2050
 rarity=U
@@ -1105,7 +1106,7 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=2383
+id=2381
 rarity=L
 [/card]
 [card]
@@ -1115,7 +1116,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=2381
+id=2383
 rarity=L
 [/card]
 [card]
@@ -1245,7 +1246,7 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=2386
+id=2384
 rarity=L
 [/card]
 [card]
@@ -1255,7 +1256,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=2384
+id=2386
 rarity=L
 [/card]
 [card]
@@ -1545,7 +1546,7 @@ rarity=C
 [/card]
 [card]
 primitive=Swamp
-id=2376
+id=2374
 rarity=L
 [/card]
 [card]
@@ -1555,7 +1556,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=2374
+id=2376
 rarity=L
 [/card]
 [card]

projects/mtg/bin/Res/sets/5DN/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Fifth Dawn
+block=Mirrodin
 year=2004
-block=Mirror
+total=165
 [/meta]
 [card]
 primitive=Abuna's Chant

projects/mtg/bin/Res/sets/5ED/_cards.dat

@@ -1,9 +1,15 @@
 [meta]
 author=Wagic Team
-name=5th Edition
+name=Fifth Edition
 year=1997
+total=449
 [/meta]
 [card]
+primitive=AEther Storm
+id=3891
+rarity=U
+[/card]
+[card]
 primitive=Abbey Gargoyles
 id=4098
 rarity=U
@@ -19,11 +25,6 @@ id=4175
 rarity=R
 [/card]
 [card]
-primitive=AEther Storm
-id=3891
-rarity=U
-[/card]
-[card]
 primitive=Air Elemental
 id=3892
 rarity=U
@@ -54,16 +55,16 @@ id=3759
 rarity=C
 [/card]
 [card]
-primitive=Angry Mob
-id=4101
-rarity=U
-[/card]
-[card]
 primitive=An-Havva Constable
 id=3960
 rarity=R
 [/card]
 [card]
+primitive=Angry Mob
+id=4101
+rarity=U
+[/card]
+[card]
 primitive=Animate Dead
 id=3823
 rarity=U
@@ -429,6 +430,11 @@ id=3835
 rarity=U
 [/card]
 [card]
+primitive=D'Avenant Archer
+id=4120
+rarity=C
+[/card]
+[card]
 primitive=Dance of Many
 id=3899
 rarity=R
@@ -454,11 +460,6 @@ id=3836
 rarity=C
 [/card]
 [card]
-primitive=D'Avenant Archer
-id=4120
-rarity=C
-[/card]
-[card]
 primitive=Death Speakers
 id=4121
 rarity=C
@@ -734,23 +735,18 @@ id=3976
 rarity=C
 [/card]
 [card]
-primitive=Force of Nature
-id=3977
-rarity=R
-[/card]
-[card]
 primitive=Force Spike
 id=3909
 rarity=C
 [/card]
 [card]
-primitive=Forest
+primitive=Force of Nature
-id=4174
+id=3977
-rarity=L
+rarity=R
 [/card]
 [card]
 primitive=Forest
-id=4173
+id=4171
 rarity=L
 [/card]
 [card]
@@ -760,7 +756,12 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=4171
+id=4173
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=4174
 rarity=L
 [/card]
 [card]
@@ -899,13 +900,13 @@ id=4182
 rarity=U
 [/card]
 [card]
-primitive=Heal
+primitive=Healing Salve
-id=4129
+id=4130
 rarity=C
 [/card]
 [card]
-primitive=Healing Salve
+primitive=Heal
-id=4130
+id=4129
 rarity=C
 [/card]
 [card]
@@ -1054,13 +1055,13 @@ id=3988
 rarity=C
 [/card]
 [card]
-primitive=Island
+primitive=Island Sanctuary
-id=4202
+id=4136
-rarity=L
+rarity=R
 [/card]
 [card]
 primitive=Island
-id=4201
+id=4199
 rarity=L
 [/card]
 [card]
@@ -1070,13 +1071,13 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=4199
+id=4201
 rarity=L
 [/card]
 [card]
-primitive=Island Sanctuary
+primitive=Island
-id=4136
+id=4202
-rarity=R
+rarity=L
 [/card]
 [card]
 primitive=Ivory Cup
@@ -1364,13 +1365,13 @@ id=4072
 rarity=C
 [/card]
 [card]
-primitive=Mountain
+primitive=Mountain Goat
-id=4198
+id=4073
-rarity=L
+rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=4197
+id=4195
 rarity=L
 [/card]
 [card]
@@ -1380,13 +1381,13 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=4195
+id=4197
 rarity=L
 [/card]
 [card]
-primitive=Mountain Goat
+primitive=Mountain
-id=4073
+id=4198
-rarity=C
+rarity=L
 [/card]
 [card]
 primitive=Murk Dwellers
@@ -1545,12 +1546,7 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=4206
+id=4203
-rarity=L
-[/card]
-[card]
-primitive=Plains
-id=4205
 rarity=L
 [/card]
 [card]
@@ -1560,7 +1556,12 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=4203
+id=4205
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=4206
 rarity=L
 [/card]
 [card]
@@ -1794,16 +1795,16 @@ id=3810
 rarity=U
 [/card]
 [card]
-primitive=Shatter
-id=4086
-rarity=C
-[/card]
-[card]
 primitive=Shatterstorm
 id=4087
 rarity=U
 [/card]
 [card]
+primitive=Shatter
+id=4086
+rarity=C
+[/card]
+[card]
 primitive=Shield Bearer
 id=4159
 rarity=C
@@ -1920,12 +1921,7 @@ rarity=U
 [/card]
 [card]
 primitive=Swamp
-id=4170
+id=4167
-rarity=L
-[/card]
-[card]
-primitive=Swamp
-id=4169
 rarity=L
 [/card]
 [card]
@@ -1935,7 +1931,12 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=4167
+id=4169
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=4170
 rarity=L
 [/card]
 [card]

projects/mtg/bin/Res/sets/6ED/_cards.dat

@@ -1,9 +1,15 @@
 [meta]
 author=Wagic Team
-name=6th Edition
+name=Classic Sixth Edition
 year=1999
+total=350
 [/meta]
 [card]
+primitive=AEther Flash
+id=15447
+rarity=U
+[/card]
+[card]
 primitive=Abduction
 id=14526
 rarity=U
@@ -24,11 +30,6 @@ id=14727
 rarity=R
 [/card]
 [card]
-primitive=AEther Flash
-id=15447
-rarity=U
-[/card]
-[card]
 primitive=Agonizing Memories
 id=14586
 rarity=U
@@ -124,13 +125,13 @@ id=14628
 rarity=U
 [/card]
 [card]
-primitive=Blight
+primitive=Blighted Shaman
-id=15399
+id=15385
 rarity=U
 [/card]
 [card]
-primitive=Blighted Shaman
+primitive=Blight
-id=15385
+id=15399
 rarity=U
 [/card]
 [card]
@@ -289,6 +290,11 @@ id=15404
 rarity=R
 [/card]
 [card]
+primitive=D'Avenant Archer
+id=14472
+rarity=C
+[/card]
+[card]
 primitive=Dancing Scimitar
 id=14773
 rarity=R
@@ -304,11 +310,6 @@ id=14552
 rarity=R
 [/card]
 [card]
-primitive=D'Avenant Archer
-id=14472
-rarity=C
-[/card]
-[card]
 primitive=Deflection
 id=16438
 rarity=R
@@ -534,16 +535,16 @@ id=14626
 rarity=C
 [/card]
 [card]
-primitive=Flash
-id=16440
-rarity=R
-[/card]
-[card]
 primitive=Flashfires
 id=16446
 rarity=U
 [/card]
 [card]
+primitive=Flash
+id=16440
+rarity=R
+[/card]
+[card]
 primitive=Flight
 id=14515
 rarity=C
@@ -554,13 +555,13 @@ id=14776
 rarity=R
 [/card]
 [card]
-primitive=Fog
+primitive=Fog Elemental
-id=14682
+id=16433
 rarity=C
 [/card]
 [card]
-primitive=Fog Elemental
+primitive=Fog
-id=16433
+id=14682
 rarity=C
 [/card]
 [card]
@@ -994,6 +995,11 @@ id=15442
 rarity=U
 [/card]
 [card]
+primitive=Mountain Goat
+id=16442
+rarity=C
+[/card]
+[card]
 primitive=Mountain
 id=14745
 rarity=L
@@ -1014,11 +1020,6 @@ id=14748
 rarity=L
 [/card]
 [card]
-primitive=Mountain Goat
-id=16442
-rarity=C
-[/card]
-[card]
 primitive=Mystic Compass
 id=15435
 rarity=U
@@ -1364,16 +1365,16 @@ id=14670
 rarity=C
 [/card]
 [card]
-primitive=Shatter
-id=14614
-rarity=C
-[/card]
-[card]
 primitive=Shatterstorm
 id=11497
 rarity=R
 [/card]
 [card]
+primitive=Shatter
+id=14614
+rarity=C
+[/card]
+[card]
 primitive=Shock
 id=14609
 rarity=C

projects/mtg/bin/Res/sets/7ED/_cards.dat

@@ -1,9 +1,15 @@
 [meta]
 author=Wagic Team
-name=7th Edition
+name=Seventh Edition
 year=2001
+total=350
 [/meta]
 [card]
+primitive=AEther Flash
+id=25678
+rarity=U
+[/card]
+[card]
 primitive=Abyssal Horror
 id=13111
 rarity=R
@@ -19,11 +25,6 @@ id=11140
 rarity=R
 [/card]
 [card]
-primitive=AEther Flash
-id=25678
-rarity=U
-[/card]
-[card]
 primitive=Agonizing Memories
 id=12994
 rarity=U

projects/mtg/bin/Res/sets/8ED/_cards.dat

@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-name=8th Edition
+name=Eighth Edition
 year=2003
+total=357
 [/meta]
 [card]
 primitive=Abyssal Specter
@@ -894,16 +895,16 @@ id=45316
 rarity=U
 [/card]
 [card]
-primitive=Merchant of Secrets
-id=45231
-rarity=C
-[/card]
-[card]
 primitive=Merchant Scroll
 id=45275
 rarity=U
 [/card]
 [card]
+primitive=Merchant of Secrets
+id=45231
+rarity=C
+[/card]
+[card]
 primitive=Might of Oaks
 id=45452
 rarity=R
@@ -1274,16 +1275,16 @@ id=45187
 rarity=C
 [/card]
 [card]
-primitive=Sage of Lat-Nam
-id=45269
-rarity=R
-[/card]
-[card]
 primitive=Sage Owl
 id=45226
 rarity=C
 [/card]
 [card]
+primitive=Sage of Lat-Nam
+id=45269
+rarity=R
+[/card]
+[card]
 primitive=Salt Marsh
 id=45492
 rarity=U
@@ -1374,13 +1375,13 @@ id=45494
 rarity=U
 [/card]
 [card]
-primitive=Shock
+primitive=Shock Troops
-id=45352
+id=45350
 rarity=C
 [/card]
 [card]
-primitive=Shock Troops
+primitive=Shock
-id=45350
+id=45352
 rarity=C
 [/card]
 [card]

projects/mtg/bin/Res/sets/9ED/_cards.dat

@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-name=9th Edition
+name=Ninth Edition
 year=2005
+total=359
 [/meta]
 [card]
 primitive=Adarkar Wastes
@@ -44,16 +45,16 @@ id=82992
 rarity=U
 [/card]
 [card]
-primitive=Angelic Blessing
-id=84583
-rarity=C
-[/card]
-[card]
 primitive=Angel's Feather
 id=83449
 rarity=U
 [/card]
 [card]
+primitive=Angelic Blessing
+id=84583
+rarity=C
+[/card]
+[card]
 primitive=Annex
 id=84564
 rarity=U

projects/mtg/bin/Res/sets/ALA/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Shards of Alara
+block=Shards of Alara
 year=2008
-block=Shards
+total=249
 [/meta]
 [card]
 primitive=Ad Nauseam
@@ -29,13 +31,13 @@ id=174986
 rarity=U
 [/card]
 [card]
-primitive=Angelic Benediction
+primitive=Angel's Herald
-id=174826
+id=175141
 rarity=U
 [/card]
 [card]
-primitive=Angel's Herald
+primitive=Angelic Benediction
-id=175141
+id=174826
 rarity=U
 [/card]
 [card]
@@ -184,11 +186,6 @@ id=176448
 rarity=U
 [/card]
 [card]
-primitive=Corpse Connoisseur Unearthed
-id=17644811
-rarity=T
-[/card]
-[card]
 primitive=Courier's Capsule
 id=174800
 rarity=C
@@ -284,11 +281,6 @@ id=174835
 rarity=C
 [/card]
 [card]
-primitive=Dregscape Zombie Unearthed
-id=17483511
-rarity=T
-[/card]
-[card]
 primitive=Druid of the Anima
 id=174903
 rarity=C
@@ -364,11 +356,6 @@ id=176456
 rarity=U
 [/card]
 [card]
-primitive=Fatestitcher Unearthed
-id=17645611
-rarity=T
-[/card]
-[card]
 primitive=Feral Hydra
 id=174973
 rarity=R
@@ -384,11 +371,6 @@ id=176447
 rarity=U
 [/card]
 [card]
-primitive=Fire-Field Ogre Unearthed
-id=17644711
-rarity=T
-[/card]
-[card]
 primitive=Flameblast Dragon
 id=177476
 rarity=R
@@ -405,12 +387,12 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=174929
+id=174928
 rarity=L
 [/card]
 [card]
 primitive=Forest
-id=174928
+id=174929
 rarity=L
 [/card]
 [card]
@@ -484,19 +466,14 @@ id=174805
 rarity=C
 [/card]
 [card]
-primitive=Hellkite Overlord
-id=175057
-rarity=M
-[/card]
-[card]
 primitive=Hell's Thunder
 id=176455
 rarity=R
 [/card]
 [card]
-primitive=Hell's Thunder Unearthed
+primitive=Hellkite Overlord
-id=17645511
+id=175057
-rarity=T
+rarity=M
 [/card]
 [card]
 primitive=Hindering Light
@@ -540,12 +517,12 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=174980
+id=174979
 rarity=L
 [/card]
 [card]
 primitive=Island
-id=174979
+id=174980
 rarity=L
 [/card]
 [card]
@@ -589,11 +566,6 @@ id=174837
 rarity=C
 [/card]
 [card]
-primitive=Kathari Screecher Unearthed
-id=17483711
-rarity=T
-[/card]
-[card]
 primitive=Kederekt Creeper
 id=179430
 rarity=C
@@ -604,11 +576,6 @@ id=174882
 rarity=R
 [/card]
 [card]
-primitive=Kederekt Leviathan Unearthed
-id=17488211
-rarity=T
-[/card]
-[card]
 primitive=Keeper of Progenitus
 id=175033
 rarity=R
@@ -710,7 +677,7 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=175019
+id=175017
 rarity=L
 [/card]
 [card]
@@ -720,7 +687,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=175017
+id=175019
 rarity=L
 [/card]
 [card]
@@ -984,11 +951,6 @@ id=174845
 rarity=U
 [/card]
 [card]
-primitive=Scourge Devil Unearthed
-id=17484511
-rarity=T
-[/card]
-[card]
 primitive=Scourglass
 id=174853
 rarity=R
@@ -1135,7 +1097,7 @@ rarity=U
 [/card]
 [card]
 primitive=Swamp
-id=175090
+id=175088
 rarity=L
 [/card]
 [card]
@@ -1145,7 +1107,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=175088
+id=175090
 rarity=L
 [/card]
 [card]
@@ -1219,11 +1181,6 @@ id=176452
 rarity=C
 [/card]
 [card]
-primitive=Undead Leotau Unearthed
-id=17645211
-rarity=T
-[/card]
-[card]
 primitive=Vectis Silencers
 id=175147
 rarity=C
@@ -1254,21 +1211,11 @@ id=175144
 rarity=C
 [/card]
 [card]
-primitive=Viscera Dragger Unearthed
-id=175144111
-rarity=T
-[/card]
-[card]
 primitive=Vithian Stinger
 id=174922
 rarity=C
 [/card]
 [card]
-primitive=Vithian Stinger Unearthed
-id=174922111
-rarity=T
-[/card]
-[card]
 primitive=Volcanic Submersion
 id=174889
 rarity=C

projects/mtg/bin/Res/sets/ALL/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Alliances
+block=Ice Age
 year=1996
-block=Ice
+total=199
 [/meta]
 [card]
 primitive=Aesthir Glider
@@ -15,17 +17,12 @@ rarity=C
 [/card]
 [card]
 primitive=Agent of Stromgald
-id=3160
-rarity=C
-[/card]
-[card]
-primitive=Agent of Stromgald
 id=3159
 rarity=C
 [/card]
 [card]
-primitive=Arcane Denial
+primitive=Agent of Stromgald
-id=3098
+id=3160
 rarity=C
 [/card]
 [card]
@@ -34,23 +31,23 @@ id=3097
 rarity=C
 [/card]
 [card]
+primitive=Arcane Denial
+id=3098
+rarity=C
+[/card]
+[card]
 primitive=Ashnod's Cylix
 id=3042
 rarity=R
 [/card]
 [card]
 primitive=Astrolabe
-id=3044
-rarity=C
-[/card]
-[card]
-primitive=Astrolabe
 id=3043
 rarity=C
 [/card]
 [card]
-primitive=Awesome Presence
+primitive=Astrolabe
-id=3100
+id=3044
 rarity=C
 [/card]
 [card]
@@ -59,6 +56,11 @@ id=3099
 rarity=C
 [/card]
 [card]
+primitive=Awesome Presence
+id=3100
+rarity=C
+[/card]
+[card]
 primitive=Balduvian Dead
 id=3066
 rarity=U
@@ -75,17 +77,12 @@ rarity=R
 [/card]
 [card]
 primitive=Balduvian War-Makers
-id=3163
-rarity=C
-[/card]
-[card]
-primitive=Balduvian War-Makers
 id=3162
 rarity=C
 [/card]
 [card]
-primitive=Benthic Explorers
+primitive=Balduvian War-Makers
-id=3102
+id=3163
 rarity=C
 [/card]
 [card]
@@ -94,8 +91,8 @@ id=3101
 rarity=C
 [/card]
 [card]
-primitive=Bestial Fury
+primitive=Benthic Explorers
-id=3165
+id=3102
 rarity=C
 [/card]
 [card]
@@ -104,6 +101,11 @@ id=3164
 rarity=C
 [/card]
 [card]
+primitive=Bestial Fury
+id=3165
+rarity=C
+[/card]
+[card]
 primitive=Bounty of the Hunt
 id=3128
 rarity=U
@@ -120,17 +122,12 @@ rarity=U
 [/card]
 [card]
 primitive=Carrier Pigeons
-id=3191
-rarity=C
-[/card]
-[card]
-primitive=Carrier Pigeons
 id=3190
 rarity=C
 [/card]
 [card]
-primitive=Casting of Bones
+primitive=Carrier Pigeons
-id=3068
+id=3191
 rarity=C
 [/card]
 [card]
@@ -139,6 +136,11 @@ id=3067
 rarity=C
 [/card]
 [card]
+primitive=Casting of Bones
+id=3068
+rarity=C
+[/card]
+[card]
 primitive=Chaos Harlequin
 id=3167
 rarity=R
@@ -150,12 +152,12 @@ rarity=U
 [/card]
 [card]
 primitive=Deadly Insect
-id=3130
+id=3129
 rarity=C
 [/card]
 [card]
 primitive=Deadly Insect
-id=3129
+id=3130
 rarity=C
 [/card]
 [card]
@@ -185,12 +187,12 @@ rarity=U
 [/card]
 [card]
 primitive=Elvish Ranger
-id=3133
+id=3132
 rarity=C
 [/card]
 [card]
 primitive=Elvish Ranger
-id=3132
+id=3133
 rarity=C
 [/card]
 [card]
@@ -205,17 +207,12 @@ rarity=U
 [/card]
 [card]
 primitive=Enslaved Scout
-id=3170
-rarity=C
-[/card]
-[card]
-primitive=Enslaved Scout
 id=3169
 rarity=C
 [/card]
 [card]
-primitive=Errand of Duty
+primitive=Enslaved Scout
-id=3193
+id=3170
 rarity=C
 [/card]
 [card]
@@ -224,18 +221,23 @@ id=3192
 rarity=C
 [/card]
 [card]
+primitive=Errand of Duty
+id=3193
+rarity=C
+[/card]
+[card]
 primitive=Exile
 id=3194
 rarity=R
 [/card]
 [card]
 primitive=False Demise
-id=3106
+id=3105
 rarity=C
 [/card]
 [card]
 primitive=False Demise
-id=3105
+id=3106
 rarity=C
 [/card]
 [card]
@@ -245,17 +247,12 @@ rarity=R
 [/card]
 [card]
 primitive=Feast or Famine
-id=3074
-rarity=C
-[/card]
-[card]
-primitive=Feast or Famine
 id=3073
 rarity=C
 [/card]
 [card]
-primitive=Fevered Strength
+primitive=Feast or Famine
-id=3076
+id=3074
 rarity=C
 [/card]
 [card]
@@ -264,6 +261,11 @@ id=3075
 rarity=C
 [/card]
 [card]
+primitive=Fevered Strength
+id=3076
+rarity=C
+[/card]
+[card]
 primitive=Floodwater Dam
 id=3045
 rarity=R
@@ -275,17 +277,12 @@ rarity=U
 [/card]
 [card]
 primitive=Foresight
-id=3109
-rarity=C
-[/card]
-[card]
-primitive=Foresight
 id=3108
 rarity=C
 [/card]
 [card]
-primitive=Fyndhorn Druid
+primitive=Foresight
-id=3136
+id=3109
 rarity=C
 [/card]
 [card]
@@ -294,23 +291,23 @@ id=3135
 rarity=C
 [/card]
 [card]
+primitive=Fyndhorn Druid
+id=3136
+rarity=C
+[/card]
+[card]
 primitive=Gargantuan Gorilla
 id=3137
 rarity=R
 [/card]
 [card]
 primitive=Gift of the Woods
-id=3139
-rarity=C
-[/card]
-[card]
-primitive=Gift of the Woods
 id=3138
 rarity=C
 [/card]
 [card]
-primitive=Gorilla Berserkers
+primitive=Gift of the Woods
-id=3141
+id=3139
 rarity=C
 [/card]
 [card]
@@ -319,8 +316,8 @@ id=3140
 rarity=C
 [/card]
 [card]
-primitive=Gorilla Chieftain
+primitive=Gorilla Berserkers
-id=3143
+id=3141
 rarity=C
 [/card]
 [card]
@@ -329,8 +326,8 @@ id=3142
 rarity=C
 [/card]
 [card]
-primitive=Gorilla Shaman
+primitive=Gorilla Chieftain
-id=3172
+id=3143
 rarity=C
 [/card]
 [card]
@@ -339,8 +336,8 @@ id=3171
 rarity=C
 [/card]
 [card]
-primitive=Gorilla War Cry
+primitive=Gorilla Shaman
-id=3174
+id=3172
 rarity=C
 [/card]
 [card]
@@ -349,18 +346,23 @@ id=3173
 rarity=C
 [/card]
 [card]
-primitive=Graveborn Token Balduvian Dead
+primitive=Gorilla War Cry
-id=3066111111
+id=3174
+rarity=C
+[/card]
+[card]
+primitive=Graveborn Token
+id=-3066
 rarity=T
 [/card]
 [card]
 primitive=Guerrilla Tactics
-id=3176
+id=3175
 rarity=C
 [/card]
 [card]
 primitive=Guerrilla Tactics
-id=3175
+id=3176
 rarity=C
 [/card]
 [card]
@@ -390,12 +392,12 @@ rarity=U
 [/card]
 [card]
 primitive=Insidious Bookworms
-id=3078
+id=3077
 rarity=C
 [/card]
 [card]
 primitive=Insidious Bookworms
-id=3077
+id=3078
 rarity=C
 [/card]
 [card]
@@ -420,12 +422,12 @@ rarity=R
 [/card]
 [card]
 primitive=Kjeldoran Escort
-id=3199
+id=3198
 rarity=C
 [/card]
 [card]
 primitive=Kjeldoran Escort
-id=3198
+id=3199
 rarity=C
 [/card]
 [card]
@@ -440,12 +442,12 @@ rarity=R
 [/card]
 [card]
 primitive=Kjeldoran Pride
-id=3202
+id=3201
 rarity=C
 [/card]
 [card]
 primitive=Kjeldoran Pride
-id=3201
+id=3202
 rarity=C
 [/card]
 [card]
@@ -465,12 +467,12 @@ rarity=R
 [/card]
 [card]
 primitive=Lat-Nam's Legacy
-id=3111
+id=3110
 rarity=C
 [/card]
 [card]
 primitive=Lat-Nam's Legacy
-id=3110
+id=3111
 rarity=C
 [/card]
 [card]
@@ -480,12 +482,12 @@ rarity=R
 [/card]
 [card]
 primitive=Lim-Dul's High Guard
-id=3083
+id=3082
 rarity=C
 [/card]
 [card]
 primitive=Lim-Dul's High Guard
-id=3082
+id=3083
 rarity=C
 [/card]
 [card]
@@ -510,12 +512,12 @@ rarity=R
 [/card]
 [card]
 primitive=Martyrdom
-id=3204
+id=3203
 rarity=C
 [/card]
 [card]
 primitive=Martyrdom
-id=3203
+id=3204
 rarity=C
 [/card]
 [card]
@@ -555,12 +557,12 @@ rarity=R
 [/card]
 [card]
 primitive=Noble Steeds
-id=3206
+id=3205
 rarity=C
 [/card]
 [card]
 primitive=Noble Steeds
-id=3205
+id=3206
 rarity=C
 [/card]
 [card]
@@ -570,12 +572,12 @@ rarity=R
 [/card]
 [card]
 primitive=Phantasmal Fiend
-id=3086
+id=3085
 rarity=C
 [/card]
 [card]
 primitive=Phantasmal Fiend
-id=3085
+id=3086
 rarity=C
 [/card]
 [card]
@@ -590,12 +592,12 @@ rarity=R
 [/card]
 [card]
 primitive=Phyrexian Boon
-id=3088
+id=3087
 rarity=C
 [/card]
 [card]
 primitive=Phyrexian Boon
-id=3087
+id=3088
 rarity=C
 [/card]
 [card]
@@ -610,12 +612,12 @@ rarity=R
 [/card]
 [card]
 primitive=Phyrexian War Beast
-id=3054
+id=3053
 rarity=C
 [/card]
 [card]
 primitive=Phyrexian War Beast
-id=3053
+id=3054
 rarity=C
 [/card]
 [card]
@@ -635,17 +637,12 @@ rarity=U
 [/card]
 [card]
 primitive=Reinforcements
-id=3208
-rarity=C
-[/card]
-[card]
-primitive=Reinforcements
 id=3207
 rarity=C
 [/card]
 [card]
-primitive=Reprisal
+primitive=Reinforcements
-id=3210
+id=3208
 rarity=C
 [/card]
 [card]
@@ -654,6 +651,11 @@ id=3209
 rarity=C
 [/card]
 [card]
+primitive=Reprisal
+id=3210
+rarity=C
+[/card]
+[card]
 primitive=Ritual of the Machine
 id=3089
 rarity=R
@@ -670,12 +672,12 @@ rarity=R
 [/card]
 [card]
 primitive=Royal Herbalist
-id=3213
+id=3212
 rarity=C
 [/card]
 [card]
 primitive=Royal Herbalist
-id=3212
+id=3213
 rarity=C
 [/card]
 [card]
@@ -715,12 +717,12 @@ rarity=U
 [/card]
 [card]
 primitive=Soldevi Adnate
-id=3091
+id=3090
 rarity=C
 [/card]
 [card]
 primitive=Soldevi Adnate
-id=3090
+id=3091
 rarity=C
 [/card]
 [card]
@@ -735,17 +737,12 @@ rarity=R
 [/card]
 [card]
 primitive=Soldevi Heretic
-id=3115
-rarity=C
-[/card]
-[card]
-primitive=Soldevi Heretic
 id=3114
 rarity=C
 [/card]
 [card]
-primitive=Soldevi Sage
+primitive=Soldevi Heretic
-id=3117
+id=3115
 rarity=C
 [/card]
 [card]
@@ -754,8 +751,8 @@ id=3116
 rarity=C
 [/card]
 [card]
-primitive=Soldevi Sentry
+primitive=Soldevi Sage
-id=3060
+id=3117
 rarity=C
 [/card]
 [card]
@@ -764,8 +761,8 @@ id=3059
 rarity=C
 [/card]
 [card]
-primitive=Soldevi Steam Beast
+primitive=Soldevi Sentry
-id=3062
+id=3060
 rarity=C
 [/card]
 [card]
@@ -774,6 +771,11 @@ id=3061
 rarity=C
 [/card]
 [card]
+primitive=Soldevi Steam Beast
+id=3062
+rarity=C
+[/card]
+[card]
 primitive=Soldier of Fortune
 id=3182
 rarity=U
@@ -795,12 +797,12 @@ rarity=R
 [/card]
 [card]
 primitive=Stench of Decay
-id=3093
+id=3092
 rarity=C
 [/card]
 [card]
 primitive=Stench of Decay
-id=3092
+id=3093
 rarity=C
 [/card]
 [card]
@@ -810,12 +812,12 @@ rarity=R
 [/card]
 [card]
 primitive=Storm Crow
-id=3120
+id=3119
 rarity=C
 [/card]
 [card]
 primitive=Storm Crow
-id=3119
+id=3120
 rarity=C
 [/card]
 [card]
@@ -825,12 +827,12 @@ rarity=U
 [/card]
 [card]
 primitive=Storm Shaman
-id=3184
+id=3183
 rarity=C
 [/card]
 [card]
 primitive=Storm Shaman
-id=3183
+id=3184
 rarity=C
 [/card]
 [card]
@@ -855,12 +857,12 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp Mosquito
-id=3096
+id=3095
 rarity=C
 [/card]
 [card]
 primitive=Swamp Mosquito
-id=3095
+id=3096
 rarity=C
 [/card]
 [card]
@@ -870,12 +872,12 @@ rarity=R
 [/card]
 [card]
 primitive=Taste of Paradise
-id=3150
+id=3149
 rarity=C
 [/card]
 [card]
 primitive=Taste of Paradise
-id=3149
+id=3150
 rarity=C
 [/card]
 [card]
@@ -900,12 +902,12 @@ rarity=R
 [/card]
 [card]
 primitive=Undergrowth
-id=3153
+id=3152
 rarity=C
 [/card]
 [card]
 primitive=Undergrowth
-id=3152
+id=3153
 rarity=C
 [/card]
 [card]
@@ -920,12 +922,12 @@ rarity=U
 [/card]
 [card]
 primitive=Varchild's Crusader
-id=3186
+id=3185
 rarity=C
 [/card]
 [card]
 primitive=Varchild's Crusader
-id=3185
+id=3186
 rarity=C
 [/card]
 [card]
@@ -940,17 +942,12 @@ rarity=T
 [/card]
 [card]
 primitive=Veteran's Voice
-id=3189
-rarity=C
-[/card]
-[card]
-primitive=Veteran's Voice
 id=3188
 rarity=C
 [/card]
 [card]
-primitive=Viscerid Armor
+primitive=Veteran's Voice
-id=3126
+id=3189
 rarity=C
 [/card]
 [card]
@@ -959,6 +956,11 @@ id=3125
 rarity=C
 [/card]
 [card]
+primitive=Viscerid Armor
+id=3126
+rarity=C
+[/card]
+[card]
 primitive=Viscerid Drone
 id=3127
 rarity=U
@@ -970,12 +972,12 @@ rarity=R
 [/card]
 [card]
 primitive=Whip Vine
-id=3155
+id=3154
 rarity=C
 [/card]
 [card]
 primitive=Whip Vine
-id=3154
+id=3155
 rarity=C
 [/card]
 [card]
@@ -985,12 +987,12 @@ rarity=U
 [/card]
 [card]
 primitive=Wild Aesthir
-id=3220
+id=3219
 rarity=C
 [/card]
 [card]
 primitive=Wild Aesthir
-id=3219
+id=3220
 rarity=C
 [/card]
 [card]
@@ -1000,12 +1002,12 @@ rarity=R
 [/card]
 [card]
 primitive=Yavimaya Ancients
-id=3157
+id=3156
 rarity=C
 [/card]
 [card]
 primitive=Yavimaya Ancients
-id=3156
+id=3157
 rarity=C
 [/card]
 [card]

projects/mtg/bin/Res/sets/APC/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
-year=2001
+name=Apocalypse
 block=Invasion
+year=2001
+total=143
 [/meta]
 [card]
 primitive=AEther Mutation
@@ -214,12 +216,7 @@ id=28011
 rarity=R
 [/card]
 [card]
-primitive=Fire // Ice (Fire)
+primitive=Fire // Ice
-id=27165
-rarity=U
-[/card]
-[card]
-primitive=Fire // Ice (Ice)
 id=27166
 rarity=U
 [/card]
@@ -309,12 +306,7 @@ id=26447
 rarity=U
 [/card]
 [card]
-primitive=Illusion // Reality (Illusion)
+primitive=Illusion // Reality
-id=27163
-rarity=U
-[/card]
-[card]
-primitive=Illusion // Reality (Reality)
 id=27164
 rarity=U
 [/card]
@@ -374,16 +366,11 @@ id=26424
 rarity=R
 [/card]
 [card]
-primitive=Life // Death (Death)
+primitive=Life // Death
 id=27162
 rarity=U
 [/card]
 [card]
-primitive=Life // Death (Life)
-id=27161
-rarity=U
-[/card]
-[card]
 primitive=Lightning Angel
 id=27650
 rarity=R
@@ -459,26 +446,16 @@ id=25949
 rarity=R
 [/card]
 [card]
-primitive=Night // Day (Day)
+primitive=Night // Day
-id=26276
-rarity=U
-[/card]
-[card]
-primitive=Night // Day (Night)
 id=26691
 rarity=U
 [/card]
 [card]
-primitive=Order // Chaos (Chaos)
+primitive=Order // Chaos
 id=27168
 rarity=U
 [/card]
 [card]
-primitive=Order // Chaos (Order)
-id=27167
-rarity=U
-[/card]
-[card]
 primitive=Orim's Thunder
 id=28751
 rarity=C

projects/mtg/bin/Res/sets/ARB/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Alara Reborn
+block=Shards of Alara
 year=2009
-block=Shards
+total=145
 [/meta]
 [card]
 primitive=Anathemancer
@@ -9,11 +11,6 @@ id=179538
 rarity=U
 [/card]
 [card]
-primitive=Anathemancer Unearthed
-id=17953811
-rarity=T
-[/card]
-[card]
 primitive=Architects of Will
 id=179597
 rarity=C
@@ -189,11 +186,6 @@ id=179573
 rarity=C
 [/card]
 [card]
-primitive=Etherium Abomination Unearthed
-id=17957311
-rarity=T
-[/card]
-[card]
 primitive=Ethersworn Shieldmage
 id=179578
 rarity=C
@@ -329,11 +321,6 @@ id=179602
 rarity=C
 [/card]
 [card]
-primitive=Kathari Bomber Unearthed
-id=17960211
-rarity=T
-[/card]
-[card]
 primitive=Kathari Remnant
 id=185060
 rarity=U

projects/mtg/bin/Res/sets/ARN/_cards.dat

@@ -1,6 +1,8 @@
 [meta]
 author=Wagic Team
+name=Arabian Nights
 year=1993
+total=92
 [/meta]
 [card]
 primitive=Abu Ja'far
@@ -8,11 +10,6 @@ id=968
 rarity=U
 [/card]
 [card]
-primitive=Aladdin
-id=955
-rarity=R
-[/card]
-[card]
 primitive=Aladdin's Lamp
 id=900
 rarity=R
@@ -23,6 +20,11 @@ id=901
 rarity=R
 [/card]
 [card]
+primitive=Aladdin
+id=955
+rarity=R
+[/card]
+[card]
 primitive=Ali Baba
 id=956
 rarity=U
@@ -34,12 +36,12 @@ rarity=R
 [/card]
 [card]
 primitive=Army of Allah
-id=970
+id=969
 rarity=C
 [/card]
 [card]
 primitive=Army of Allah
-id=969
+id=970
 rarity=C
 [/card]
 [card]
@@ -49,12 +51,12 @@ rarity=U
 [/card]
 [card]
 primitive=Bird Maiden
-id=959
+id=958
 rarity=C
 [/card]
 [card]
 primitive=Bird Maiden
-id=958
+id=959
 rarity=C
 [/card]
 [card]
@@ -103,11 +105,6 @@ id=929
 rarity=C
 [/card]
 [card]
-primitive=Desert
-id=986
-rarity=C
-[/card]
-[card]
 primitive=Desert Nomads
 id=960
 rarity=C
@@ -118,6 +115,11 @@ id=943
 rarity=U
 [/card]
 [card]
+primitive=Desert
+id=986
+rarity=C
+[/card]
+[card]
 primitive=Diamond Valley
 id=987
 rarity=U
@@ -133,19 +135,14 @@ id=906
 rarity=R
 [/card]
 [card]
-primitive=Elephant Graveyard
-id=988
-rarity=R
-[/card]
-[card]
 primitive=El-Hajjaj
 id=915
 rarity=R
 [/card]
 [card]
-primitive=Erg Raiders
+primitive=Elephant Graveyard
-id=917
+id=988
-rarity=C
+rarity=R
 [/card]
 [card]
 primitive=Erg Raiders
@@ -153,6 +150,11 @@ id=916
 rarity=C
 [/card]
 [card]
+primitive=Erg Raiders
+id=917
+rarity=C
+[/card]
+[card]
 primitive=Erhnam Djinn
 id=945
 rarity=R
@@ -164,12 +166,12 @@ rarity=U
 [/card]
 [card]
 primitive=Fishliver Oil
-id=931
+id=930
 rarity=C
 [/card]
 [card]
 primitive=Fishliver Oil
-id=930
+id=931
 rarity=C
 [/card]
 [card]
@@ -189,12 +191,12 @@ rarity=C
 [/card]
 [card]
 primitive=Giant Tortoise
-id=934
+id=933
 rarity=C
 [/card]
 [card]
 primitive=Giant Tortoise
-id=933
+id=934
 rarity=C
 [/card]
 [card]
@@ -204,12 +206,12 @@ rarity=R
 [/card]
 [card]
 primitive=Hasran Ogress
-id=920
+id=919
 rarity=C
 [/card]
 [card]
 primitive=Hasran Ogress
-id=919
+id=920
 rarity=C
 [/card]
 [card]
@@ -304,17 +306,22 @@ rarity=R
 [/card]
 [card]
 primitive=Moorish Cavalry
-id=976
+id=975
 rarity=C
 [/card]
 [card]
 primitive=Moorish Cavalry
-id=975
+id=976
 rarity=C
 [/card]
 [card]
 primitive=Mountain
 id=983
+rarity=L
+[/card]
+[card]
+primitive=Nafs Asp
+id=949
 rarity=C
 [/card]
 [card]
@@ -323,11 +330,6 @@ id=950
 rarity=C
 [/card]
 [card]
-primitive=Nafs Asp
-id=949
-rarity=C
-[/card]
-[card]
 primitive=Oasis
 id=991
 rarity=U
@@ -339,17 +341,12 @@ rarity=R
 [/card]
 [card]
 primitive=Oubliette
-id=925
-rarity=C
-[/card]
-[card]
-primitive=Oubliette
 id=924
 rarity=C
 [/card]
 [card]
-primitive=Piety
+primitive=Oubliette
-id=978
+id=925
 rarity=C
 [/card]
 [card]
@@ -358,6 +355,11 @@ id=977
 rarity=C
 [/card]
 [card]
+primitive=Piety
+id=978
+rarity=C
+[/card]
+[card]
 primitive=Pyramids
 id=911
 rarity=R
@@ -374,12 +376,12 @@ rarity=R
 [/card]
 [card]
 primitive=Rukh Egg
-id=966
+id=965
 rarity=C
 [/card]
 [card]
 primitive=Rukh Egg
-id=965
+id=966
 rarity=C
 [/card]
 [card]
@@ -424,12 +426,12 @@ rarity=U
 [/card]
 [card]
 primitive=Stone-Throwing Devils
-id=928
+id=927
 rarity=C
 [/card]
 [card]
 primitive=Stone-Throwing Devils
-id=927
+id=928
 rarity=C
 [/card]
 [card]
@@ -439,17 +441,12 @@ rarity=C
 [/card]
 [card]
 primitive=War Elephant
-id=982
-rarity=C
-[/card]
-[card]
-primitive=War Elephant
 id=981
 rarity=C
 [/card]
 [card]
-primitive=Wyluli Wolf
+primitive=War Elephant
-id=954
+id=982
 rarity=C
 [/card]
 [card]
@@ -458,6 +455,11 @@ id=953
 rarity=C
 [/card]
 [card]
+primitive=Wyluli Wolf
+id=954
+rarity=C
+[/card]
+[card]
 primitive=Ydwen Efreet
 id=967
 rarity=R

projects/mtg/bin/Res/sets/ATQ/_cards.dat

@@ -1,6 +1,8 @@
 [meta]
 author=Wagic Team
+name=Antiquities
 year=1994
+total=100
 [/meta]
 [card]
 primitive=Amulet of Kroog
@@ -219,12 +221,7 @@ rarity=U
 [/card]
 [card]
 primitive=Mishra's Factory
-id=1074
+id=1071
-rarity=U
-[/card]
-[card]
-primitive=Mishra's Factory
-id=1073
 rarity=R
 [/card]
 [card]
@@ -234,10 +231,15 @@ rarity=R
 [/card]
 [card]
 primitive=Mishra's Factory
-id=1071
+id=1073
 rarity=R
 [/card]
 [card]
+primitive=Mishra's Factory
+id=1074
+rarity=U
+[/card]
+[card]
 primitive=Mishra's War Machine
 id=1013
 rarity=R
@@ -334,12 +336,7 @@ rarity=C
 [/card]
 [card]
 primitive=Strip Mine
-id=1079
+id=1076
-rarity=U
-[/card]
-[card]
-primitive=Strip Mine
-id=1078
 rarity=R
 [/card]
 [card]
@@ -349,10 +346,15 @@ rarity=R
 [/card]
 [card]
 primitive=Strip Mine
-id=1076
+id=1078
 rarity=R
 [/card]
 [card]
+primitive=Strip Mine
+id=1079
+rarity=U
+[/card]
+[card]
 primitive=Su-Chi
 id=1022
 rarity=U
@@ -414,12 +416,7 @@ rarity=C
 [/card]
 [card]
 primitive=Urza's Mine
-id=1083
+id=1080
-rarity=U
-[/card]
-[card]
-primitive=Urza's Mine
-id=1082
 rarity=C
 [/card]
 [card]
@@ -429,37 +426,47 @@ rarity=U
 [/card]
 [card]
 primitive=Urza's Mine
-id=1080
+id=1082
 rarity=C
 [/card]
 [card]
+primitive=Urza's Mine
+id=1083
+rarity=U
+[/card]
+[card]
 primitive=Urza's Miter
 id=1032
 rarity=R
 [/card]
 [card]
 primitive=Urza's Power Plant
-id=1087
+id=1084
 rarity=U
 [/card]
 [card]
 primitive=Urza's Power Plant
-id=1086
-rarity=C
-[/card]
-[card]
-primitive=Urza's Power Plant
 id=1085
 rarity=C
 [/card]
 [card]
 primitive=Urza's Power Plant
-id=1084
+id=1086
+rarity=C
+[/card]
+[card]
+primitive=Urza's Power Plant
+id=1087
 rarity=U
 [/card]
 [card]
 primitive=Urza's Tower
-id=1091
+id=1088
+rarity=U
+[/card]
+[card]
+primitive=Urza's Tower
+id=1089
 rarity=U
 [/card]
 [card]
@@ -469,12 +476,7 @@ rarity=C
 [/card]
 [card]
 primitive=Urza's Tower
-id=1089
+id=1091
-rarity=U
-[/card]
-[card]
-primitive=Urza's Tower
-id=1088
 rarity=U
 [/card]
 [card]

projects/mtg/bin/Res/sets/AVN/_cards.dat

@@ -1,8 +1,9 @@
 [meta]
 author=Wagic Team
-name=AVN
+name=Duel Decks: Ajani vs. Nicol Bolas
 block=Duel
 year=2011
+total=80
 [/meta]
 [card]
 primitive=Ageless Entity
@@ -95,11 +96,6 @@ id=249395
 rarity=C
 [/card]
 [card]
-primitive=Rise // Fall
-id=259266
-rarity=U
-[/card]
-[card]
 primitive=Fire-Field Ogre
 id=259270
 rarity=U
@@ -116,13 +112,13 @@ rarity=U
 [/card]
 [card]
 primitive=Forest
-id=262651
+id=259285
-rarity=C
+rarity=L
 [/card]
 [card]
 primitive=Forest
-id=259285
+id=262651
-rarity=C
+rarity=L
 [/card]
 [card]
 primitive=Graypelt Refuge
@@ -162,7 +158,7 @@ rarity=C
 [card]
 primitive=Island
 id=259287
-rarity=C
+rarity=L
 [/card]
 [card]
 primitive=Jade Mage
@@ -210,11 +206,6 @@ id=249414
 rarity=R
 [/card]
 [card]
-primitive=Spite // Malice
-id=249394
-rarity=U
-[/card]
-[card]
 primitive=Marisi's Twinclaws
 id=249375
 rarity=U
@@ -231,13 +222,13 @@ rarity=U
 [/card]
 [card]
 primitive=Mountain
-id=259286
+id=259284
-rarity=C
+rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=259284
+id=259286
-rarity=C
+rarity=L
 [/card]
 [card]
 primitive=Nacatl Hunt-Pride
@@ -277,7 +268,7 @@ rarity=U
 [card]
 primitive=Plains
 id=249376
-rarity=C
+rarity=L
 [/card]
 [card]
 primitive=Pride of Lions
@@ -305,6 +296,11 @@ id=249400
 rarity=C
 [/card]
 [card]
+primitive=Rise // Fall
+id=259266
+rarity=U
+[/card]
+[card]
 primitive=Rupture Spire
 id=259282
 rarity=C
@@ -335,6 +331,11 @@ id=249404
 rarity=U
 [/card]
 [card]
+primitive=Spite // Malice
+id=249394
+rarity=U
+[/card]
+[card]
 primitive=Spitemare
 id=249388
 rarity=U
@@ -351,13 +352,13 @@ rarity=C
 [/card]
 [card]
 primitive=Swamp
-id=262652
+id=259283
-rarity=C
+rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=259283
+id=262652
-rarity=C
+rarity=L
 [/card]
 [card]
 primitive=Sylvan Bounty

projects/mtg/bin/Res/sets/AVR/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Avacyn Restored
+block=Innistrad
 year=2012
-block=ISD
+total=244
 [/meta]
 [card]
 primitive=Abundant Growth
@@ -39,16 +41,6 @@ id=240120
 rarity=R
 [/card]
 [card]
-primitive=Angelic Armaments
-id=240074
-rarity=U
-[/card]
-[card]
-primitive=Angelic Wall
-id=278065
-rarity=C
-[/card]
-[card]
 primitive=Angel's Mercy
 id=240044
 rarity=C
@@ -59,6 +51,16 @@ id=240059
 rarity=U
 [/card]
 [card]
+primitive=Angelic Armaments
+id=240074
+rarity=U
+[/card]
+[card]
+primitive=Angelic Wall
+id=278065
+rarity=C
+[/card]
+[card]
 primitive=Appetite for Brains
 id=279612
 rarity=U
@@ -425,7 +427,7 @@ rarity=C
 [/card]
 [card]
 primitive=Forest
-id=269636
+id=269629
 rarity=L
 [/card]
 [card]
@@ -435,7 +437,7 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=269629
+id=269636
 rarity=L
 [/card]
 [card]
@@ -615,7 +617,7 @@ rarity=U
 [/card]
 [card]
 primitive=Island
-id=269639
+id=269625
 rarity=L
 [/card]
 [card]
@@ -625,7 +627,7 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=269625
+id=269639
 rarity=L
 [/card]
 [card]
@@ -755,11 +757,6 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=269632
-rarity=L
-[/card]
-[card]
-primitive=Mountain
 id=269622
 rarity=L
 [/card]
@@ -769,6 +766,11 @@ id=269630
 rarity=L
 [/card]
 [card]
+primitive=Mountain
+id=269632
+rarity=L
+[/card]
+[card]
 primitive=Narstad Scrapper
 id=279607
 rarity=C
@@ -830,12 +832,12 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=269637
+id=269634
 rarity=L
 [/card]
 [card]
 primitive=Plains
-id=269634
+id=269637
 rarity=L
 [/card]
 [card]
@@ -949,13 +951,13 @@ id=240063
 rarity=U
 [/card]
 [card]
-primitive=Seraph of Dawn
+primitive=Seraph Sanctuary
-id=240078
+id=240175
 rarity=C
 [/card]
 [card]
-primitive=Seraph Sanctuary
+primitive=Seraph of Dawn
-id=240175
+id=240078
 rarity=C
 [/card]
 [card]
@@ -1035,12 +1037,12 @@ rarity=U
 [/card]
 [card]
 primitive=Swamp
-id=269631
+id=269627
 rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=269627
+id=269631
 rarity=L
 [/card]
 [card]
@@ -1232,4 +1234,4 @@ rarity=R
 primitive=Zealous Strike
 id=240019
 rarity=C
-[/card]
+[/card]

projects/mtg/bin/Res/sets/BFZ/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
 name=Battle for Zendikar
+block=Battle for Zendikar
 year=2015
+total=299
 [/meta]
 [card]
 primitive=Adverse Conditions
@@ -299,16 +301,16 @@ id=401860
 rarity=M
 [/card]
 [card]
-primitive=Drana, Liberator of Malakir
-id=401861
-rarity=M
-[/card]
-[card]
 primitive=Drana's Emissary
 id=401862
 rarity=U
 [/card]
 [card]
+primitive=Drana, Liberator of Malakir
+id=401861
+rarity=M
+[/card]
+[card]
 primitive=Drowner of Hope
 id=401863
 rarity=R
@@ -574,16 +576,16 @@ id=401896
 rarity=C
 [/card]
 [card]
-primitive=Gideon, Ally of Zendikar
-id=401897
-rarity=M
-[/card]
-[card]
 primitive=Gideon's Reproach
 id=401898
 rarity=C
 [/card]
 [card]
+primitive=Gideon, Ally of Zendikar
+id=401897
+rarity=M
+[/card]
+[card]
 primitive=Goblin War Paint
 id=401899
 rarity=C
@@ -1179,16 +1181,16 @@ id=402012
 rarity=U
 [/card]
 [card]
-primitive=Roilmage's Trick
-id=402014
-rarity=C
-[/card]
-[card]
 primitive=Roil's Retribution
 id=402013
 rarity=U
 [/card]
 [card]
+primitive=Roilmage's Trick
+id=402014
+rarity=C
+[/card]
+[card]
 primitive=Rolling Thunder
 id=402015
 rarity=U
@@ -1509,11 +1511,6 @@ id=402078
 rarity=R
 [/card]
 [card]
-primitive=Ulamog, the Ceaseless Hunger
-id=402079
-rarity=M
-[/card]
-[card]
 primitive=Ulamog's Despoiler
 id=402080
 rarity=U
@@ -1529,6 +1526,11 @@ id=402082
 rarity=U
 [/card]
 [card]
+primitive=Ulamog, the Ceaseless Hunger
+id=402079
+rarity=M
+[/card]
+[card]
 primitive=Undergrowth Champion
 id=402083
 rarity=M

projects/mtg/bin/Res/sets/BNG/_cards.dat

@@ -1,8 +1,9 @@
 [meta]
 author=Wagic Team
 name=Born of the Gods
-year=2014
 block=Theros
+year=2014
+total=165
 [/meta]
 [card]
 primitive=Acolyte's Reward
@@ -180,11 +181,6 @@ id=378380
 rarity=C
 [/card]
 [card]
-primitive=Ephara, God of the Polis
-id=378517
-rarity=M
-[/card]
-[card]
 primitive=Ephara's Enlightenment
 id=378518
 rarity=U
@@ -195,6 +191,11 @@ id=378381
 rarity=C
 [/card]
 [card]
+primitive=Ephara, God of the Polis
+id=378517
+rarity=M
+[/card]
+[card]
 primitive=Epiphany Storm
 id=378463
 rarity=C
@@ -307,7 +308,7 @@ rarity=U
 [card]
 primitive=Forsaken Drifters
 id=378444
-rarity=U
+rarity=C
 [/card]
 [card]
 primitive=Ghostblade Eidolon
@@ -395,24 +396,19 @@ id=378471
 rarity=C
 [/card]
 [card]
-primitive=Karametra, God of Harvests
-id=378520
-rarity=M
-[/card]
-[card]
 primitive=Karametra's Favor
 id=378497
 rarity=C
 [/card]
 [card]
-primitive=Kiora, the Crashing Wave
+primitive=Karametra, God of Harvests
-id=378521
+id=378520
 rarity=M
 [/card]
 [card]
-primitive=Kiora's Prevention
+primitive=Kiora's Follower
-id=37852101
+id=378522
-rarity=T
+rarity=U
 [/card]
 [card]
 primitive=Kiora's Kraken
@@ -420,9 +416,9 @@ id=-378521
 rarity=T
 [/card]
 [card]
-primitive=Kiora's Follower
+primitive=Kiora, the Crashing Wave
-id=378522
+id=378521
-rarity=U
+rarity=M
 [/card]
 [card]
 primitive=Kragma Butcher
@@ -615,7 +611,7 @@ id=378507
 rarity=U
 [/card]
 [card]
-primitive=Reap what is Sown
+primitive=Reap What Is Sown
 id=378526
 rarity=U
 [/card]
@@ -700,6 +696,11 @@ id=378398
 rarity=R
 [/card]
 [card]
+primitive=Siren Song Lyre
+id=378533
+rarity=U
+[/card]
+[card]
 primitive=Siren of the Fanged Coast
 id=378422
 rarity=U
@@ -710,11 +711,6 @@ id=378527
 rarity=U
 [/card]
 [card]
-primitive=Siren Song Lyre
-id=378533
-rarity=U
-[/card]
-[card]
 primitive=Skyreaping
 id=378512
 rarity=U

projects/mtg/bin/Res/sets/BOK/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Betrayers of Kamigawa
+block=Kamigawa
 year=2005
-block=Kami
+total=165
 [/meta]
 [card]
 primitive=Akki Blizzard-Herder
@@ -609,13 +611,13 @@ id=74541
 rarity=C
 [/card]
 [card]
-primitive=Scour
+primitive=Scourge of Numai
-id=74640
+id=74488
 rarity=U
 [/card]
 [card]
-primitive=Scourge of Numai
+primitive=Scour
-id=74488
+id=74640
 rarity=U
 [/card]
 [card]

projects/mtg/bin/Res/sets/BRB/_cards.dat

@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
+name=Battle Royale Box Set
 year=1999
-block=Duel
+total=136
 [/meta]
 [card]
 primitive=Abyssal Specter
@@ -145,37 +146,7 @@ rarity=C
 [/card]
 [card]
 primitive=Forest
-id=22355
+id=21119
-rarity=L
-[/card]
-[card]
-primitive=Forest
-id=22354
-rarity=L
-[/card]
-[card]
-primitive=Forest
-id=22353
-rarity=L
-[/card]
-[card]
-primitive=Forest
-id=22352
-rarity=L
-[/card]
-[card]
-primitive=Forest
-id=22351
-rarity=L
-[/card]
-[card]
-primitive=Forest
-id=22349
-rarity=L
-[/card]
-[card]
-primitive=Forest
-id=22348
 rarity=L
 [/card]
 [card]
@@ -185,7 +156,37 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=21119
+id=22348
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=22349
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=22351
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=22352
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=22353
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=22354
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=22355
 rarity=L
 [/card]
 [card]
@@ -220,17 +221,7 @@ rarity=C
 [/card]
 [card]
 primitive=Island
-id=22367
+id=21144
-rarity=L
-[/card]
-[card]
-primitive=Island
-id=22366
-rarity=L
-[/card]
-[card]
-primitive=Island
-id=22365
 rarity=L
 [/card]
 [card]
@@ -240,7 +231,17 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=21144
+id=22365
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=22366
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=22367
 rarity=L
 [/card]
 [card]
@@ -269,6 +270,11 @@ id=21107
 rarity=C
 [/card]
 [card]
+primitive=Man-o'-War
+id=21138
+rarity=C
+[/card]
+[card]
 primitive=Mana Leak
 id=21126
 rarity=C
@@ -279,11 +285,6 @@ id=21097
 rarity=C
 [/card]
 [card]
-primitive=Man-o'-War
-id=21138
-rarity=C
-[/card]
-[card]
 primitive=Manta Riders
 id=21125
 rarity=C
@@ -300,37 +301,7 @@ rarity=U
 [/card]
 [card]
 primitive=Mountain
-id=22344
+id=21118
-rarity=L
-[/card]
-[card]
-primitive=Mountain
-id=22343
-rarity=L
-[/card]
-[card]
-primitive=Mountain
-id=22342
-rarity=L
-[/card]
-[card]
-primitive=Mountain
-id=22340
-rarity=L
-[/card]
-[card]
-primitive=Mountain
-id=22339
-rarity=L
-[/card]
-[card]
-primitive=Mountain
-id=22336
-rarity=L
-[/card]
-[card]
-primitive=Mountain
-id=22335
 rarity=L
 [/card]
 [card]
@@ -340,7 +311,37 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=21118
+id=22335
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=22336
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=22339
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=22340
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=22342
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=22343
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=22344
 rarity=L
 [/card]
 [card]
@@ -375,37 +376,7 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=22363
+id=21145
-rarity=L
-[/card]
-[card]
-primitive=Plains
-id=22362
-rarity=L
-[/card]
-[card]
-primitive=Plains
-id=22361
-rarity=L
-[/card]
-[card]
-primitive=Plains
-id=22360
-rarity=L
-[/card]
-[card]
-primitive=Plains
-id=22359
-rarity=L
-[/card]
-[card]
-primitive=Plains
-id=22358
-rarity=L
-[/card]
-[card]
-primitive=Plains
-id=22357
 rarity=L
 [/card]
 [card]
@@ -415,7 +386,37 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=21145
+id=22357
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=22358
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=22359
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=22360
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=22361
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=22362
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=22363
 rarity=L
 [/card]
 [card]
@@ -580,12 +581,7 @@ rarity=C
 [/card]
 [card]
 primitive=Swamp
-id=22370
+id=21171
-rarity=L
-[/card]
-[card]
-primitive=Swamp
-id=22369
 rarity=L
 [/card]
 [card]
@@ -595,7 +591,12 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=21171
+id=22369
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=22370
 rarity=L
 [/card]
 [card]

projects/mtg/bin/Res/sets/BTD/_cards.dat

@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
+name=Beatdown Box Set
 year=2000
-block=Duel
+total=90
 [/meta]
 [card]
 primitive=Air Elemental
@@ -139,13 +140,13 @@ id=26621
 rarity=C
 [/card]
 [card]
-primitive=Fog
+primitive=Fog Elemental
-id=26648
+id=26657
 rarity=C
 [/card]
 [card]
-primitive=Fog Elemental
+primitive=Fog
-id=26657
+id=26648
 rarity=C
 [/card]
 [card]
@@ -155,7 +156,7 @@ rarity=R
 [/card]
 [card]
 primitive=Forest
-id=27244
+id=27242
 rarity=L
 [/card]
 [card]
@@ -165,7 +166,7 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=27242
+id=27244
 rarity=L
 [/card]
 [card]
@@ -210,7 +211,7 @@ rarity=C
 [/card]
 [card]
 primitive=Island
-id=27238
+id=27236
 rarity=L
 [/card]
 [card]
@@ -220,7 +221,7 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=27236
+id=27238
 rarity=L
 [/card]
 [card]
@@ -265,7 +266,7 @@ rarity=R
 [/card]
 [card]
 primitive=Mountain
-id=27241
+id=27239
 rarity=L
 [/card]
 [card]
@@ -275,7 +276,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=27239
+id=27241
 rarity=L
 [/card]
 [card]
@@ -380,7 +381,7 @@ rarity=U
 [/card]
 [card]
 primitive=Swamp
-id=27235
+id=27233
 rarity=L
 [/card]
 [card]
@@ -390,7 +391,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=27233
+id=27235
 rarity=L
 [/card]
 [card]

projects/mtg/bin/Res/sets/CFX/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Conflux
+block=Shards of Alara
 year=2009
-block=Shards
+total=145
 [/meta]
 [card]
 primitive=Absorb Vis
@@ -74,11 +76,6 @@ id=180147
 rarity=C
 [/card]
 [card]
-primitive=Brackwater Elemental Unearthed
-id=18014711
-rarity=T
-[/card]
-[card]
 primitive=Canyon Minotaur
 id=184994
 rarity=C
@@ -209,11 +206,6 @@ id=189082
 rarity=R
 [/card]
 [card]
-primitive=Extractor Demon Unearthed
-id=18908211
-rarity=T
-[/card]
-[card]
 primitive=Faerie Mechanist
 id=182608
 rarity=C
@@ -284,11 +276,6 @@ id=179804
 rarity=U
 [/card]
 [card]
-primitive=Grixis Slavedriver Unearthed
-id=17980411
-rarity=T
-[/card]
-[card]
 primitive=Gwafa Hazid, Profiteer
 id=185811
 rarity=R
@@ -304,11 +291,6 @@ id=174799
 rarity=U
 [/card]
 [card]
-primitive=Hellspark Elemental Unearthed
-id=17479911
-rarity=T
-[/card]
-[card]
 primitive=Ignite Disorder
 id=183056
 rarity=U
@@ -579,11 +561,6 @@ id=184991
 rarity=U
 [/card]
 [card]
-primitive=Shambling Remains Unearthed
-id=18499111
-rarity=T
-[/card]
-[card]
 primitive=Shard Convergence
 id=175034
 rarity=U

projects/mtg/bin/Res/sets/CHK/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Champions of Kamigawa
+block=Kamigawa
 year=2004
-block=Kami
+total=307
 [/meta]
 [card]
 primitive=Akki Avalanchers
@@ -100,12 +102,12 @@ rarity=R
 [/card]
 [card]
 primitive=Brothers Yamazaki
-id=85106
+id=78968
 rarity=U
 [/card]
 [card]
 primitive=Brothers Yamazaki
-id=78968
+id=85106
 rarity=U
 [/card]
 [card]
@@ -330,12 +332,12 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=79079
+id=79078
 rarity=L
 [/card]
 [card]
 primitive=Forest
-id=79078
+id=79079
 rarity=L
 [/card]
 [card]
@@ -459,11 +461,6 @@ id=50426
 rarity=U
 [/card]
 [card]
-primitive=Hisoka, Minamo Sensei
-id=50474
-rarity=R
-[/card]
-[card]
 primitive=Hisoka's Defiance
 id=50439
 rarity=C
@@ -474,6 +471,11 @@ id=79149
 rarity=C
 [/card]
 [card]
+primitive=Hisoka, Minamo Sensei
+id=50474
+rarity=R
+[/card]
+[card]
 primitive=Hold the Line
 id=79144
 rarity=R
@@ -654,6 +656,11 @@ id=79236
 rarity=U
 [/card]
 [card]
+primitive=Kami of Twisted Reflection
+id=50228
+rarity=C
+[/card]
+[card]
 primitive=Kami of the Hunt
 id=79198
 rarity=C
@@ -674,11 +681,6 @@ id=50311
 rarity=C
 [/card]
 [card]
-primitive=Kami of Twisted Reflection
-id=50228
-rarity=C
-[/card]
-[card]
 primitive=Kashi-Tribe Reaver
 id=76634
 rarity=U
@@ -699,11 +701,6 @@ id=50321
 rarity=R
 [/card]
 [card]
-primitive=Kiki's Cloning Object
-id=5032111
-rarity=T
-[/card]
-[card]
 primitive=Kiku, Night's Flower
 id=78962
 rarity=R
@@ -764,11 +761,6 @@ id=50445
 rarity=R
 [/card]
 [card]
-primitive=Konda, Lord of Eiganjo
-id=78594
-rarity=R
-[/card]
-[card]
 primitive=Konda's Banner
 id=76637
 rarity=R
@@ -779,8 +771,8 @@ id=79201
 rarity=U
 [/card]
 [card]
-primitive=Kumano, Master Yamabushi
+primitive=Konda, Lord of Eiganjo
-id=78964
+id=78594
 rarity=R
 [/card]
 [card]
@@ -789,6 +781,11 @@ id=75267
 rarity=U
 [/card]
 [card]
+primitive=Kumano, Master Yamabushi
+id=78964
+rarity=R
+[/card]
+[card]
 primitive=Kuro, Pitlord
 id=82423
 rarity=R
@@ -976,7 +973,7 @@ rarity=R
 [card]
 primitive=Stabwhisker the Odious
 id=7867911
-rarity=R
+rarity=T
 [/card]
 [card]
 primitive=Night Dealings
@@ -1484,16 +1481,16 @@ id=78606
 rarity=R
 [/card]
 [card]
-primitive=Time of Need
-id=78987
-rarity=U
-[/card]
-[card]
 primitive=Time Stop
 id=78184
 rarity=R
 [/card]
 [card]
+primitive=Time of Need
+id=78987
+rarity=U
+[/card]
+[card]
 primitive=Tranquil Garden
 id=79196
 rarity=U
@@ -1597,4 +1594,4 @@ rarity=R
 primitive=Zo-Zu the Punisher
 id=80274
 rarity=R
-[/card]
+[/card]

projects/mtg/bin/Res/sets/CSP/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Coldsnap
+block=Ice Age
 year=2006
-block=Ice
+total=155
 [/meta]
 [card]
 primitive=Adarkar Valkyrie
@@ -309,16 +311,6 @@ id=121199
 rarity=C
 [/card]
 [card]
-primitive=Jester's Scepter
-id=122066
-rarity=R
-[/card]
-[card]
-primitive=Jokulmorder
-id=121198
-rarity=R
-[/card]
-[card]
 primitive=Jotun Grunt
 id=122075
 rarity=U
@@ -329,6 +321,16 @@ id=121236
 rarity=U
 [/card]
 [card]
+primitive=Jester's Scepter
+id=122066
+rarity=R
+[/card]
+[card]
+primitive=Jokulmorder
+id=121198
+rarity=R
+[/card]
+[card]
 primitive=Juniper Order Ranger
 id=121172
 rarity=U

projects/mtg/bin/Res/sets/DGM/_cards.dat

@@ -1,25 +1,27 @@
 [meta]
 author=Wagic Team
+name=Dragon's Maze
+block=Return to Ravnica
 year=2013
-block=RTR
+total=156
 [/meta]
 [card]
+primitive=AEtherling
+id=368961
+rarity=R
+[/card]
+[card]
 primitive=Advent of the Wurm
 id=369036
 rarity=R
 [/card]
 [card]
-primitive=AEtherling
+primitive=Alive // Well
-id=368961
-rarity=R 
-[/card]
-[card]
-primitive=Alive // Well (Alive)
 id=369041
 rarity=U
 [/card]
 [card]
-primitive=Armed // Dangerous (Armed)
+primitive=Armed // Dangerous
 id=368989
 rarity=U
 [/card]
@@ -34,11 +36,6 @@ id=369016
 rarity=U
 [/card]
 [card]
-primitive=Far // Away (Away)
-id=369042
-rarity=U
-[/card]
-[card]
 primitive=Awe for the Guilds
 id=369053
 rarity=C
@@ -64,7 +61,7 @@ id=368984
 rarity=C
 [/card]
 [card]
-primitive=Beck // Call (Beck)
+primitive=Beck // Call
 id=369063
 rarity=R
 [/card]
@@ -84,11 +81,6 @@ id=369047
 rarity=U
 [/card]
 [card]
-primitive=Flesh // Blood (Blood)
-id=368991
-rarity=R
-[/card]
-[card]
 primitive=Blood Baron of Vizkopa
 id=368954
 rarity=M
@@ -119,7 +111,7 @@ id=369028
 rarity=C
 [/card]
 [card]
-primitive=Breaking // Entering (Breaking)
+primitive=Breaking // Entering
 id=369009
 rarity=R
 [/card]
@@ -134,22 +126,12 @@ id=368971
 rarity=U
 [/card]
 [card]
-primitive=Turn // Burn (Burn)
-id=369080
-rarity=U
-[/card]
-[card]
-primitive=Beck // Call (Beck)
-id=369063
-rarity=R
-[/card]
-[card]
 primitive=Carnage Gladiator
 id=369057
 rarity=U
 [/card]
 [card]
-primitive=Catch // Release (Catch)
+primitive=Catch // Release
 id=368982
 rarity=R
 [/card]
@@ -169,11 +151,6 @@ id=369056
 rarity=C
 [/card]
 [card]
-primitive= Armed // Dangerous (Dangerous)
-id=368989
-rarity=U
-[/card]
-[card]
 primitive=Deadbridge Chant
 id=369003
 rarity=M
@@ -199,12 +176,7 @@ id=369058
 rarity=C
 [/card]
 [card]
-primitive=Down // Dirty (Dirty)
+primitive=Down // Dirty
-id=369089
-rarity=U
-[/card]
-[card]
-primitive=Down // Dirty (Down)
 id=369089
 rarity=U
 [/card]
@@ -224,17 +196,12 @@ id=368944
 rarity=R
 [/card]
 [card]
-primitive= Breaking // Entering (Entering)
-id=369009
-rarity=R
-[/card]
-[card]
 primitive=Exava, Rakdos Blood Witch
 id=369055
 rarity=R
 [/card]
 [card]
-primitive=Far // Away (Far)
+primitive=Far // Away
 id=369042
 rarity=U
 [/card]
@@ -249,7 +216,7 @@ id=368969
 rarity=U
 [/card]
 [card]
-primitive=Flesh // Blood (Flesh)
+primitive=Flesh // Blood
 id=368991
 rarity=R
 [/card]
@@ -264,7 +231,7 @@ id=369095
 rarity=R
 [/card]
 [card]
-primitive=Give // Take (Give)
+primitive=Give // Take
 id=369097
 rarity=U
 [/card]
@@ -351,7 +318,7 @@ rarity=U
 [card]
 primitive=Kraul Warrior
 id=369059
-rarity=U
+rarity=C
 [/card]
 [card]
 primitive=Lavinia of the Tenth
@@ -364,11 +331,6 @@ id=369066
 rarity=M
 [/card]
 [card]
-primitive=Profit // Loss (Loss)
-id=369071
-rarity=U
-[/card]
-[card]
 primitive=Lyev Decree
 id=368965
 rarity=C
@@ -504,7 +466,7 @@ id=369013
 rarity=R
 [/card]
 [card]
-primitive=Profit // Loss (Profit)
+primitive=Profit // Loss
 id=369071
 rarity=U
 [/card]
@@ -514,7 +476,7 @@ id=369001
 rarity=M
 [/card]
 [card]
-primitive=Protect // Serve (Protect)
+primitive=Protect // Serve
 id=369024
 rarity=U
 [/card]
@@ -554,7 +516,7 @@ id=369031
 rarity=M
 [/card]
 [card]
-primitive=Ready // Willing (Ready)
+primitive=Ready // Willing
 id=368967
 rarity=R
 [/card]
@@ -564,11 +526,6 @@ id=368958
 rarity=M
 [/card]
 [card]
-primitive=Catch // Release (Release)
-id=368982
-rarity=R
-[/card]
-[card]
 primitive=Render Silent
 id=369022
 rarity=R
@@ -634,7 +591,7 @@ id=369005
 rarity=U
 [/card]
 [card]
-primitive=Scion of Vitu-Ghazi 
+primitive=Scion of Vitu-Ghazi
 id=369092
 rarity=R
 [/card]
@@ -649,11 +606,6 @@ id=369018
 rarity=C
 [/card]
 [card]
-primitive=Serve // Protect (Serve)
-id=369024
-rarity=U
-[/card]
-[card]
 primitive=Showstopper
 id=368945
 rarity=U
@@ -719,16 +671,6 @@ id=369098
 rarity=R
 [/card]
 [card]
-primitive=Give // Take (Take)
-id=369097
-rarity=U
-[/card]
-[card]
-primitive=Wear // Tear (Tear)
-id=368950
-rarity=U
-[/card]
-[card]
 primitive=Teysa, Envoy of Ghosts
 id=369011
 rarity=R
@@ -744,7 +686,7 @@ id=368970
 rarity=C
 [/card]
 [card]
-primitive=Toil // Trouble (Toil)
+primitive=Toil // Trouble
 id=369032
 rarity=U
 [/card]
@@ -779,12 +721,7 @@ id=-19784555
 rarity=T
 [/card]
 [card]
-primitive=Toil // Trouble (Trouble)
+primitive=Turn // Burn
-id=369032
-rarity=U
-[/card]
-[card]
-primitive=Turn // Burn (Turn)
 id=369080
 rarity=U
 [/card]
@@ -844,21 +781,11 @@ id=369004
 rarity=C
 [/card]
 [card]
-primitive=Wear // Tear (Wear)
+primitive=Wear // Tear
 id=368950
 rarity=U
 [/card]
 [card]
-primitive=Alive // Well (Well)
-id=369041
-rarity=U
-[/card]
-[card]
-primitive=Ready // Willing (Willing)
-id=368967
-rarity=R
-[/card]
-[card]
 primitive=Wind Drake
 id=369037
 rarity=C
@@ -877,4 +804,4 @@ rarity=R
 primitive=Zhur-Taa Druid
 id=369065
 rarity=C
-[/card]
+[/card]

projects/mtg/bin/Res/sets/DIS/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Dissension
+block=Ravnica
 year=2006
-block=Guild
+total=180
 [/meta]
 [card]
 primitive=AEthermage's Touch
@@ -94,16 +96,10 @@ id=107306
 rarity=U
 [/card]
 [card]
-primitive=Bound // Determined (Bound)
+primitive=Bound // Determined
 id=107373
 rarity=R
 [/card]
-#Need to find a way to deal with multipart cards
-#[card]
-#primitive=Bound // Determined (Determined)
-#id=107373
-#rarity=R
-#[/card]
 [card]
 primitive=Brace for Impact
 id=107537
@@ -155,16 +151,10 @@ id=107265
 rarity=U
 [/card]
 [card]
-primitive=Crime // Punishment (Crime)
+primitive=Crime // Punishment
 id=107285
 rarity=R
 [/card]
-#Need to find a way to deal with multipart cards
-#[card]
-#primitive=Crime // Punishment (Punishment)
-#id=107285
-#rarity=R
-#[/card]
 [card]
 primitive=Crypt Champion
 id=107336
@@ -196,16 +186,16 @@ id=107435
 rarity=C
 [/card]
 [card]
-primitive=Demonfire
-id=107252
-rarity=R
-[/card]
-[card]
 primitive=Demon's Jester
 id=107599
 rarity=C
 [/card]
 [card]
+primitive=Demonfire
+id=107252
+rarity=R
+[/card]
+[card]
 primitive=Dovescape
 id=107428
 rarity=R
@@ -291,7 +281,7 @@ id=107542
 rarity=C
 [/card]
 [card]
-primitive=Goblin Token from Rakdos Guildmage
+primitive=Goblin Token
 id=-97108
 rarity=T
 [/card]
@@ -336,27 +326,15 @@ id=97100
 rarity=U
 [/card]
 [card]
-primitive=Hide // Seek (Hide)
+primitive=Hide // Seek
 id=107315
 rarity=R
 [/card]
-#Need to find a way to deal with multipart cards
-#[card]
-#primitive=Hide // Seek (Seek)
-#id=107315
-#rarity=R
-#[/card]
 [card]
-primitive=Hit // Run (Hit)
+primitive=Hit // Run
 id=107387
 rarity=U
 [/card]
-#Need to find a way to deal with multipart cards
-#[card]
-#primitive=Hit // Run (Run)
-#id=107387
-#rarity=U
-#[/card]
 [card]
 primitive=Ignorant Bliss
 id=111281
@@ -473,16 +451,10 @@ id=107328
 rarity=C
 [/card]
 [card]
-primitive=Odds // Ends (Ends)
+primitive=Odds // Ends
 id=107445
 rarity=R
 [/card]
-#Need to find a way to deal with multipart cards
-#[card]
-#primitive=Odds // Ends (Odds)
-#id=107445
-#rarity=R
-#[/card]
 [card]
 primitive=Ogre Gatecrasher
 id=107389
@@ -574,16 +546,10 @@ id=107338
 rarity=C
 [/card]
 [card]
-primitive=Pure // Simple (Pure)
+primitive=Pure // Simple
 id=107532
 rarity=U
 [/card]
-#Need to find a way to deal with multipart cards
-#[card]
-#primitive=Pure // Simple (Simple)
-#id=107532
-#rarity=U
-#[/card]
 [card]
 primitive=Ragamuffyn
 id=107570
@@ -640,32 +606,20 @@ id=107273
 rarity=R
 [/card]
 [card]
-primitive=Research // Development (Development)
+primitive=Research // Development
 id=107375
 rarity=R
 [/card]
-#Need to find a way to deal with multipart cards
-#[card]
-#primitive=Research // Development (Research)
-#id=107375
-#rarity=R
-#[/card]
 [card]
 primitive=Riot Spikes
 id=97076
 rarity=C
 [/card]
 [card]
-primitive=Rise // Fall (Fall)
+primitive=Rise // Fall
 id=107423
 rarity=U
 [/card]
-#Need to find a way to deal with multipart cards
-#[card]
-#primitive=Rise // Fall (Rise)
-#id=107423
-#rarity=U
-#[/card]
 [card]
 primitive=Rix Maadi, Dungeon Palace
 id=97072
@@ -777,7 +731,7 @@ id=111220
 rarity=R
 [/card]
 [card]
-primitive=Sprouting Phytohydra Token from Sprouting Phytohydra
+primitive=Sprouting Phytohydra Token
 id=-111220
 rarity=T
 [/card]
@@ -817,16 +771,10 @@ id=107371
 rarity=C
 [/card]
 [card]
-primitive=Supply // Demand (Demand)
+primitive=Supply // Demand
 id=107464
 rarity=U
 [/card]
-#Need to find a way to deal with multipart cards
-#[card]
-#primitive=Supply // Demand (Supply)
-#id=107464
-#rarity=U
-#[/card]
 [card]
 primitive=Swift Silence
 id=107284
@@ -853,16 +801,10 @@ id=107362
 rarity=U
 [/card]
 [card]
-primitive=Trial // Error (Error)
+primitive=Trial // Error
 id=107259
 rarity=U
 [/card]
-#Need to find a way to deal with multipart cards
-#[card]
-#primitive=Trial // Error (Trial)
-#id=107259
-#rarity=U
-#[/card]
 [card]
 primitive=Trygon Predator
 id=97112

projects/mtg/bin/Res/sets/DKA/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Dark Ascension
+block=Innistrad
 year=2012
-block=ISD
+total=171
 [/meta]
 [card]
 primitive=Afflicted Deserter
@@ -9,11 +11,6 @@ id=262675
 rarity=U
 [/card]
 [card]
-primitive=Werewolf Ransacker
-id=262698
-rarity=T
-[/card]
-[card]
 primitive=Alpha Brawl
 id=262657
 rarity=R
@@ -29,6 +26,11 @@ id=244691
 rarity=M
 [/card]
 [card]
+primitive=Archdemon of Greed
+id=227405
+rarity=T
+[/card]
+[card]
 primitive=Artful Dodge
 id=262840
 rarity=C
@@ -89,16 +91,16 @@ id=262706
 rarity=R
 [/card]
 [card]
-primitive=Chalice of Life
-id=226735
-rarity=U
-[/card]
-[card]
 primitive=Chalice of Death
 id=226721
 rarity=T
 [/card]
 [card]
+primitive=Chalice of Life
+id=226735
+rarity=U
+[/card]
+[card]
 primitive=Chant of the Skifsang
 id=262829
 rarity=C
@@ -114,11 +116,6 @@ id=243229
 rarity=C
 [/card]
 [card]
-primitive=Markov's Servant
-id=244712
-rarity=T
-[/card]
-[card]
 primitive=Clinging Mists
 id=262844
 rarity=C
@@ -209,11 +206,6 @@ id=244740
 rarity=M
 [/card]
 [card]
-primitive=Withengar Unbound
-id=244738
-rarity=T
-[/card]
-[card]
 primitive=Elgaud Inquisitor
 id=245219
 rarity=C
@@ -234,16 +226,16 @@ id=244737
 rarity=C
 [/card]
 [card]
-primitive=Faithless Looting
-id=245299
-rarity=C
-[/card]
-[card]
 primitive=Faith's Shield
 id=262696
 rarity=U
 [/card]
 [card]
+primitive=Faithless Looting
+id=245299
+rarity=C
+[/card]
+[card]
 primitive=Falkenrath Aristocrat
 id=262847
 rarity=M
@@ -314,6 +306,11 @@ id=262839
 rarity=R
 [/card]
 [card]
+primitive=Ghastly Haunting
+id=242498
+rarity=T
+[/card]
+[card]
 primitive=Ghoultree
 id=262662
 rarity=R
@@ -439,11 +436,6 @@ id=262875
 rarity=M
 [/card]
 [card]
-primitive=Ravager of the Fells
-id=262699
-rarity=T
-[/card]
-[card]
 primitive=Immerwolf
 id=262700
 rarity=U
@@ -484,16 +476,16 @@ id=243233
 rarity=C
 [/card]
 [card]
+primitive=Krallenhorde Killer
+id=253431
+rarity=T
+[/card]
+[card]
 primitive=Lambholt Elder
 id=242537
 rarity=U
 [/card]
 [card]
-primitive=Silverpelt Werewolf
-id=242509
-rarity=T
-[/card]
-[card]
 primitive=Lingering Souls
 id=262695
 rarity=U
@@ -509,11 +501,6 @@ id=244724
 rarity=C
 [/card]
 [card]
-primitive=Unhallowed Cathar
-id=244734
-rarity=T
-[/card]
-[card]
 primitive=Markov Blademaster
 id=249419
 rarity=R
@@ -524,6 +511,11 @@ id=262693
 rarity=U
 [/card]
 [card]
+primitive=Markov's Servant
+id=244712
+rarity=T
+[/card]
+[card]
 primitive=Midnight Guard
 id=262859
 rarity=C
@@ -539,8 +531,8 @@ id=253433
 rarity=R
 [/card]
 [card]
-primitive=Tovolar's Magehunter
+primitive=Moonscarred Werewolf
-id=253429
+id=262659
 rarity=T
 [/card]
 [card]
@@ -589,16 +581,16 @@ id=249983
 rarity=U
 [/card]
 [card]
+primitive=Ravager of the Fells
+id=262699
+rarity=T
+[/card]
+[card]
 primitive=Ravenous Demon
 id=227417
 rarity=R
 [/card]
 [card]
-primitive=Archdemon of Greed
-id=227405
-rarity=T
-[/card]
-[card]
 primitive=Ray of Revelation
 id=245288
 rarity=C
@@ -624,6 +616,11 @@ id=244726
 rarity=C
 [/card]
 [card]
+primitive=Seance
+id=249422
+rarity=R
+[/card]
+[card]
 primitive=Sanctuary Cat
 id=262864
 rarity=C
@@ -644,21 +641,11 @@ id=262694
 rarity=C
 [/card]
 [card]
-primitive=Moonscarred Werewolf
-id=262659
-rarity=T
-[/card]
-[card]
 primitive=Screeching Skaab
 id=245207
 rarity=C
 [/card]
 [card]
-primitive=Seance
-id=249422
-rarity=R
-[/card]
-[card]
 primitive=Secrets of the Dead
 id=230621
 rarity=U
@@ -684,6 +671,11 @@ id=262876
 rarity=C
 [/card]
 [card]
+primitive=Silverpelt Werewolf
+id=242509
+rarity=T
+[/card]
+[card]
 primitive=Skillful Lunge
 id=262877
 rarity=C
@@ -709,11 +701,6 @@ id=222178
 rarity=U
 [/card]
 [card]
-primitive=Ghastly Haunting
-id=242498
-rarity=T
-[/card]
-[card]
 primitive=Spiteful Shadows
 id=262668
 rarity=C
@@ -769,6 +756,11 @@ id=244702
 rarity=C
 [/card]
 [card]
+primitive=Tovolar's Magehunter
+id=253429
+rarity=T
+[/card]
+[card]
 primitive=Tower Geist
 id=262665
 rarity=U
@@ -794,6 +786,11 @@ id=262835
 rarity=C
 [/card]
 [card]
+primitive=Unhallowed Cathar
+id=244734
+rarity=T
+[/card]
+[card]
 primitive=Vault of the Archangel
 id=270938
 rarity=R
@@ -824,11 +821,21 @@ id=247130
 rarity=U
 [/card]
 [card]
+primitive=Werewolf Ransacker
+id=262698
+rarity=T
+[/card]
+[card]
 primitive=Wild Hunger
 id=245291
 rarity=C
 [/card]
 [card]
+primitive=Withengar Unbound
+id=244738
+rarity=T
+[/card]
+[card]
 primitive=Wolf T2
 id=-262857
 rarity=T
@@ -839,11 +846,6 @@ id=253426
 rarity=R
 [/card]
 [card]
-primitive=Krallenhorde Killer
-id=253431
-rarity=T
-[/card]
-[card]
 primitive=Wolfhunter's Quiver
 id=247124
 rarity=U
@@ -862,4 +864,4 @@ rarity=C
 primitive=Zombie Apocalypse
 id=262669
 rarity=R
-[/card]
+[/card]

projects/mtg/bin/Res/sets/DRK/_cards.dat

@@ -1,6 +1,8 @@
 [meta]
 author=Wagic Team
+name=The Dark
 year=1994
+total=119
 [/meta]
 [card]
 primitive=Amnesia
@@ -188,13 +190,13 @@ id=1808
 rarity=C
 [/card]
 [card]
-primitive=Fire and Brimstone
+primitive=Fire Drake
-id=1809
+id=1788
 rarity=U
 [/card]
 [card]
-primitive=Fire Drake
+primitive=Fire and Brimstone
-id=1788
+id=1809
 rarity=U
 [/card]
 [card]

projects/mtg/bin/Res/sets/DST/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Darksteel
+block=Mirrodin
 year=2004
-block=Mirror
+total=165
 [/meta]
 [card]
 primitive=AEther Snap

projects/mtg/bin/Res/sets/DTK/_cards.dat

@@ -1,6 +1,9 @@
 [meta]
 author=Wagic Team
+name=Dragons of Tarkir
+block=Khans of Tarkir
 year=2015
+total=264
 [/meta]
 [card]
 primitive=Acid-Spewer Dragon
@@ -298,6 +301,16 @@ id=394543
 rarity=M
 [/card]
 [card]
+primitive=Dragon's Eye Sentry
+id=394544
+rarity=C
+[/card]
+[card]
+primitive=Dragon-Scarred Bear
+id=394553
+rarity=C
+[/card]
+[card]
 primitive=Dragonloft Idol
 id=394545
 rarity=U
@@ -338,16 +351,6 @@ id=394552
 rarity=U
 [/card]
 [card]
-primitive=Dragon's Eye Sentry
-id=394544
-rarity=C
-[/card]
-[card]
-primitive=Dragon-Scarred Bear
-id=394553
-rarity=C
-[/card]
-[card]
 primitive=Dromoka Captain
 id=394554
 rarity=U
@@ -763,7 +766,7 @@ id=394636
 rarity=C
 [/card]
 [card]
-primitive=Obscuring Ćther
+primitive=Obscuring AEther
 id=394637
 rarity=R
 [/card]
@@ -1053,16 +1056,16 @@ id=394694
 rarity=C
 [/card]
 [card]
-primitive=Sidisi, Undead Vizier
-id=394695
-rarity=R
-[/card]
-[card]
 primitive=Sidisi's Faithful
 id=394696
 rarity=C
 [/card]
 [card]
+primitive=Sidisi, Undead Vizier
+id=394695
+rarity=R
+[/card]
+[card]
 primitive=Sight Beyond Sight
 id=394697
 rarity=U

projects/mtg/bin/Res/sets/DVD/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Duel Decks: Divine vs. Demonic
 block=Duel
 year=2009
+total=62
 [/meta]
 [card]
 primitive=Abyssal Gatekeeper
@@ -24,6 +26,11 @@ id=196990
 rarity=U
 [/card]
 [card]
+primitive=Angel's Feather
+id=196991
+rarity=U
+[/card]
+[card]
 primitive=Angelic Benediction
 id=197013
 rarity=U
@@ -39,11 +46,6 @@ id=197035
 rarity=U
 [/card]
 [card]
-primitive=Angel's Feather
-id=196991
-rarity=U
-[/card]
-[card]
 primitive=Angelsong
 id=197014
 rarity=C
@@ -104,11 +106,6 @@ id=197019
 rarity=C
 [/card]
 [card]
-primitive=Demonic Tutor
-id=193867
-rarity=U
-[/card]
-[card]
 primitive=Demon's Horn
 id=196994
 rarity=U
@@ -119,6 +116,11 @@ id=197018
 rarity=C
 [/card]
 [card]
+primitive=Demonic Tutor
+id=193867
+rarity=U
+[/card]
+[card]
 primitive=Duress
 id=197004
 rarity=C
@@ -195,12 +197,12 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=197254
+id=197253
 rarity=L
 [/card]
 [card]
 primitive=Plains
-id=197256
+id=197254
 rarity=L
 [/card]
 [card]
@@ -210,7 +212,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=197253
+id=197256
 rarity=L
 [/card]
 [card]

projects/mtg/bin/Res/sets/EVE/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Eventide
+block=Shadowmoor
 year=2008
-block=Shadow
+total=180
 [/meta]
 [card]
 primitive=Aerie Ouphes

projects/mtg/bin/Res/sets/EVG/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Duel Decks: Elves vs. Goblins
 block=Duel
 year=2007
+total=62
 [/meta]
 [card]
 primitive=Akki Coalflinger
@@ -70,12 +72,12 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=159042
+id=159041
 rarity=L
 [/card]
 [card]
 primitive=Forest
-id=159041
+id=159042
 rarity=L
 [/card]
 [card]
@@ -175,25 +177,25 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=157940
-rarity=L
-[/card]
-[card]
-primitive=Mountain
-id=159061
-rarity=L
-[/card]
-[card]
-primitive=Mountain
 id=157939
 rarity=L
 [/card]
 [card]
 primitive=Mountain
+id=157940
+rarity=L
+[/card]
+[card]
+primitive=Mountain
 id=157941
 rarity=L
 [/card]
 [card]
+primitive=Mountain
+id=159061
+rarity=L
+[/card]
+[card]
 primitive=Mudbutton Torchrunner
 id=157919
 rarity=C

projects/mtg/bin/Res/sets/EVK/_cards.dat

@@ -0,0 +1,332 @@
+[meta]
+author=Wagic Team
+name=Duel Decks: Elspeth vs. Kiora
+block=Duel
+year=2015
+total=65
+[/meta]
+[card]
+primitive=AEtherize
+id=394352
+rarity=U
+[/card]
+[card]
+primitive=Accumulated Knowledge
+id=394351
+rarity=C
+[/card]
+[card]
+primitive=Banisher Priest
+id=394353
+rarity=U
+[/card]
+[card]
+primitive=Captain of the Watch
+id=394354
+rarity=R
+[/card]
+[card]
+primitive=Celestial Flare
+id=394355
+rarity=C
+[/card]
+[card]
+primitive=Coiling Oracle
+id=394356
+rarity=C
+[/card]
+[card]
+primitive=Court Street Denizen
+id=394357
+rarity=C
+[/card]
+[card]
+primitive=Dauntless Onslaught
+id=394358
+rarity=U
+[/card]
+[card]
+primitive=Decree of Justice
+id=394359
+rarity=R
+[/card]
+[card]
+primitive=Dictate of Heliod
+id=394360
+rarity=R
+[/card]
+[card]
+primitive=Elspeth, Sun's Champion
+id=394361
+rarity=M
+[/card]
+[card]
+primitive=Evolving Wilds
+id=394362
+rarity=C
+[/card]
+[card]
+primitive=Explore
+id=394363
+rarity=C
+[/card]
+[card]
+primitive=Explosive Vegetation
+id=394364
+rarity=U
+[/card]
+[card]
+primitive=Forest
+id=394365
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=394366
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=394367
+rarity=L
+[/card]
+[card]
+primitive=Gempalm Avenger
+id=394368
+rarity=C
+[/card]
+[card]
+primitive=Grazing Gladehart
+id=394369
+rarity=C
+[/card]
+[card]
+primitive=Gustcloak Harrier
+id=394370
+rarity=C
+[/card]
+[card]
+primitive=Gustcloak Savior
+id=394371
+rarity=R
+[/card]
+[card]
+primitive=Gustcloak Sentinel
+id=394372
+rarity=U
+[/card]
+[card]
+primitive=Gustcloak Skirmisher
+id=394373
+rarity=U
+[/card]
+[card]
+primitive=Icatian Javelineers
+id=394374
+rarity=C
+[/card]
+[card]
+primitive=Inkwell Leviathan
+id=394375
+rarity=R
+[/card]
+[card]
+primitive=Island
+id=394376
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=394377
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=394378
+rarity=L
+[/card]
+[card]
+primitive=Kinsbaile Skirmisher
+id=394379
+rarity=C
+[/card]
+[card]
+primitive=Kiora's Follower
+id=394381
+rarity=U
+[/card]
+[card]
+primitive=Kiora, the Crashing Wave
+id=394380
+rarity=M
+[/card]
+[card]
+primitive=Kor Skyfisher
+id=394382
+rarity=C
+[/card]
+[card]
+primitive=Lorescale Coatl
+id=394384
+rarity=U
+[/card]
+[card]
+primitive=Loxodon Partisan
+id=394385
+rarity=C
+[/card]
+[card]
+primitive=Man-o'-War
+id=394386
+rarity=C
+[/card]
+[card]
+primitive=Mighty Leap
+id=394387
+rarity=C
+[/card]
+[card]
+primitive=Mortal's Ardor
+id=394388
+rarity=C
+[/card]
+[card]
+primitive=Mother of Runes
+id=394389
+rarity=U
+[/card]
+[card]
+primitive=Nessian Asp
+id=394390
+rarity=C
+[/card]
+[card]
+primitive=Netcaster Spider
+id=394391
+rarity=C
+[/card]
+[card]
+primitive=Nimbus Swimmer
+id=394392
+rarity=U
+[/card]
+[card]
+primitive=Noble Templar
+id=394393
+rarity=C
+[/card]
+[card]
+primitive=Omenspeaker
+id=394394
+rarity=C
+[/card]
+[card]
+primitive=Peel from Reality
+id=394395
+rarity=C
+[/card]
+[card]
+primitive=Plains
+id=394396
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=394397
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=394398
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=394399
+rarity=L
+[/card]
+[card]
+primitive=Plasm Capture
+id=394400
+rarity=R
+[/card]
+[card]
+primitive=Precinct Captain
+id=394401
+rarity=R
+[/card]
+[card]
+primitive=Raise the Alarm
+id=394402
+rarity=C
+[/card]
+[card]
+primitive=Scourge of Fleets
+id=394403
+rarity=R
+[/card]
+[card]
+primitive=Sealock Monster
+id=394404
+rarity=U
+[/card]
+[card]
+primitive=Secluded Steppe
+id=394405
+rarity=C
+[/card]
+[card]
+primitive=Simic Sky Swallower
+id=394406
+rarity=R
+[/card]
+[card]
+primitive=Soul Parry
+id=394408
+rarity=C
+[/card]
+[card]
+primitive=Standing Troops
+id=394409
+rarity=C
+[/card]
+[card]
+primitive=Sunlance
+id=394410
+rarity=C
+[/card]
+[card]
+primitive=Surrakar Banisher
+id=394411
+rarity=C
+[/card]
+[card]
+primitive=Temple of the False God
+id=394412
+rarity=U
+[/card]
+[card]
+primitive=Time to Feed
+id=394413
+rarity=C
+[/card]
+[card]
+primitive=Urban Evolution
+id=394414
+rarity=U
+[/card]
+[card]
+primitive=Veteran Armorsmith
+id=394415
+rarity=C
+[/card]
+[card]
+primitive=Veteran Swordsmith
+id=394416
+rarity=C
+[/card]
+[card]
+primitive=Whelming Wave
+id=394417
+rarity=R
+[/card]

projects/mtg/bin/Res/sets/EVT/_cards.dat

@@ -1,22 +1,24 @@
 [meta]
 author=Wagic Team
+name=Duel Decks: Elspeth vs. Tezzeret
 block=Duel
 year=2010
+total=79
 [/meta]
 [card]
-primitive=Abolish
-id=222765
-rarity=U
-[/card]
-[card]
 primitive=AEther Spellbomb
 id=222720
 rarity=C
 [/card]
 [card]
+primitive=Abolish
+id=222765
+rarity=U
+[/card]
+[card]
 primitive=Angel of Salvation
 id=222774
-rarity=
+rarity=R
 [/card]
 [card]
 primitive=Arcbound Worker
@@ -160,7 +162,7 @@ rarity=C
 [/card]
 [card]
 primitive=Island
-id=222727
+id=222724
 rarity=L
 [/card]
 [card]
@@ -175,7 +177,7 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=222724
+id=222727
 rarity=L
 [/card]
 [card]
@@ -250,12 +252,12 @@ rarity=R
 [/card]
 [card]
 primitive=Plains
-id=222752
+id=222751
 rarity=L
 [/card]
 [card]
 primitive=Plains
-id=222754
+id=222752
 rarity=L
 [/card]
 [card]
@@ -265,7 +267,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=222751
+id=222754
 rarity=L
 [/card]
 [card]
@@ -397,4 +399,4 @@ rarity=U
 primitive=Triskelion
 id=222715
 rarity=R
-[/card]
+[/card]

projects/mtg/bin/Res/sets/EXO/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
-year=1998
+name=Exodus
 block=Tempest
+year=1998
+total=143
 [/meta]
 [card]
 primitive=AEther Tide

projects/mtg/bin/Res/sets/FEM/_cards.dat

@@ -1,6 +1,8 @@
 [meta]
 author=Wagic Team
+name=Fallen Empires
 year=1994
+total=187
 [/meta]
 [card]
 primitive=Aeolipile
@@ -9,12 +11,7 @@ rarity=R
 [/card]
 [card]
 primitive=Armor Thrull
-id=1841
+id=1838
-rarity=C
-[/card]
-[card]
-primitive=Armor Thrull
-id=1840
 rarity=C
 [/card]
 [card]
@@ -24,7 +21,12 @@ rarity=C
 [/card]
 [card]
 primitive=Armor Thrull
-id=1838
+id=1840
+rarity=C
+[/card]
+[card]
+primitive=Armor Thrull
+id=1841
 rarity=C
 [/card]
 [card]
@@ -34,12 +36,7 @@ rarity=R
 [/card]
 [card]
 primitive=Basal Thrull
-id=1845
+id=1842
-rarity=C
-[/card]
-[card]
-primitive=Basal Thrull
-id=1844
 rarity=C
 [/card]
 [card]
@@ -49,7 +46,12 @@ rarity=C
 [/card]
 [card]
 primitive=Basal Thrull
-id=1842
+id=1844
+rarity=C
+[/card]
+[card]
+primitive=Basal Thrull
+id=1845
 rarity=C
 [/card]
 [card]
@@ -59,12 +61,7 @@ rarity=R
 [/card]
 [card]
 primitive=Brassclaw Orcs
-id=1966
+id=1937
-rarity=C
-[/card]
-[card]
-primitive=Brassclaw Orcs
-id=1940
 rarity=C
 [/card]
 [card]
@@ -74,7 +71,12 @@ rarity=C
 [/card]
 [card]
 primitive=Brassclaw Orcs
-id=1937
+id=1940
+rarity=C
+[/card]
+[card]
+primitive=Brassclaw Orcs
+id=1966
 rarity=C
 [/card]
 [card]
@@ -84,12 +86,7 @@ rarity=U
 [/card]
 [card]
 primitive=Combat Medic
-id=1973
+id=1970
-rarity=C
-[/card]
-[card]
-primitive=Combat Medic
-id=1972
 rarity=C
 [/card]
 [card]
@@ -99,7 +96,12 @@ rarity=C
 [/card]
 [card]
 primitive=Combat Medic
-id=1970
+id=1972
+rarity=C
+[/card]
+[card]
+primitive=Combat Medic
+id=1973
 rarity=C
 [/card]
 [card]
@@ -159,7 +161,7 @@ rarity=U
 [/card]
 [card]
 primitive=Dwarven Soldier
-id=1946
+id=1944
 rarity=C
 [/card]
 [card]
@@ -169,7 +171,7 @@ rarity=C
 [/card]
 [card]
 primitive=Dwarven Soldier
-id=1944
+id=1946
 rarity=C
 [/card]
 [card]
@@ -184,12 +186,7 @@ rarity=U
 [/card]
 [card]
 primitive=Elven Fortress
-id=1907
+id=1904
-rarity=C
-[/card]
-[card]
-primitive=Elven Fortress
-id=1906
 rarity=C
 [/card]
 [card]
@@ -199,7 +196,12 @@ rarity=C
 [/card]
 [card]
 primitive=Elven Fortress
-id=1904
+id=1906
+rarity=C
+[/card]
+[card]
+primitive=Elven Fortress
+id=1907
 rarity=C
 [/card]
 [card]
@@ -214,7 +216,7 @@ rarity=R
 [/card]
 [card]
 primitive=Elvish Hunter
-id=1911
+id=1909
 rarity=C
 [/card]
 [card]
@@ -224,12 +226,12 @@ rarity=C
 [/card]
 [card]
 primitive=Elvish Hunter
-id=1909
+id=1911
 rarity=C
 [/card]
 [card]
 primitive=Elvish Scout
-id=1914
+id=1912
 rarity=C
 [/card]
 [card]
@@ -239,22 +241,17 @@ rarity=C
 [/card]
 [card]
 primitive=Elvish Scout
-id=1912
+id=1914
 rarity=C
 [/card]
 [card]
-primitive=Farrelite Priest
-id=1978
-rarity=U
-[/card]
-[card]
 primitive=Farrel's Mantle
 id=1974
 rarity=U
 [/card]
 [card]
 primitive=Farrel's Zealot
-id=1977
+id=1975
 rarity=C
 [/card]
 [card]
@@ -264,10 +261,15 @@ rarity=C
 [/card]
 [card]
 primitive=Farrel's Zealot
-id=1975
+id=1977
 rarity=C
 [/card]
 [card]
+primitive=Farrelite Priest
+id=1978
+rarity=U
+[/card]
+[card]
 primitive=Feral Thallid
 id=1915
 rarity=U
@@ -279,7 +281,7 @@ rarity=R
 [/card]
 [card]
 primitive=Goblin Chirurgeon
-id=1949
+id=1947
 rarity=C
 [/card]
 [card]
@@ -289,7 +291,7 @@ rarity=C
 [/card]
 [card]
 primitive=Goblin Chirurgeon
-id=1947
+id=1949
 rarity=C
 [/card]
 [card]
@@ -299,7 +301,7 @@ rarity=R
 [/card]
 [card]
 primitive=Goblin Grenade
-id=1953
+id=1951
 rarity=C
 [/card]
 [card]
@@ -309,7 +311,7 @@ rarity=C
 [/card]
 [card]
 primitive=Goblin Grenade
-id=1951
+id=1953
 rarity=C
 [/card]
 [card]
@@ -319,12 +321,7 @@ rarity=U
 [/card]
 [card]
 primitive=Goblin War Drums
-id=1958
+id=1955
-rarity=C
-[/card]
-[card]
-primitive=Goblin War Drums
-id=1957
 rarity=C
 [/card]
 [card]
@@ -334,7 +331,12 @@ rarity=C
 [/card]
 [card]
 primitive=Goblin War Drums
-id=1955
+id=1957
+rarity=C
+[/card]
+[card]
+primitive=Goblin War Drums
+id=1958
 rarity=C
 [/card]
 [card]
@@ -359,7 +361,7 @@ rarity=U
 [/card]
 [card]
 primitive=High Tide
-id=1874
+id=1872
 rarity=C
 [/card]
 [card]
@@ -369,7 +371,7 @@ rarity=C
 [/card]
 [card]
 primitive=High Tide
-id=1872
+id=1874
 rarity=C
 [/card]
 [card]
@@ -378,26 +380,6 @@ id=2008
 rarity=R
 [/card]
 [card]
-primitive=Homarid
-id=1878
-rarity=C
-[/card]
-[card]
-primitive=Homarid
-id=1877
-rarity=C
-[/card]
-[card]
-primitive=Homarid
-id=1876
-rarity=C
-[/card]
-[card]
-primitive=Homarid
-id=1875
-rarity=C
-[/card]
-[card]
 primitive=Homarid Shaman
 id=1879
 rarity=R
@@ -409,7 +391,7 @@ rarity=U
 [/card]
 [card]
 primitive=Homarid Warrior
-id=1883
+id=1881
 rarity=C
 [/card]
 [card]
@@ -419,17 +401,32 @@ rarity=C
 [/card]
 [card]
 primitive=Homarid Warrior
-id=1881
+id=1883
+rarity=C
+[/card]
+[card]
+primitive=Homarid
+id=1875
+rarity=C
+[/card]
+[card]
+primitive=Homarid
+id=1876
+rarity=C
+[/card]
+[card]
+primitive=Homarid
+id=1877
+rarity=C
+[/card]
+[card]
+primitive=Homarid
+id=1878
 rarity=C
 [/card]
 [card]
 primitive=Hymn to Tourach
-id=1852
+id=1849
-rarity=C
-[/card]
-[card]
-primitive=Hymn to Tourach
-id=1851
 rarity=C
 [/card]
 [card]
@@ -439,17 +436,17 @@ rarity=C
 [/card]
 [card]
 primitive=Hymn to Tourach
-id=1849
+id=1851
+rarity=C
+[/card]
+[card]
+primitive=Hymn to Tourach
+id=1852
 rarity=C
 [/card]
 [card]
 primitive=Icatian Infantry
-id=1984
+id=1981
-rarity=C
-[/card]
-[card]
-primitive=Icatian Infantry
-id=1983
 rarity=C
 [/card]
 [card]
@@ -459,12 +456,17 @@ rarity=C
 [/card]
 [card]
 primitive=Icatian Infantry
-id=1981
+id=1983
+rarity=C
+[/card]
+[card]
+primitive=Icatian Infantry
+id=1984
 rarity=C
 [/card]
 [card]
 primitive=Icatian Javelineers
-id=1987
+id=1985
 rarity=C
 [/card]
 [card]
@@ -474,7 +476,7 @@ rarity=C
 [/card]
 [card]
 primitive=Icatian Javelineers
-id=1985
+id=1987
 rarity=C
 [/card]
 [card]
@@ -484,7 +486,7 @@ rarity=R
 [/card]
 [card]
 primitive=Icatian Moneychanger
-id=1991
+id=1989
 rarity=C
 [/card]
 [card]
@@ -494,7 +496,7 @@ rarity=C
 [/card]
 [card]
 primitive=Icatian Moneychanger
-id=1989
+id=1991
 rarity=C
 [/card]
 [card]
@@ -509,12 +511,7 @@ rarity=U
 [/card]
 [card]
 primitive=Icatian Scout
-id=1997
+id=1994
-rarity=C
-[/card]
-[card]
-primitive=Icatian Scout
-id=1996
 rarity=C
 [/card]
 [card]
@@ -524,7 +521,12 @@ rarity=C
 [/card]
 [card]
 primitive=Icatian Scout
-id=1994
+id=1996
+rarity=C
+[/card]
+[card]
+primitive=Icatian Scout
+id=1997
 rarity=C
 [/card]
 [card]
@@ -549,7 +551,7 @@ rarity=R
 [/card]
 [card]
 primitive=Initiates of the Ebon Hand
-id=1855
+id=1853
 rarity=C
 [/card]
 [card]
@@ -559,17 +561,12 @@ rarity=C
 [/card]
 [card]
 primitive=Initiates of the Ebon Hand
-id=1853
+id=1855
 rarity=C
 [/card]
 [card]
 primitive=Merseine
-id=1887
+id=1884
-rarity=C
-[/card]
-[card]
-primitive=Merseine
-id=1886
 rarity=C
 [/card]
 [card]
@@ -579,12 +576,17 @@ rarity=C
 [/card]
 [card]
 primitive=Merseine
-id=1884
+id=1886
+rarity=C
+[/card]
+[card]
+primitive=Merseine
+id=1887
 rarity=C
 [/card]
 [card]
 primitive=Mindstab Thrull
-id=1858
+id=1856
 rarity=C
 [/card]
 [card]
@@ -594,12 +596,12 @@ rarity=C
 [/card]
 [card]
 primitive=Mindstab Thrull
-id=1856
+id=1858
 rarity=C
 [/card]
 [card]
 primitive=Necrite
-id=1861
+id=1859
 rarity=C
 [/card]
 [card]
@@ -609,12 +611,12 @@ rarity=C
 [/card]
 [card]
 primitive=Necrite
-id=1859
+id=1861
 rarity=C
 [/card]
 [card]
 primitive=Night Soil
-id=1919
+id=1917
 rarity=C
 [/card]
 [card]
@@ -624,7 +626,7 @@ rarity=C
 [/card]
 [card]
 primitive=Night Soil
-id=1917
+id=1919
 rarity=C
 [/card]
 [card]
@@ -634,7 +636,7 @@ rarity=U
 [/card]
 [card]
 primitive=Orcish Spy
-id=1963
+id=1961
 rarity=C
 [/card]
 [card]
@@ -644,17 +646,12 @@ rarity=C
 [/card]
 [card]
 primitive=Orcish Spy
-id=1961
+id=1963
 rarity=C
 [/card]
 [card]
 primitive=Orcish Veteran
-id=1967
+id=1939
-rarity=C
-[/card]
-[card]
-primitive=Orcish Veteran
-id=1965
 rarity=C
 [/card]
 [card]
@@ -664,12 +661,17 @@ rarity=C
 [/card]
 [card]
 primitive=Orcish Veteran
-id=1939
+id=1965
+rarity=C
+[/card]
+[card]
+primitive=Orcish Veteran
+id=1967
 rarity=C
 [/card]
 [card]
 primitive=Order of Leitbur
-id=2002
+id=2000
 rarity=C
 [/card]
 [card]
@@ -679,12 +681,12 @@ rarity=C
 [/card]
 [card]
 primitive=Order of Leitbur
-id=2000
+id=2002
 rarity=C
 [/card]
 [card]
 primitive=Order of the Ebon Hand
-id=1864
+id=1862
 rarity=C
 [/card]
 [card]
@@ -694,7 +696,7 @@ rarity=C
 [/card]
 [card]
 primitive=Order of the Ebon Hand
-id=1862
+id=1864
 rarity=C
 [/card]
 [card]
@@ -749,7 +751,7 @@ rarity=R
 [/card]
 [card]
 primitive=Spore Cloud
-id=1922
+id=1920
 rarity=C
 [/card]
 [card]
@@ -759,7 +761,7 @@ rarity=C
 [/card]
 [card]
 primitive=Spore Cloud
-id=1920
+id=1922
 rarity=C
 [/card]
 [card]
@@ -778,13 +780,13 @@ id=2013
 rarity=U
 [/card]
 [card]
-primitive=Thallid
+primitive=Thallid Devourer
-id=1927
+id=1928
-rarity=C
+rarity=U
 [/card]
 [card]
 primitive=Thallid
-id=1926
+id=1924
 rarity=C
 [/card]
 [card]
@@ -794,23 +796,13 @@ rarity=C
 [/card]
 [card]
 primitive=Thallid
-id=1924
+id=1926
 rarity=C
 [/card]
 [card]
-primitive=Thallid Devourer
+primitive=Thallid
-id=1928
+id=1927
-rarity=U
+rarity=C
-[/card]
-[card]
-primitive=Thelonite Druid
-id=1931
-rarity=U
-[/card]
-[card]
-primitive=Thelonite Monk
-id=1932
-rarity=R
 [/card]
 [card]
 primitive=Thelon's Chant
@@ -823,13 +815,18 @@ id=1930
 rarity=R
 [/card]
 [card]
-primitive=Thorn Thallid
+primitive=Thelonite Druid
-id=1936
+id=1931
-rarity=C
+rarity=U
+[/card]
+[card]
+primitive=Thelonite Monk
+id=1932
+rarity=R
 [/card]
 [card]
 primitive=Thorn Thallid
-id=1935
+id=1933
 rarity=C
 [/card]
 [card]
@@ -839,7 +836,12 @@ rarity=C
 [/card]
 [card]
 primitive=Thorn Thallid
-id=1933
+id=1935
+rarity=C
+[/card]
+[card]
+primitive=Thorn Thallid
+id=1936
 rarity=C
 [/card]
 [card]
@@ -859,7 +861,7 @@ rarity=U
 [/card]
 [card]
 primitive=Tidal Flats
-id=1893
+id=1891
 rarity=C
 [/card]
 [card]
@@ -869,7 +871,7 @@ rarity=C
 [/card]
 [card]
 primitive=Tidal Flats
-id=1891
+id=1893
 rarity=C
 [/card]
 [card]
@@ -894,7 +896,7 @@ rarity=R
 [/card]
 [card]
 primitive=Vodalian Mage
-id=1898
+id=1896
 rarity=C
 [/card]
 [card]
@@ -904,17 +906,12 @@ rarity=C
 [/card]
 [card]
 primitive=Vodalian Mage
-id=1896
+id=1898
 rarity=C
 [/card]
 [card]
 primitive=Vodalian Soldiers
-id=1902
+id=1899
-rarity=C
-[/card]
-[card]
-primitive=Vodalian Soldiers
-id=1901
 rarity=C
 [/card]
 [card]
@@ -924,7 +921,12 @@ rarity=C
 [/card]
 [card]
 primitive=Vodalian Soldiers
-id=1899
+id=1901
+rarity=C
+[/card]
+[card]
+primitive=Vodalian Soldiers
+id=1902
 rarity=C
 [/card]
 [card]

projects/mtg/bin/Res/sets/FRF/_cards.dat

@@ -1,6 +1,9 @@
 [meta]
 author=Wagic Team
+name=Fate Reforged
+block=Khans of Tarkir
 year=2015
+total=185
 [/meta]
 [card]
 primitive=Abzan Advantage
@@ -33,16 +36,16 @@ id=391786
 rarity=C
 [/card]
 [card]
-primitive=Alesha, Who Smiles at Death
-id=391787
-rarity=R
-[/card]
-[card]
 primitive=Alesha's Vanguard
 id=391788
 rarity=C
 [/card]
 [card]
+primitive=Alesha, Who Smiles at Death
+id=391787
+rarity=R
+[/card]
+[card]
 primitive=Ambush Krotiq
 id=391789
 rarity=C
@@ -653,16 +656,16 @@ id=391909
 rarity=U
 [/card]
 [card]
-primitive=Sage-Eye Avengers
-id=391911
-rarity=R
-[/card]
-[card]
 primitive=Sage's Reverie
 id=391910
 rarity=U
 [/card]
 [card]
+primitive=Sage-Eye Avengers
+id=391911
+rarity=R
+[/card]
+[card]
 primitive=Sandblast
 id=391912
 rarity=C
@@ -788,16 +791,16 @@ id=391936
 rarity=C
 [/card]
 [card]
-primitive=Tasigur, the Golden Fang
-id=391937
-rarity=R
-[/card]
-[card]
 primitive=Tasigur's Cruelty
 id=391938
 rarity=C
 [/card]
 [card]
+primitive=Tasigur, the Golden Fang
+id=391937
+rarity=R
+[/card]
+[card]
 primitive=Temporal Trespass
 id=391939
 rarity=M
@@ -843,16 +846,16 @@ id=391947
 rarity=C
 [/card]
 [card]
-primitive=Ugin, the Spirit Dragon
-id=391948
-rarity=M
-[/card]
-[card]
 primitive=Ugin's Construct
 id=391949
 rarity=U
 [/card]
 [card]
+primitive=Ugin, the Spirit Dragon
+id=391948
+rarity=M
+[/card]
+[card]
 primitive=Valorous Stance
 id=391950
 rarity=U
@@ -913,16 +916,16 @@ id=391961
 rarity=C
 [/card]
 [card]
-primitive=Winds of Qal Sisma
-id=391962
-rarity=U
-[/card]
-[card]
 primitive=Wind-Scarred Crag
 id=391963
 rarity=C
 [/card]
 [card]
+primitive=Winds of Qal Sisma
+id=391962
+rarity=U
+[/card]
+[card]
 primitive=Write into Being
 id=391964
 rarity=C

projects/mtg/bin/Res/sets/FUT/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Future Sight
+block=Time Spiral
 year=2007
-block=Time
+total=180
 [/meta]
 [card]
 primitive=Akroma's Memorial
@@ -49,7 +51,7 @@ id=136048
 rarity=R
 [/card]
 [card]
-primitive=Baru Fist of Krosa
+primitive=Baru, Fist of Krosa
 id=136155
 rarity=R
 [/card]
@@ -274,7 +276,7 @@ id=136157
 rarity=R
 [/card]
 [card]
-primitive=Goldmeadow Harrier Token from Goldmeadow Lookout
+primitive=Goldmeadow Harrier Token
 id=-130311
 rarity=T
 [/card]
@@ -384,7 +386,7 @@ id=130698
 rarity=C
 [/card]
 [card]
-primitive=Korlash Heir to Blackblade
+primitive=Korlash, Heir to Blackblade
 id=136208
 rarity=R
 [/card]
@@ -404,7 +406,7 @@ id=132213
 rarity=C
 [/card]
 [card]
-primitive=Llanowar Elves Token from Llanowar Mentor
+primitive=Llanowar Elves Token
 id=-126166
 rarity=T
 [/card]
@@ -749,7 +751,7 @@ id=126213
 rarity=U
 [/card]
 [card]
-primitive=Spark Elemental Token from Sparkspitter
+primitive=Spark Elemental Token
 id=-130341
 rarity=T
 [/card]
@@ -874,16 +876,16 @@ id=136149
 rarity=R
 [/card]
 [card]
-primitive=Venser, Shaper Savant
-id=136209
-rarity=R
-[/card]
-[card]
 primitive=Venser's Diffusion
 id=136197
 rarity=C
 [/card]
 [card]
+primitive=Venser, Shaper Savant
+id=136209
+rarity=R
+[/card]
+[card]
 primitive=Virulent Sliver
 id=130644
 rarity=C

projects/mtg/bin/Res/sets/FVD/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=From the Vault: Dragons
 block=Vault
 year=2008
+total=15
 [/meta]
 [card]
 primitive=Bladewing the Risen

projects/mtg/bin/Res/sets/FVE/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=From the Vault: Exiled
 block=Vault
 year=2009
+total=15
 [/meta]
 [card]
 primitive=Balance

projects/mtg/bin/Res/sets/FVL/_cards.dat

@@ -0,0 +1,82 @@
+[meta]
+author=Wagic Team
+name=From the Vault: Legends
+block=Vault
+year=2011
+total=15
+[/meta]
+[card]
+primitive=Cao Cao, Lord of Wei
+id=244670
+rarity=M
+[/card]
+[card]
+primitive=Captain Sisay
+id=244665
+rarity=M
+[/card]
+[card]
+primitive=Doran, the Siege Tower
+id=244674
+rarity=M
+[/card]
+[card]
+primitive=Kiki-Jiki, Mirror Breaker
+id=244666
+rarity=M
+[/card]
+[card]
+primitive=Kresh the Bloodbraided
+id=244672
+rarity=M
+[/card]
+[card]
+primitive=Mikaeus, the Lunarch
+id=259296
+rarity=M
+[/card]
+[card]
+primitive=Omnath, Locus of Mana
+id=259295
+rarity=M
+[/card]
+[card]
+primitive=Oona, Queen of the Fae
+id=244668
+rarity=M
+[/card]
+[card]
+primitive=Progenitus
+id=244675
+rarity=M
+[/card]
+[card]
+primitive=Rafiq of the Many
+id=244669
+rarity=M
+[/card]
+[card]
+primitive=Sharuum the Hegemon
+id=244664
+rarity=M
+[/card]
+[card]
+primitive=Sun Quan, Lord of Wu
+id=244663
+rarity=M
+[/card]
+[card]
+primitive=Teferi, Mage of Zhalfir
+id=244667
+rarity=M
+[/card]
+[card]
+primitive=Ulamog, the Infinite Gyre
+id=261321
+rarity=M
+[/card]
+[card]
+primitive=Visara the Dreadful
+id=244677
+rarity=M
+[/card]

projects/mtg/bin/Res/sets/FVR/_cards.dat

@@ -1,10 +1,12 @@
 [meta]
 author=Wagic Team
+name=From the Vault: Relics
 block=Vault
 year=2010
+total=15
 [/meta]
 [card]
-primitive=Aether Vial
+primitive=AEther Vial
 id=212630
 rarity=M
 [/card]
@@ -77,4 +79,4 @@ rarity=M
 primitive=Zuran Orb
 id=212628
 rarity=M
-[/card]
+[/card]

projects/mtg/bin/Res/sets/GPT/_cards.dat

@@ -1,9 +1,16 @@
 [meta]
 author=Wagic Team
+name=Guildpact
+block=Ravnica
 year=2006
-block=Guild
+total=165
 [/meta]
 [card]
+primitive=AEtherplasm
+id=96924
+rarity=U
+[/card]
+[card]
 primitive=Absolver Thrull
 id=96953
 rarity=C
@@ -14,11 +21,6 @@ id=96858
 rarity=R
 [/card]
 [card]
-primitive=AEtherplasm
-id=96924
-rarity=U
-[/card]
-[card]
 primitive=Agent of Masks
 id=96892
 rarity=U
@@ -439,16 +441,16 @@ id=107685
 rarity=C
 [/card]
 [card]
-primitive=Nivix, Aerie of the Firemind
-id=96937
-rarity=U
-[/card]
-[card]
 primitive=Niv-Mizzet, the Firemind
 id=96952
 rarity=R
 [/card]
 [card]
+primitive=Nivix, Aerie of the Firemind
+id=96937
+rarity=U
+[/card]
+[card]
 primitive=Ogre Savant
 id=97236
 rarity=C

projects/mtg/bin/Res/sets/GTC/_cards.dat

@@ -1,10 +1,16 @@
 [meta]
 author=Wagic Team
-name=GTC
+name=Gatecrash
+block=Return to Ravnica
 year=2013
-block=RTR
+total=249
 [/meta]
 [card]
+primitive=AEtherize
+id=366273
+rarity=U
+[/card]
+[card]
 primitive=Act of Treason
 id=366305
 rarity=C
@@ -20,11 +26,6 @@ id=366294
 rarity=C
 [/card]
 [card]
-primitive=AEtherize
-id=366273
-rarity=U
-[/card]
-[card]
 primitive=Agoraphobia
 id=366258
 rarity=U
@@ -70,13 +71,13 @@ id=366470
 rarity=R
 [/card]
 [card]
-primitive=Aurelia, the Warleader
+primitive=Aurelia's Fury
-id=366448
+id=366384
 rarity=M
 [/card]
 [card]
-primitive=Aurelia's Fury
+primitive=Aurelia, the Warleader
-id=366384
+id=366448
 rarity=M
 [/card]
 [card]
@@ -255,6 +256,11 @@ id=366251
 rarity=C
 [/card]
 [card]
+primitive=Death's Approach
+id=366300
+rarity=C
+[/card]
+[card]
 primitive=Deathcult Rogue
 id=366254
 rarity=C
@@ -265,11 +271,6 @@ id=366278
 rarity=M
 [/card]
 [card]
-primitive=Death's Approach
-id=366300
-rarity=C
-[/card]
-[card]
 primitive=Debtor's Pulpit
 id=366268
 rarity=U
@@ -610,16 +611,16 @@ id=366361
 rarity=C
 [/card]
 [card]
-primitive=Knight of Obligation
-id=366237
-rarity=U
-[/card]
-[card]
 primitive=Knight Watch
 id=366477
 rarity=C
 [/card]
 [card]
+primitive=Knight of Obligation
+id=366237
+rarity=U
+[/card]
+[card]
 primitive=Last Thoughts
 id=366407
 rarity=C

projects/mtg/bin/Res/sets/GVL/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Duel Decks: Garruk vs. Liliana
 block=Duel
 year=2009
+total=63
 [/meta]
 [card]
 primitive=Albino Troll
@@ -65,7 +67,7 @@ rarity=U
 [/card]
 [card]
 primitive=Forest
-id=204966
+id=204964
 rarity=L
 [/card]
 [card]
@@ -75,12 +77,12 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=204967
+id=204966
 rarity=L
 [/card]
 [card]
 primitive=Forest
-id=204964
+id=204967
 rarity=L
 [/card]
 [card]
@@ -245,7 +247,7 @@ rarity=U
 [/card]
 [card]
 primitive=Swamp
-id=204970
+id=204968
 rarity=L
 [/card]
 [card]
@@ -255,7 +257,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=204968
+id=204970
 rarity=L
 [/card]
 [card]

projects/mtg/bin/Res/sets/HML/_cards.dat

@@ -1,30 +1,27 @@
 [meta]
 author=Wagic Team
+name=Homelands
 year=1995
+total=140
 [/meta]
 [card]
+primitive=AEther Storm
+id=2935
+rarity=U
+[/card]
+[card]
 primitive=Abbey Gargoyles
 id=3010
 rarity=U
 [/card]
 [card]
 primitive=Abbey Matron
-id=3012
-rarity=C
-[/card]
-[card]
-primitive=Abbey Matron
 id=3011
 rarity=C
 [/card]
 [card]
-primitive=AEther Storm
+primitive=Abbey Matron
-id=2935
+id=3012
-rarity=U
-[/card]
-[card]
-primitive=Aliban's Tower
-id=2986
 rarity=C
 [/card]
 [card]
@@ -33,13 +30,8 @@ id=2985
 rarity=C
 [/card]
 [card]
-primitive=Ambush
+primitive=Aliban's Tower
-id=2987
+id=2986
-rarity=C
-[/card]
-[card]
-primitive=Ambush Party
-id=2989
 rarity=C
 [/card]
 [card]
@@ -48,36 +40,16 @@ id=2988
 rarity=C
 [/card]
 [card]
-primitive=Anaba Ancestor
+primitive=Ambush Party
-id=2991
+id=2989
-rarity=R
-[/card]
-[card]
-primitive=Anaba Bodyguard
-id=2993
 rarity=C
 [/card]
 [card]
-primitive=Anaba Bodyguard
+primitive=Ambush
-id=2992
+id=2987
 rarity=C
 [/card]
 [card]
-primitive=Anaba Shaman
-id=2995
-rarity=C
-[/card]
-[card]
-primitive=Anaba Shaman
-id=2994
-rarity=C
-[/card]
-[card]
-primitive=Anaba Spirit Crafter
-id=2996
-rarity=R
-[/card]
-[card]
 primitive=An-Havva Constable
 id=2960
 rarity=R
@@ -98,6 +70,36 @@ id=2990
 rarity=R
 [/card]
 [card]
+primitive=Anaba Ancestor
+id=2991
+rarity=R
+[/card]
+[card]
+primitive=Anaba Bodyguard
+id=2992
+rarity=C
+[/card]
+[card]
+primitive=Anaba Bodyguard
+id=2993
+rarity=C
+[/card]
+[card]
+primitive=Anaba Shaman
+id=2994
+rarity=C
+[/card]
+[card]
+primitive=Anaba Shaman
+id=2995
+rarity=C
+[/card]
+[card]
+primitive=Anaba Spirit Crafter
+id=2996
+rarity=R
+[/card]
+[card]
 primitive=Apocalypse Chime
 id=2900
 rarity=R
@@ -114,12 +116,12 @@ rarity=U
 [/card]
 [card]
 primitive=Aysen Bureaucrats
-id=3014
+id=3013
 rarity=C
 [/card]
 [card]
 primitive=Aysen Bureaucrats
-id=3013
+id=3014
 rarity=C
 [/card]
 [card]
@@ -159,12 +161,12 @@ rarity=R
 [/card]
 [card]
 primitive=Carapace
-id=2964
+id=2963
 rarity=C
 [/card]
 [card]
 primitive=Carapace
-id=2963
+id=2964
 rarity=C
 [/card]
 [card]
@@ -174,12 +176,12 @@ rarity=U
 [/card]
 [card]
 primitive=Cemetery Gate
-id=2914
+id=2913
 rarity=C
 [/card]
 [card]
 primitive=Cemetery Gate
-id=2913
+id=2914
 rarity=C
 [/card]
 [card]
@@ -214,12 +216,12 @@ rarity=C
 [/card]
 [card]
 primitive=Dark Maze
-id=2940
+id=2939
 rarity=C
 [/card]
 [card]
 primitive=Dark Maze
-id=2939
+id=2940
 rarity=C
 [/card]
 [card]
@@ -244,12 +246,12 @@ rarity=U
 [/card]
 [card]
 primitive=Dry Spell
-id=2917
+id=2916
 rarity=C
 [/card]
 [card]
 primitive=Dry Spell
-id=2916
+id=2917
 rarity=C
 [/card]
 [card]
@@ -264,12 +266,12 @@ rarity=R
 [/card]
 [card]
 primitive=Dwarven Trader
-id=3001
+id=3000
 rarity=C
 [/card]
 [card]
 primitive=Dwarven Trader
-id=3000
+id=3001
 rarity=C
 [/card]
 [card]
@@ -294,12 +296,12 @@ rarity=R
 [/card]
 [card]
 primitive=Feast of the Unicorn
-id=2919
+id=2918
 rarity=C
 [/card]
 [card]
 primitive=Feast of the Unicorn
-id=2918
+id=2919
 rarity=C
 [/card]
 [card]
@@ -309,12 +311,12 @@ rarity=R
 [/card]
 [card]
 primitive=Folk of An-Havva
-id=2968
+id=2967
 rarity=C
 [/card]
 [card]
 primitive=Folk of An-Havva
-id=2967
+id=2968
 rarity=C
 [/card]
 [card]
@@ -334,12 +336,12 @@ rarity=U
 [/card]
 [card]
 primitive=Giant Albatross
-id=2943
+id=2942
 rarity=C
 [/card]
 [card]
 primitive=Giant Albatross
-id=2942
+id=2943
 rarity=C
 [/card]
 [card]
@@ -374,12 +376,12 @@ rarity=R
 [/card]
 [card]
 primitive=Hungry Mist
-id=2970
+id=2969
 rarity=C
 [/card]
 [card]
 primitive=Hungry Mist
-id=2969
+id=2970
 rarity=C
 [/card]
 [card]
@@ -403,11 +405,6 @@ id=2945
 rarity=C
 [/card]
 [card]
-primitive=Joven
-id=3006
-rarity=C
-[/card]
-[card]
 primitive=Joven's Ferrets
 id=2971
 rarity=C
@@ -418,6 +415,11 @@ id=2907
 rarity=U
 [/card]
 [card]
+primitive=Joven
+id=3006
+rarity=C
+[/card]
+[card]
 primitive=Koskun Falls
 id=2927
 rarity=R
@@ -429,12 +431,12 @@ rarity=U
 [/card]
 [card]
 primitive=Labyrinth Minotaur
-id=2947
+id=2946
 rarity=C
 [/card]
 [card]
 primitive=Labyrinth Minotaur
-id=2946
+id=2947
 rarity=C
 [/card]
 [card]
@@ -459,12 +461,12 @@ rarity=R
 [/card]
 [card]
 primitive=Memory Lapse
-id=2950
+id=2949
 rarity=C
 [/card]
 [card]
 primitive=Memory Lapse
-id=2949
+id=2950
 rarity=C
 [/card]
 [card]
@@ -474,12 +476,12 @@ rarity=C
 [/card]
 [card]
 primitive=Mesa Falcon
-id=3022
+id=3021
 rarity=C
 [/card]
 [card]
 primitive=Mesa Falcon
-id=3021
+id=3022
 rarity=C
 [/card]
 [card]
@@ -514,12 +516,12 @@ rarity=U
 [/card]
 [card]
 primitive=Reef Pirates
-id=2955
+id=2954
 rarity=C
 [/card]
 [card]
 primitive=Reef Pirates
-id=2954
+id=2955
 rarity=C
 [/card]
 [card]
@@ -559,12 +561,12 @@ rarity=R
 [/card]
 [card]
 primitive=Samite Alchemist
-id=3026
+id=3025
 rarity=C
 [/card]
 [card]
 primitive=Samite Alchemist
-id=3025
+id=3026
 rarity=C
 [/card]
 [card]
@@ -584,12 +586,12 @@ rarity=U
 [/card]
 [card]
 primitive=Sengir Bats
-id=2930
+id=2929
 rarity=C
 [/card]
 [card]
 primitive=Sengir Bats
-id=2929
+id=2930
 rarity=C
 [/card]
 [card]
@@ -619,12 +621,12 @@ rarity=C
 [/card]
 [card]
 primitive=Shrink
-id=2980
+id=2979
 rarity=C
 [/card]
 [card]
 primitive=Shrink
-id=2979
+id=2980
 rarity=C
 [/card]
 [card]
@@ -649,17 +651,12 @@ rarity=R
 [/card]
 [card]
 primitive=Torture
-id=2933
-rarity=C
-[/card]
-[card]
-primitive=Torture
 id=2932
 rarity=C
 [/card]
 [card]
-primitive=Trade Caravan
+primitive=Torture
-id=3033
+id=2933
 rarity=C
 [/card]
 [card]
@@ -668,6 +665,11 @@ id=3032
 rarity=C
 [/card]
 [card]
+primitive=Trade Caravan
+id=3033
+rarity=C
+[/card]
+[card]
 primitive=Truce
 id=3034
 rarity=R
@@ -684,12 +686,12 @@ rarity=R
 [/card]
 [card]
 primitive=Willow Faerie
-id=2983
+id=2982
 rarity=C
 [/card]
 [card]
 primitive=Willow Faerie
-id=2982
+id=2983
 rarity=C
 [/card]
 [card]

projects/mtg/bin/Res/sets/HVM/_cards.dat

@@ -0,0 +1,412 @@
+[meta]
+author=Wagic Team
+name=Duel Decks: Heroes vs. Monsters
+block=Duel
+year=2013
+total=81
+[/meta]
+[card]
+primitive=Anax and Cymede
+id=373396
+rarity=R
+[/card]
+[card]
+primitive=Armory Guard
+id=373415
+rarity=C
+[/card]
+[card]
+primitive=Auramancer
+id=373402
+rarity=C
+[/card]
+[card]
+primitive=Battle Mastery
+id=373358
+rarity=U
+[/card]
+[card]
+primitive=Beast Within
+id=373352
+rarity=U
+[/card]
+[card]
+primitive=Blood Ogre
+id=373383
+rarity=C
+[/card]
+[card]
+primitive=Bonds of Faith
+id=373354
+rarity=C
+[/card]
+[card]
+primitive=Boros Guildgate
+id=373389
+rarity=C
+[/card]
+[card]
+primitive=Cavalry Pegasus
+id=373353
+rarity=C
+[/card]
+[card]
+primitive=Condemn
+id=373407
+rarity=U
+[/card]
+[card]
+primitive=Conquering Manticore
+id=373366
+rarity=R
+[/card]
+[card]
+primitive=Crater Hellion
+id=373345
+rarity=R
+[/card]
+[card]
+primitive=Crowned Ceratok
+id=373409
+rarity=U
+[/card]
+[card]
+primitive=Daily Regimen
+id=373360
+rarity=U
+[/card]
+[card]
+primitive=Dawnstrike Paladin
+id=373371
+rarity=C
+[/card]
+[card]
+primitive=Deadly Recluse
+id=373350
+rarity=C
+[/card]
+[card]
+primitive=Destructive Revelry
+id=373351
+rarity=U
+[/card]
+[card]
+primitive=Deus of Calamity
+id=373363
+rarity=R
+[/card]
+[card]
+primitive=Dragon Blood
+id=373362
+rarity=U
+[/card]
+[card]
+primitive=Fencing Ace
+id=373367
+rarity=U
+[/card]
+[card]
+primitive=Figure of Destiny
+id=373388
+rarity=R
+[/card]
+[card]
+primitive=Fires of Yavimaya
+id=373397
+rarity=U
+[/card]
+[card]
+primitive=Forest
+id=373349
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=373374
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=373375
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=373404
+rarity=L
+[/card]
+[card]
+primitive=Freewind Equenaut
+id=373376
+rarity=C
+[/card]
+[card]
+primitive=Ghor-Clan Savage
+id=373373
+rarity=C
+[/card]
+[card]
+primitive=Gorehorn Minotaurs
+id=373398
+rarity=C
+[/card]
+[card]
+primitive=Griffin Guide
+id=373337
+rarity=U
+[/card]
+[card]
+primitive=Gustcloak Sentinel
+id=373364
+rarity=U
+[/card]
+[card]
+primitive=Kamahl, Pit Fighter
+id=373338
+rarity=R
+[/card]
+[card]
+primitive=Kavu Predator
+id=373377
+rarity=U
+[/card]
+[card]
+primitive=Kazandu Refuge
+id=373412
+rarity=U
+[/card]
+[card]
+primitive=Krosan Tusker
+id=373394
+rarity=C
+[/card]
+[card]
+primitive=Llanowar Reborn
+id=373368
+rarity=U
+[/card]
+[card]
+primitive=Magma Jet
+id=373400
+rarity=U
+[/card]
+[card]
+primitive=Miraculous Recovery
+id=373370
+rarity=U
+[/card]
+[card]
+primitive=Moment of Heroism
+id=373344
+rarity=C
+[/card]
+[card]
+primitive=Mountain
+id=373346
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=373359
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=373378
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=373382
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=373387
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=373392
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=373403
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=373411
+rarity=L
+[/card]
+[card]
+primitive=New Benalia
+id=373401
+rarity=U
+[/card]
+[card]
+primitive=Nobilis of War
+id=373336
+rarity=R
+[/card]
+[card]
+primitive=Orcish Lumberjack
+id=373399
+rarity=C
+[/card]
+[card]
+primitive=Ordeal of Purphoros
+id=373406
+rarity=U
+[/card]
+[card]
+primitive=Pay No Heed
+id=373405
+rarity=C
+[/card]
+[card]
+primitive=Plains
+id=373341
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=373361
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=373369
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=373386
+rarity=L
+[/card]
+[card]
+primitive=Polukranos, World Eater
+id=373384
+rarity=M
+[/card]
+[card]
+primitive=Prey Upon
+id=373348
+rarity=C
+[/card]
+[card]
+primitive=Pyroclasm
+id=373365
+rarity=U
+[/card]
+[card]
+primitive=Pyrokinesis
+id=373356
+rarity=U
+[/card]
+[card]
+primitive=Regrowth
+id=373408
+rarity=U
+[/card]
+[card]
+primitive=Righteousness
+id=373381
+rarity=U
+[/card]
+[card]
+primitive=Satyr Hedonist
+id=373340
+rarity=C
+[/card]
+[card]
+primitive=Shower of Sparks
+id=373355
+rarity=C
+[/card]
+[card]
+primitive=Skarrg, the Rage Pits
+id=373357
+rarity=U
+[/card]
+[card]
+primitive=Skarrgan Firebird
+id=373393
+rarity=R
+[/card]
+[card]
+primitive=Skarrgan Skybreaker
+id=373413
+rarity=U
+[/card]
+[card]
+primitive=Smite the Monstrous
+id=373372
+rarity=C
+[/card]
+[card]
+primitive=Somberwald Vigilante
+id=373385
+rarity=C
+[/card]
+[card]
+primitive=Stand Firm
+id=373343
+rarity=C
+[/card]
+[card]
+primitive=Stun Sniper
+id=373391
+rarity=U
+[/card]
+[card]
+primitive=Sun Titan
+id=373379
+rarity=M
+[/card]
+[card]
+primitive=Terrifying Presence
+id=373380
+rarity=C
+[/card]
+[card]
+primitive=Thraben Valiant
+id=373342
+rarity=C
+[/card]
+[card]
+primitive=Troll Ascetic
+id=373416
+rarity=R
+[/card]
+[card]
+primitive=Truefire Paladin
+id=373395
+rarity=U
+[/card]
+[card]
+primitive=Undying Rage
+id=373347
+rarity=U
+[/card]
+[card]
+primitive=Valley Rannet
+id=373390
+rarity=C
+[/card]
+[card]
+primitive=Volt Charge
+id=373414
+rarity=C
+[/card]
+[card]
+primitive=Winds of Rath
+id=373410
+rarity=R
+[/card]
+[card]
+primitive=Zhur-Taa Druid
+id=373339
+rarity=C
+[/card]

projects/mtg/bin/Res/sets/ICE/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Ice Age
+block=Ice Age
 year=1995
-block=Ice
+total=383
 [/meta]
 [card]
 primitive=Abyssal Specter
@@ -525,7 +527,7 @@ rarity=U
 [/card]
 [card]
 primitive=Forest
-id=2748
+id=2746
 rarity=L
 [/card]
 [card]
@@ -535,7 +537,7 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=2746
+id=2748
 rarity=L
 [/card]
 [card]
@@ -860,7 +862,7 @@ rarity=C
 [/card]
 [card]
 primitive=Island
-id=2769
+id=2767
 rarity=L
 [/card]
 [card]
@@ -870,7 +872,7 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=2767
+id=2769
 rarity=L
 [/card]
 [card]
@@ -1069,6 +1071,11 @@ id=2577
 rarity=U
 [/card]
 [card]
+primitive=Marton Stromgald
+id=2635
+rarity=R
+[/card]
+[card]
 primitive=Maddening Wind
 id=2578
 rarity=U
@@ -1084,11 +1091,6 @@ id=2414
 rarity=U
 [/card]
 [card]
-primitive=Marton Stromgald
-id=2635
-rarity=R
-[/card]
-[card]
 primitive=Melee
 id=2636
 rarity=U
@@ -1164,8 +1166,18 @@ id=2477
 rarity=C
 [/card]
 [card]
+primitive=Mountain Goat
+id=2639
+rarity=C
+[/card]
+[card]
+primitive=Mountain Titan
+id=2735
+rarity=R
+[/card]
+[card]
 primitive=Mountain
-id=2765
+id=2763
 rarity=L
 [/card]
 [card]
@@ -1175,20 +1187,10 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=2763
+id=2765
 rarity=L
 [/card]
 [card]
-primitive=Mountain Goat
-id=2639
-rarity=C
-[/card]
-[card]
-primitive=Mountain Titan
-id=2735
-rarity=R
-[/card]
-[card]
 primitive=Mudslide
 id=2640
 rarity=R
@@ -1320,7 +1322,7 @@ rarity=U
 [/card]
 [card]
 primitive=Plains
-id=2773
+id=2771
 rarity=L
 [/card]
 [card]
@@ -1330,7 +1332,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=2771
+id=2773
 rarity=L
 [/card]
 [card]
@@ -1529,11 +1531,6 @@ id=2713
 rarity=U
 [/card]
 [card]
-primitive=Snowblind
-id=2588
-rarity=R
-[/card]
-[card]
 primitive=Snow-Covered Forest
 id=2749
 rarity=L
@@ -1559,6 +1556,11 @@ id=2742
 rarity=L
 [/card]
 [card]
+primitive=Snowblind
+id=2588
+rarity=R
+[/card]
+[card]
 primitive=Snowfall
 id=2537
 rarity=C
@@ -1675,7 +1677,7 @@ rarity=U
 [/card]
 [card]
 primitive=Swamp
-id=2745
+id=2743
 rarity=L
 [/card]
 [card]
@@ -1685,7 +1687,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=2743
+id=2745
 rarity=L
 [/card]
 [card]
@@ -1899,6 +1901,11 @@ id=2604
 rarity=U
 [/card]
 [card]
+primitive=Zur's Weirding
+id=2546
+rarity=R
+[/card]
+[card]
 primitive=Zuran Enchanter
 id=2547
 rarity=C
@@ -1913,8 +1920,3 @@ primitive=Zuran Spellcaster
 id=2548
 rarity=C
 [/card]
-[card]
-primitive=Zur's Weirding
-id=2546
-rarity=R
-[/card]

projects/mtg/bin/Res/sets/INV/_cards.dat

@@ -1,9 +1,16 @@
 [meta]
 author=Wagic Team
-year=2000
+name=Invasion
 block=Invasion
+year=2000
+total=350
 [/meta]
 [card]
+primitive=AEther Rift
+id=23194
+rarity=R
+[/card]
+[card]
 primitive=Absorb
 id=23155
 rarity=R
@@ -14,11 +21,6 @@ id=23030
 rarity=U
 [/card]
 [card]
-primitive=AEther Rift
-id=23194
-rarity=R
-[/card]
-[card]
 primitive=Aggressive Urge
 id=24127
 rarity=C
@@ -94,12 +96,7 @@ id=23195
 rarity=R
 [/card]
 [card]
-primitive=Assault // Battery (Assault)
+primitive=Assault // Battery
-id=20579
-rarity=U
-[/card]
-[card]
-primitive=Assault // Battery (Battery)
 id=20580
 rarity=U
 [/card]
@@ -279,16 +276,16 @@ id=22934
 rarity=C
 [/card]
 [card]
-primitive=Crosis, the Purger
-id=23207
-rarity=R
-[/card]
-[card]
 primitive=Crosis's Attendant
 id=25837
 rarity=U
 [/card]
 [card]
+primitive=Crosis, the Purger
+id=23207
+rarity=R
+[/card]
+[card]
 primitive=Crown of Flames
 id=23074
 rarity=C
@@ -314,16 +311,16 @@ id=23044
 rarity=C
 [/card]
 [card]
-primitive=Darigaaz, the Igniter
-id=23208
-rarity=R
-[/card]
-[card]
 primitive=Darigaaz's Attendant
 id=25838
 rarity=U
 [/card]
 [card]
+primitive=Darigaaz, the Igniter
+id=23208
+rarity=R
+[/card]
+[card]
 primitive=Death or Glory
 id=22956
 rarity=R
@@ -384,16 +381,16 @@ id=24124
 rarity=U
 [/card]
 [card]
-primitive=Dromar, the Banisher
-id=23206
-rarity=R
-[/card]
-[card]
 primitive=Dromar's Attendant
 id=25836
 rarity=U
 [/card]
 [card]
+primitive=Dromar, the Banisher
+id=23206
+rarity=R
+[/card]
+[card]
 primitive=Dueling Grounds
 id=25438
 rarity=R
@@ -859,12 +856,7 @@ id=23070
 rarity=C
 [/card]
 [card]
-primitive=Pain // Suffering (Pain)
+primitive=Pain // Suffering
-id=20577
-rarity=U
-[/card]
-[card]
-primitive=Pain // Suffering (Suffering)
 id=20578
 rarity=U
 [/card]
@@ -1109,16 +1101,16 @@ id=23150
 rarity=U
 [/card]
 [card]
-primitive=Rith, the Awakener
-id=23209
-rarity=R
-[/card]
-[card]
 primitive=Rith's Attendant
 id=25839
 rarity=U
 [/card]
 [card]
+primitive=Rith, the Awakener
+id=23209
+rarity=R
+[/card]
+[card]
 primitive=Rogue Kavu
 id=23065
 rarity=C
@@ -1314,23 +1306,18 @@ id=23189
 rarity=R
 [/card]
 [card]
-primitive=Spirit of Resistance
-id=22968
-rarity=R
-[/card]
-[card]
 primitive=Spirit Weaver
 id=22950
 rarity=U
 [/card]
 [card]
-primitive=Spite // Malice (Malice)
+primitive=Spirit of Resistance
-id=20576
+id=22968
-rarity=U
+rarity=R
 [/card]
 [card]
-primitive=Spite // Malice (Spite)
+primitive=Spite // Malice
-id=20575
+id=20576
 rarity=U
 [/card]
 [card]
@@ -1344,12 +1331,7 @@ id=25752
 rarity=R
 [/card]
 [card]
-primitive=Stand // Deliver (Stand)
+primitive=Stand // Deliver
-id=20573
-rarity=U
-[/card]
-[card]
-primitive=Stand // Deliver (Deliver)
 id=20574
 rarity=U
 [/card]
@@ -1539,16 +1521,16 @@ id=23039
 rarity=U
 [/card]
 [card]
-primitive=Treva, the Renewer
-id=23210
-rarity=R
-[/card]
-[card]
 primitive=Treva's Attendant
 id=25840
 rarity=U
 [/card]
 [card]
+primitive=Treva, the Renewer
+id=23210
+rarity=R
+[/card]
+[card]
 primitive=Tribal Flames
 id=23076
 rarity=C
@@ -1714,16 +1696,11 @@ id=25320
 rarity=U
 [/card]
 [card]
-primitive=Wax // Wane (Wane)
+primitive=Wax // Wane
 id=20582
 rarity=U
 [/card]
 [card]
-primitive=Wax // Wane (Wax)
-id=20581
-rarity=U
-[/card]
-[card]
 primitive=Wayfaring Giant
 id=23211
 rarity=U

projects/mtg/bin/Res/sets/ISD/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Innistrad
+block=Innistrad
 year=2011
-block=Inni
+total=284
 [/meta]
 [card]
 primitive=Abattoir Ghoul
@@ -49,23 +51,18 @@ id=229968
 rarity=M
 [/card]
 [card]
-primitive=Zombie Token
-id=-229968
-rarity=T
-[/card]
-[card]
 primitive=Ashmouth Hound
 id=233255
 rarity=C
 [/card]
 [card]
-primitive=Avacynian Priest
+primitive=Avacyn's Pilgrim
-id=220380
+id=243212
 rarity=C
 [/card]
 [card]
-primitive=Avacyn's Pilgrim
+primitive=Avacynian Priest
-id=243212
+id=220380
 rarity=C
 [/card]
 [card]
@@ -79,6 +76,11 @@ id=230774
 rarity=M
 [/card]
 [card]
+primitive=Bane of Hanweir
+id=244687
+rarity=T
+[/card]
+[card]
 primitive=Battleground Geist
 id=237355
 rarity=U
@@ -114,11 +116,6 @@ id=227061
 rarity=R
 [/card]
 [card]
-primitive=Lord of Lineage
-id=227072
-rarity=T
-[/card]
-[card]
 primitive=Bonds of Faith
 id=221216
 rarity=C
@@ -194,11 +191,6 @@ id=221209
 rarity=U
 [/card]
 [card]
-primitive=Homicidal Brute
-id=221185
-rarity=T
-[/card]
-[card]
 primitive=Claustrophobia
 id=235601
 rarity=C
@@ -214,11 +206,6 @@ id=221212
 rarity=U
 [/card]
 [card]
-primitive=Unholy Fiend
-id=221222
-rarity=T
-[/card]
-[card]
 primitive=Cobbled Wings
 id=220649
 rarity=C
@@ -289,11 +276,6 @@ id=222118
 rarity=R
 [/card]
 [card]
-primitive=Nightfall Predator
-id=222114
-rarity=T
-[/card]
-[card]
 primitive=Dead Weight
 id=220393
 rarity=C
@@ -309,11 +291,6 @@ id=226749
 rarity=C
 [/card]
 [card]
-primitive=Insectile Aberration
-id=226755
-rarity=T
-[/card]
-[card]
 primitive=Demonmail Hauberk
 id=227291
 rarity=U
@@ -430,6 +407,11 @@ rarity=C
 [/card]
 [card]
 primitive=Forest
+id=245246
+rarity=L
+[/card]
+[card]
+primitive=Forest
 id=245247
 rarity=L
 [/card]
@@ -439,11 +421,6 @@ id=245248
 rarity=L
 [/card]
 [card]
-primitive=Forest
-id=245246
-rarity=L
-[/card]
-[card]
 primitive=Fortress Crab
 id=234429
 rarity=C
@@ -479,21 +456,21 @@ id=245250
 rarity=M
 [/card]
 [card]
-primitive=Garruk the Veil-Cursed
+primitive=Garruk, the Veil-Cursed
 id=245251
 rarity=T
 [/card]
 [card]
+primitive=Gatstaf Howler
+id=227290
+rarity=T
+[/card]
+[card]
 primitive=Gatstaf Shepherd
 id=227409
 rarity=U
 [/card]
 [card]
-primitive=Gatstaf Howler
-id=227290
-rarity=T
-[/card]
-[card]
 primitive=Gavony Township
 id=233242
 rarity=R
@@ -504,6 +481,11 @@ id=247236
 rarity=M
 [/card]
 [card]
+primitive=Geist-Honored Monk
+id=230787
+rarity=R
+[/card]
+[card]
 primitive=Geistcatcher's Rig
 id=234445
 rarity=U
@@ -514,11 +496,6 @@ id=247427
 rarity=C
 [/card]
 [card]
-primitive=Geist-Honored Monk
-id=230787
-rarity=R
-[/card]
-[card]
 primitive=Ghost Quarter
 id=220371
 rarity=U
@@ -579,11 +556,6 @@ id=222124
 rarity=C
 [/card]
 [card]
-primitive=Krallenhorde Wantons
-id=222123
-rarity=T
-[/card]
-[card]
 primitive=Gruesome Deformity
 id=246945
 rarity=C
@@ -604,11 +576,6 @@ id=244683
 rarity=U
 [/card]
 [card]
-primitive=Bane of Hanweir
-id=244687
-rarity=T
-[/card]
-[card]
 primitive=Harvest Pyre
 id=220010
 rarity=C
@@ -634,6 +601,21 @@ id=226883
 rarity=U
 [/card]
 [card]
+primitive=Homicidal Brute
+id=221185
+rarity=T
+[/card]
+[card]
+primitive=Howlpack Alpha
+id=222183
+rarity=T
+[/card]
+[card]
+primitive=Howlpack of Estwald
+id=222906
+rarity=T
+[/card]
+[card]
 primitive=Hysterical Blindness
 id=234433
 rarity=C
@@ -649,16 +631,16 @@ id=222196
 rarity=U
 [/card]
 [card]
+primitive=Insectile Aberration
+id=226755
+rarity=T
+[/card]
+[card]
 primitive=Instigator Gang
 id=227415
 rarity=R
 [/card]
 [card]
-primitive=Wildblood Pack
-id=227419
-rarity=T
-[/card]
-[card]
 primitive=Intangible Virtue
 id=243217
 rarity=U
@@ -674,18 +656,23 @@ id=220041
 rarity=U
 [/card]
 [card]
+primitive=Ironfang
+id=222107
+rarity=T
+[/card]
+[card]
 primitive=Island
 id=245235
 rarity=L
 [/card]
 [card]
 primitive=Island
-id=245237
+id=245236
 rarity=L
 [/card]
 [card]
 primitive=Island
-id=245236
+id=245237
 rarity=L
 [/card]
 [card]
@@ -699,31 +686,31 @@ id=249868
 rarity=R
 [/card]
 [card]
-primitive=Kessig Wolf
-id=220040
-rarity=C
-[/card]
-[card]
 primitive=Kessig Wolf Run
 id=233256
 rarity=R
 [/card]
 [card]
+primitive=Kessig Wolf
+id=220040
+rarity=C
+[/card]
+[card]
 primitive=Kindercatch
 id=227088
 rarity=C
 [/card]
 [card]
+primitive=Krallenhorde Wantons
+id=222123
+rarity=T
+[/card]
+[card]
 primitive=Kruin Outlaw
 id=227084
 rarity=R
 [/card]
 [card]
-primitive=Terror of Kruin Pass
-id=227090
-rarity=T
-[/card]
-[card]
 primitive=Laboratory Maniac
 id=230788
 rarity=R
@@ -739,21 +726,26 @@ id=235597
 rarity=M
 [/card]
 [card]
+primitive=Lord of Lineage
+id=227072
+rarity=T
+[/card]
+[card]
 primitive=Lost in the Mist
 id=241982
 rarity=C
 [/card]
 [card]
-primitive=Ludevic's Test Subject
-id=221179
-rarity=R
-[/card]
-[card]
 primitive=Ludevic's Abomination
 id=221173
 rarity=T
 [/card]
 [card]
+primitive=Ludevic's Test Subject
+id=221179
+rarity=R
+[/card]
+[card]
 primitive=Lumberknot
 id=230624
 rarity=U
@@ -804,11 +796,6 @@ id=222189
 rarity=R
 [/card]
 [card]
-primitive=Howlpack Alpha
-id=222183
-rarity=T
-[/card]
-[card]
 primitive=Memory's Journey
 id=254134
 rarity=U
@@ -819,6 +806,11 @@ id=244682
 rarity=R
 [/card]
 [card]
+primitive=Merciless Predator
+id=222115
+rarity=T
+[/card]
+[card]
 primitive=Midnight Haunting
 id=221214
 rarity=U
@@ -880,12 +872,12 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=245245
+id=245243
 rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=245243
+id=245245
 rarity=L
 [/card]
 [card]
@@ -929,6 +921,11 @@ id=220386
 rarity=C
 [/card]
 [card]
+primitive=Nightfall Predator
+id=222114
+rarity=T
+[/card]
+[card]
 primitive=Olivia Voldaren
 id=247235
 rarity=M
@@ -1004,6 +1001,11 @@ id=237361
 rarity=U
 [/card]
 [card]
+primitive=Rampaging Werewolf
+id=222117
+rarity=T
+[/card]
+[card]
 primitive=Ranger's Guile
 id=249973
 rarity=C
@@ -1024,11 +1026,6 @@ id=222111
 rarity=U
 [/card]
 [card]
-primitive=Merciless Predator
-id=222115
-rarity=T
-[/card]
-[card]
 primitive=Riot Devils
 id=220648
 rarity=C
@@ -1069,11 +1066,6 @@ id=221211
 rarity=U
 [/card]
 [card]
-primitive=Stalking Vampire
-id=221215
-rarity=T
-[/card]
-[card]
 primitive=Selfless Cathar
 id=221219
 rarity=C
@@ -1109,16 +1101,16 @@ id=220047
 rarity=C
 [/card]
 [card]
-primitive=Silverchase Fox
-id=234848
-rarity=C
-[/card]
-[card]
 primitive=Silver-Inlaid Dagger
 id=222190
 rarity=U
 [/card]
 [card]
+primitive=Silverchase Fox
+id=234848
+rarity=C
+[/card]
+[card]
 primitive=Skaab Goliath
 id=222913
 rarity=U
@@ -1194,6 +1186,11 @@ id=227301
 rarity=R
 [/card]
 [card]
+primitive=Stalking Vampire
+id=221215
+rarity=T
+[/card]
+[card]
 primitive=Stensia Bloodhall
 id=233244
 rarity=R
@@ -1235,12 +1232,12 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=245240
+id=245239
 rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=245239
+id=245240
 rarity=L
 [/card]
 [card]
@@ -1249,11 +1246,21 @@ id=245241
 rarity=L
 [/card]
 [card]
+primitive=Terror of Kruin Pass
+id=227090
+rarity=T
+[/card]
+[card]
 primitive=Think Twice
 id=230626
 rarity=C
 [/card]
 [card]
+primitive=Thraben Militia
+id=221190
+rarity=T
+[/card]
+[card]
 primitive=Thraben Purebloods
 id=230625
 rarity=C
@@ -1264,21 +1271,11 @@ id=222016
 rarity=C
 [/card]
 [card]
-primitive=Thraben Militia
-id=221190
-rarity=T
-[/card]
-[card]
 primitive=Tormented Pariah
 id=222186
 rarity=C
 [/card]
 [card]
-primitive=Rampaging Werewolf
-id=222117
-rarity=T
-[/card]
-[card]
 primitive=Traitorous Blood
 id=234438
 rarity=C
@@ -1339,6 +1336,11 @@ id=244684
 rarity=R
 [/card]
 [card]
+primitive=Unholy Fiend
+id=221222
+rarity=T
+[/card]
+[card]
 primitive=Unruly Mob
 id=220389
 rarity=C
@@ -1379,21 +1381,11 @@ id=222112
 rarity=C
 [/card]
 [card]
-primitive=Ironfang
-id=222107
-rarity=T
-[/card]
-[card]
 primitive=Villagers of Estwald
 id=222915
 rarity=C
 [/card]
 [card]
-primitive=Howlpack of Estwald
-id=222906
-rarity=T
-[/card]
-[card]
 primitive=Voiceless Spirit
 id=243215
 rarity=C
@@ -1404,6 +1396,11 @@ id=243210
 rarity=C
 [/card]
 [card]
+primitive=Wildblood Pack
+id=227419
+rarity=T
+[/card]
+[card]
 primitive=Witchbane Orb
 id=233240
 rarity=R
@@ -1427,4 +1424,9 @@ rarity=C
 primitive=Wreath of Geists
 id=237017
 rarity=U
-[/card]
+[/card]
+[card]
+primitive=Zombie Token
+id=-229968
+rarity=T
+[/card]

projects/mtg/bin/Res/sets/IVG/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Duel Decks: Izzet vs. Golgari
 block=Duel
 year=2012
+total=90
 [/meta]
 [card]
 primitive=Barren Moor
@@ -34,11 +36,6 @@ id=292984
 rarity=U
 [/card]
 [card]
-primitive=Life//Death (Death)
-id=292976
-rarity=U
-[/card]
-[card]
 primitive=Dissipate
 id=292758
 rarity=U
@@ -74,7 +71,7 @@ id=338405
 rarity=C
 [/card]
 [card]
-primitive=Fire//Ice (Fire)
+primitive=Fire // Ice
 id=292753
 rarity=U
 [/card]
@@ -84,23 +81,23 @@ id=292750
 rarity=C
 [/card]
 [card]
-primitve=Forest
+primitive=Forest
 id=292943
 rarity=L
 [/card]
 [card]
-primitve=Forest
+primitive=Forest
-id=292946
+id=292944
 rarity=L
 [/card]
 [card]
-primitve=Forest
+primitive=Forest
 id=292945
 rarity=L
 [/card]
 [card]
-primitve=Forest
+primitive=Forest
-id=292944
+id=292946
 rarity=L
 [/card]
 [card]
@@ -174,33 +171,28 @@ id=338390
 rarity=U
 [/card]
 [card]
-primitive=Ice//Fire(Ice)
-id=292754
-rarity=
-[/card]
-[card]
 primitive=Invoke the Firemind
 id=292732
 rarity=R
 [/card]
 [card]
 primitive=Island
-id=292765
-rarity=L
-[/card]
-[card]
-primitive=Island
 id=292763
 rarity=L
 [/card]
 [card]
 primitive=Island
-id=292766
+id=292764
 rarity=L
 [/card]
 [card]
 primitive=Island
-id=292764
+id=292765
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=292766
 rarity=L
 [/card]
 [card]
@@ -249,8 +241,8 @@ id=338415
 rarity=U
 [/card]
 [card]
-primitive=Life//Death (Life)
+primitive=Life // Death
-id=292977
+id=292976
 rarity=U
 [/card]
 [card]
@@ -270,11 +262,6 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=292769
-rarity=L
-[/card]
-[card]
-primitive=Mountain
 id=292767
 rarity=L
 [/card]
@@ -285,8 +272,13 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
+id=292769
+rarity=L
+[/card]
+[card]
+primitive=Mountain
 id=292770
-rarity=
+rarity=L
 [/card]
 [card]
 primitive=Nightmare Void
@@ -294,16 +286,16 @@ id=338410
 rarity=U
 [/card]
 [card]
-primitive=Nivix, Aerie of the Firemind
-id=292737
-rarity=U
-[/card]
-[card]
 primitive=Niv-Mizzet, the Firemind
 id=292738
 rarity=M
 [/card]
 [card]
+primitive=Nivix, Aerie of the Firemind
+id=292737
+rarity=U
+[/card]
+[card]
 primitive=Ogre Savant
 id=338389
 rarity=C
@@ -366,7 +358,7 @@ rarity=U
 [card]
 primitive=Shambling Shell
 id=292957
-rarity=U
+rarity=C
 [/card]
 [card]
 primitive=Shrewd Hatchling
@@ -405,7 +397,7 @@ rarity=U
 [/card]
 [card]
 primitive=Swamp
-id=292962
+id=292960
 rarity=L
 [/card]
 [card]
@@ -415,7 +407,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=292960
+id=292962
 rarity=L
 [/card]
 [card]
@@ -462,4 +454,4 @@ rarity=C
 primitive=Yoke of the Damned
 id=338474
 rarity=C
-[/card]
+[/card]

projects/mtg/bin/Res/sets/JOU/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
-year=2014
+name=Journey into Nyx
 block=Theros
+year=2014
+total=165
 [/meta]
 [card]
 primitive=Aegis of the Gods
@@ -19,16 +21,16 @@ id=380366
 rarity=U
 [/card]
 [card]
-primitive=Ajani, Mentor of Heroes
-id=380367
-rarity=M
-[/card]
-[card]
 primitive=Ajani's Presence
 id=380368
 rarity=C
 [/card]
 [card]
+primitive=Ajani, Mentor of Heroes
+id=380367
+rarity=M
+[/card]
+[card]
 primitive=Akroan Line Breaker
 id=380369
 rarity=U
@@ -319,6 +321,11 @@ id=380426
 rarity=M
 [/card]
 [card]
+primitive=Gold-Forged Sentinel
+id=380429
+rarity=U
+[/card]
+[card]
 primitive=Golden Hind
 id=380427
 rarity=C
@@ -329,11 +336,6 @@ id=380428
 rarity=U
 [/card]
 [card]
-primitive=Gold-Forged Sentinel
-id=380429
-rarity=U
-[/card]
-[card]
 primitive=Grim Guardian
 id=380430
 rarity=C
@@ -414,16 +416,16 @@ id=380445
 rarity=U
 [/card]
 [card]
-primitive=Kruphix, God of Horizons
-id=380446
-rarity=M
-[/card]
-[card]
 primitive=Kruphix's Insight
 id=380447
 rarity=C
 [/card]
 [card]
+primitive=Kruphix, God of Horizons
+id=380446
+rarity=M
+[/card]
+[card]
 primitive=Lagonna-Band Trailblazer
 id=380448
 rarity=C
@@ -529,16 +531,16 @@ id=380468
 rarity=U
 [/card]
 [card]
-primitive=Pharika, God of Affliction
-id=380469
-rarity=M
-[/card]
-[card]
 primitive=Pharika's Chosen
 id=380470
 rarity=C
 [/card]
 [card]
+primitive=Pharika, God of Affliction
+id=380469
+rarity=M
+[/card]
+[card]
 primitive=Pheres-Band Thunderhoof
 id=380471
 rarity=C

projects/mtg/bin/Res/sets/JUD/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
-year=2002
+name=Judgment
 block=Odyssey
+year=2002
+total=143
 [/meta]
 [card]
 primitive=Ancestor's Chosen

projects/mtg/bin/Res/sets/JVC/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Duel Decks: Jace vs. Chandra
 block=Duel
 year=2008
+total=62
 [/meta]
 [card]
 primitive=AEthersnipe
@@ -160,17 +162,12 @@ rarity=C
 [/card]
 [card]
 primitive=Island
-id=190588
-rarity=L
-[/card]
-[card]
-primitive=Island
 id=190583
 rarity=L
 [/card]
 [card]
 primitive=Island
-id=190590
+id=190588
 rarity=L
 [/card]
 [card]
@@ -179,6 +176,11 @@ id=190589
 rarity=L
 [/card]
 [card]
+primitive=Island
+id=190590
+rarity=L
+[/card]
+[card]
 primitive=Jace Beleren
 id=185816
 rarity=M
@@ -215,6 +217,11 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
+id=190585
+rarity=L
+[/card]
+[card]
+primitive=Mountain
 id=190586
 rarity=L
 [/card]
@@ -224,11 +231,6 @@ id=190587
 rarity=L
 [/card]
 [card]
-primitive=Mountain
-id=190585
-rarity=L
-[/card]
-[card]
 primitive=Mulldrifter
 id=189217
 rarity=C

projects/mtg/bin/Res/sets/JVV/_cards.dat

@@ -0,0 +1,447 @@
+[meta]
+author=Wagic Team
+name=Duel Decks: Jace vs. Vraska
+block=Duel
+year=2014
+total=88
+[/meta]
+[card]
+primitive=AEther Adept
+id=380241
+rarity=C
+[/card]
+[card]
+primitive=AEther Figment
+id=380263
+rarity=U
+[/card]
+[card]
+primitive=Acidic Slime
+id=380236
+rarity=U
+[/card]
+[card]
+primitive=Aeon Chronicler
+id=380272
+rarity=R
+[/card]
+[card]
+primitive=Agoraphobia
+id=380253
+rarity=U
+[/card]
+[card]
+primitive=Archaeomancer
+id=380252
+rarity=C
+[/card]
+[card]
+primitive=Body Double
+id=380228
+rarity=R
+[/card]
+[card]
+primitive=Chronomaton
+id=380269
+rarity=U
+[/card]
+[card]
+primitive=Claustrophobia
+id=380259
+rarity=C
+[/card]
+[card]
+primitive=Consume Strength
+id=380246
+rarity=C
+[/card]
+[card]
+primitive=Control Magic
+id=380201
+rarity=U
+[/card]
+[card]
+primitive=Corpse Traders
+id=380254
+rarity=U
+[/card]
+[card]
+primitive=Crosstown Courier
+id=380256
+rarity=C
+[/card]
+[card]
+primitive=Death-Hood Cobra
+id=380262
+rarity=C
+[/card]
+[card]
+primitive=Dread Statuary
+id=380232
+rarity=U
+[/card]
+[card]
+primitive=Dream Stalker
+id=380210
+rarity=C
+[/card]
+[card]
+primitive=Drooling Groodion
+id=380205
+rarity=U
+[/card]
+[card]
+primitive=Errant Ephemeron
+id=380243
+rarity=C
+[/card]
+[card]
+primitive=Festerhide Boar
+id=380200
+rarity=C
+[/card]
+[card]
+primitive=Forest
+id=380192
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=380198
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=380208
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=380209
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=380229
+rarity=L
+[/card]
+[card]
+primitive=Future Sight
+id=380251
+rarity=R
+[/card]
+[card]
+primitive=Gatecreeper Vine
+id=380268
+rarity=C
+[/card]
+[card]
+primitive=Golgari Guildgate
+id=380220
+rarity=C
+[/card]
+[card]
+primitive=Griptide
+id=380267
+rarity=C
+[/card]
+[card]
+primitive=Grisly Spectacle
+id=380274
+rarity=C
+[/card]
+[card]
+primitive=Halimar Depths
+id=380231
+rarity=C
+[/card]
+[card]
+primitive=Highway Robber
+id=380193
+rarity=C
+[/card]
+[card]
+primitive=Hypnotic Cloud
+id=380225
+rarity=C
+[/card]
+[card]
+primitive=Into the Roil
+id=380188
+rarity=C
+[/card]
+[card]
+primitive=Island
+id=380194
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=380217
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=380222
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=380223
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=380261
+rarity=L
+[/card]
+[card]
+primitive=Jace's Ingenuity
+id=380211
+rarity=U
+[/card]
+[card]
+primitive=Jace's Mindseeker
+id=380206
+rarity=R
+[/card]
+[card]
+primitive=Jace's Phantasm
+id=380245
+rarity=U
+[/card]
+[card]
+primitive=Jace, Architect of Thought
+id=380190
+rarity=M
+[/card]
+[card]
+primitive=Krovikan Mist
+id=380275
+rarity=C
+[/card]
+[card]
+primitive=Last Kiss
+id=380218
+rarity=C
+[/card]
+[card]
+primitive=Leyline Phantom
+id=380257
+rarity=C
+[/card]
+[card]
+primitive=Marsh Casualties
+id=380238
+rarity=U
+[/card]
+[card]
+primitive=Memory Lapse
+id=380199
+rarity=C
+[/card]
+[card]
+primitive=Merfolk Wayfinder
+id=380233
+rarity=U
+[/card]
+[card]
+primitive=Mold Shambler
+id=380249
+rarity=C
+[/card]
+[card]
+primitive=Nekrataal
+id=380273
+rarity=U
+[/card]
+[card]
+primitive=Night's Whisper
+id=380191
+rarity=U
+[/card]
+[card]
+primitive=Ohran Viper
+id=380265
+rarity=R
+[/card]
+[card]
+primitive=Oran-Rief Recluse
+id=380248
+rarity=C
+[/card]
+[card]
+primitive=Phantasmal Bear
+id=380219
+rarity=C
+[/card]
+[card]
+primitive=Phantasmal Dragon
+id=380215
+rarity=U
+[/card]
+[card]
+primitive=Prohibit
+id=380270
+rarity=C
+[/card]
+[card]
+primitive=Pulse Tracker
+id=380250
+rarity=C
+[/card]
+[card]
+primitive=Putrid Leech
+id=380242
+rarity=C
+[/card]
+[card]
+primitive=Ray of Command
+id=380216
+rarity=C
+[/card]
+[card]
+primitive=Reaper of the Wilds
+id=380224
+rarity=R
+[/card]
+[card]
+primitive=Remand
+id=380255
+rarity=U
+[/card]
+[card]
+primitive=Riftwing Cloudskate
+id=380197
+rarity=U
+[/card]
+[card]
+primitive=River Boa
+id=380260
+rarity=U
+[/card]
+[card]
+primitive=Rogue's Passage
+id=380234
+rarity=U
+[/card]
+[card]
+primitive=Sadistic Augermage
+id=380189
+rarity=C
+[/card]
+[card]
+primitive=Sea Gate Oracle
+id=380247
+rarity=C
+[/card]
+[card]
+primitive=Shadow Alley Denizen
+id=380212
+rarity=C
+[/card]
+[card]
+primitive=Slate Street Ruffian
+id=380226
+rarity=C
+[/card]
+[card]
+primitive=Spawnwrithe
+id=380196
+rarity=R
+[/card]
+[card]
+primitive=Spelltwine
+id=380258
+rarity=R
+[/card]
+[card]
+primitive=Stab Wound
+id=380204
+rarity=C
+[/card]
+[card]
+primitive=Stealer of Secrets
+id=380202
+rarity=C
+[/card]
+[card]
+primitive=Stonefare Crocodile
+id=380230
+rarity=C
+[/card]
+[card]
+primitive=Summoner's Bane
+id=380266
+rarity=U
+[/card]
+[card]
+primitive=Swamp
+id=380237
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=380239
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=380240
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=380264
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=380271
+rarity=L
+[/card]
+[card]
+primitive=Tainted Wood
+id=380213
+rarity=U
+[/card]
+[card]
+primitive=Tavern Swindler
+id=380195
+rarity=U
+[/card]
+[card]
+primitive=Thought Scour
+id=380203
+rarity=C
+[/card]
+[card]
+primitive=Tragic Slip
+id=380221
+rarity=C
+[/card]
+[card]
+primitive=Treasured Find
+id=380235
+rarity=U
+[/card]
+[card]
+primitive=Underworld Connections
+id=380227
+rarity=R
+[/card]
+[card]
+primitive=Vinelasher Kudzu
+id=380244
+rarity=R
+[/card]
+[card]
+primitive=Vraska the Unseen
+id=380214
+rarity=M
+[/card]
+[card]
+primitive=Wight of Precinct Six
+id=380207
+rarity=U
+[/card]

projects/mtg/bin/Res/sets/KTK/_cards.dat

@@ -1,6 +1,9 @@
 [meta]
 author=Wagic Team
+name=Khans of Tarkir
+block=Khans of Tarkir
 year=2014
+total=269
 [/meta]
 [card]
 primitive=Abomination of Gudul
@@ -313,16 +316,16 @@ id=386524
 rarity=U
 [/card]
 [card]
-primitive=Dragonscale Boon
-id=386525
-rarity=C
-[/card]
-[card]
 primitive=Dragon-Style Twins
 id=386526
 rarity=R
 [/card]
 [card]
+primitive=Dragonscale Boon
+id=386525
+rarity=C
+[/card]
+[card]
 primitive=Duneblast
 id=386527
 rarity=R
@@ -634,7 +637,7 @@ rarity=C
 [/card]
 [card]
 primitive=Mantis Rider
-id=3865889
+id=386589
 rarity=R
 [/card]
 [card]
@@ -935,7 +938,7 @@ rarity=R
 [card]
 primitive=Salt Road Patrol
 id=386648
-rarity=R
+rarity=C
 [/card]
 [card]
 primitive=Sandsteppe Citadel
@@ -1013,16 +1016,16 @@ id=386663
 rarity=C
 [/card]
 [card]
-primitive=Sidisi, Brood Tyrant
-id=386664
-rarity=M
-[/card]
-[card]
 primitive=Sidisi's Pet
 id=386665
 rarity=C
 [/card]
 [card]
+primitive=Sidisi, Brood Tyrant
+id=386664
+rarity=M
+[/card]
+[card]
 primitive=Siege Rhino
 id=386666
 rarity=R
@@ -1273,13 +1276,13 @@ id=386715
 rarity=C
 [/card]
 [card]
-primitive=Warden of the Eye
+primitive=War-Name Aspirant
-id=386716
+id=386717
 rarity=U
 [/card]
 [card]
-primitive=War-Name Aspirant
+primitive=Warden of the Eye
-id=386717
+id=386716
 rarity=U
 [/card]
 [card]

projects/mtg/bin/Res/sets/KVD/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Duel Decks: Knights vs. Dragons
 block=Duel
 year=2011
+total=81
 [/meta]
 [card]
 primitive=Alaborn Cavalier
@@ -100,12 +102,12 @@ rarity=C
 [/card]
 [card]
 primitive=Forest
-id=243461
+id=243460
 rarity=L
 [/card]
 [card]
 primitive=Forest
-id=243460
+id=243461
 rarity=L
 [/card]
 [card]
@@ -126,7 +128,7 @@ rarity=C
 [card]
 primitive=Grasslands
 id=243452
-rarity=L
+rarity=U
 [/card]
 [card]
 primitive=Griffin Guide
@@ -230,12 +232,12 @@ rarity=R
 [/card]
 [card]
 primitive=Mountain
-id=243496
+id=243495
 rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=243495
+id=243496
 rarity=L
 [/card]
 [card]
@@ -265,12 +267,12 @@ rarity=U
 [/card]
 [card]
 primitive=Plains
-id=243457
+id=243456
 rarity=L
 [/card]
 [card]
 primitive=Plains
-id=243456
+id=243457
 rarity=L
 [/card]
 [card]
@@ -324,16 +326,16 @@ id=243454
 rarity=C
 [/card]
 [card]
-primitive=Shivan Hellkite
-id=243478
-rarity=R
-[/card]
-[card]
 primitive=Shiv's Embrace
 id=243491
 rarity=U
 [/card]
 [card]
+primitive=Shivan Hellkite
+id=243478
+rarity=R
+[/card]
+[card]
 primitive=Sigil Blessing
 id=243447
 rarity=C
@@ -407,4 +409,4 @@ rarity=U
 primitive=Zhalfirin Commander
 id=243430
 rarity=U
-[/card]
+[/card]

projects/mtg/bin/Res/sets/LEA/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Limited Edition Alpha
 block=Early
 year=1993
+total=295
 [/meta]
 [card]
 primitive=Air Elemental
@@ -455,12 +457,12 @@ rarity=R
 [/card]
 [card]
 primitive=Forest
-id=289
+id=288
 rarity=L
 [/card]
 [card]
 primitive=Forest
-id=288
+id=289
 rarity=L
 [/card]
 [card]
@@ -634,9 +636,9 @@ id=159
 rarity=C
 [/card]
 [card]
-primitive=Island
+primitive=Island Sanctuary
-id=293
+id=256
-rarity=L
+rarity=R
 [/card]
 [card]
 primitive=Island
@@ -644,9 +646,9 @@ id=292
 rarity=L
 [/card]
 [card]
-primitive=Island Sanctuary
+primitive=Island
-id=256
+id=293
-rarity=R
+rarity=L
 [/card]
 [card]
 primitive=Ivory Cup
@@ -830,12 +832,12 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=291
+id=290
 rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=290
+id=291
 rarity=L
 [/card]
 [card]
@@ -955,12 +957,12 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=295
+id=294
 rarity=L
 [/card]
 [card]
 primitive=Plains
-id=294
+id=295
 rarity=L
 [/card]
 [card]
@@ -1079,13 +1081,13 @@ id=268
 rarity=C
 [/card]
 [card]
-primitive=Savannah
+primitive=Savannah Lions
-id=282
+id=269
 rarity=R
 [/card]
 [card]
-primitive=Savannah Lions
+primitive=Savannah
-id=269
+id=282
 rarity=R
 [/card]
 [card]
@@ -1215,12 +1217,12 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=278
+id=277
 rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=277
+id=278
 rarity=L
 [/card]
 [card]

projects/mtg/bin/Res/sets/LEB/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Limited Edition Beta
 block=Early
 year=1993
+total=302
 [/meta]
 [card]
 primitive=Air Elemental
@@ -460,7 +462,7 @@ rarity=R
 [/card]
 [card]
 primitive=Forest
-id=588
+id=586
 rarity=L
 [/card]
 [card]
@@ -470,7 +472,7 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=586
+id=588
 rarity=L
 [/card]
 [card]
@@ -644,8 +646,13 @@ id=454
 rarity=C
 [/card]
 [card]
+primitive=Island Sanctuary
+id=552
+rarity=R
+[/card]
+[card]
 primitive=Island
-id=594
+id=592
 rarity=L
 [/card]
 [card]
@@ -655,15 +662,10 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=592
+id=594
 rarity=L
 [/card]
 [card]
-primitive=Island Sanctuary
-id=552
-rarity=R
-[/card]
-[card]
 primitive=Ivory Cup
 id=317
 rarity=U
@@ -845,7 +847,7 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=591
+id=589
 rarity=L
 [/card]
 [card]
@@ -855,7 +857,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=589
+id=591
 rarity=L
 [/card]
 [card]
@@ -975,7 +977,7 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=597
+id=595
 rarity=L
 [/card]
 [card]
@@ -985,7 +987,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=595
+id=597
 rarity=L
 [/card]
 [card]
@@ -1104,13 +1106,13 @@ id=564
 rarity=C
 [/card]
 [card]
-primitive=Savannah
+primitive=Savannah Lions
-id=579
+id=565
 rarity=R
 [/card]
 [card]
-primitive=Savannah Lions
+primitive=Savannah
-id=565
+id=579
 rarity=R
 [/card]
 [card]
@@ -1240,7 +1242,7 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=575
+id=573
 rarity=L
 [/card]
 [card]
@@ -1250,7 +1252,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=573
+id=575
 rarity=L
 [/card]
 [card]

projects/mtg/bin/Res/sets/LEG/_cards.dat

@@ -1,8 +1,15 @@
 [meta]
 author=Wagic Team
+name=Legends
 year=1994
+total=310
 [/meta]
 [card]
+primitive=AErathi Berserker
+id=1557
+rarity=U
+[/card]
+[card]
 primitive=Abomination
 id=1427
 rarity=U
@@ -28,11 +35,6 @@ id=1698
 rarity=U
 [/card]
 [card]
-primitive=AErathi Berserker
-id=1557
-rarity=U
-[/card]
-[card]
 primitive=Aisling Leprechaun
 id=1513
 rarity=C
@@ -283,6 +285,11 @@ id=1433
 rarity=C
 [/card]
 [card]
+primitive=D'Avenant Archer
+id=1605
+rarity=C
+[/card]
+[card]
 primitive=Dakkon Blackblade
 id=1651
 rarity=R
@@ -293,11 +300,6 @@ id=1434
 rarity=C
 [/card]
 [card]
-primitive=D'Avenant Archer
-id=1605
-rarity=C
-[/card]
-[card]
 primitive=Deadfall
 id=1521
 rarity=U
@@ -598,13 +600,13 @@ id=1443
 rarity=C
 [/card]
 [card]
-primitive=Hellfire
+primitive=Hell's Caretaker
-id=1445
+id=1444
 rarity=R
 [/card]
 [card]
-primitive=Hell's Caretaker
+primitive=Hellfire
-id=1444
+id=1445
 rarity=R
 [/card]
 [card]
@@ -1413,16 +1415,16 @@ id=1550
 rarity=U
 [/card]
 [card]
-primitive=Urborg
-id=1707
-rarity=U
-[/card]
-[card]
 primitive=Ur-Drago
 id=1695
 rarity=R
 [/card]
 [card]
+primitive=Urborg
+id=1707
+rarity=U
+[/card]
+[card]
 primitive=Vaevictis Asmadi
 id=1696
 rarity=R

projects/mtg/bin/Res/sets/LGN/_cards.dat

@@ -1,19 +1,21 @@
 [meta]
 author=Wagic Team
+name=Legions
+block=Onslaught
 year=2003
-block=Slaughter
+total=145
 [/meta]
 [card]
-primitive=Akroma, Angel of Wrath
-id=42049
-rarity=R
-[/card]
-[card]
 primitive=Akroma's Devoted
 id=44747
 rarity=U
 [/card]
 [card]
+primitive=Akroma, Angel of Wrath
+id=42049
+rarity=R
+[/card]
+[card]
 primitive=Aphetto Exterminator
 id=42060
 rarity=U

projects/mtg/bin/Res/sets/LRW/_cards.dat

@@ -1,19 +1,21 @@
 [meta]
 author=Wagic Team
+name=Lorwyn
+block=Lorwyn
 year=2007
-block=Morning
+total=301
 [/meta]
 [card]
-primitive=Adder-Staff Boggart
-id=145992
-rarity=C
-[/card]
-[card]
 primitive=AEthersnipe
 id=145817
 rarity=C
 [/card]
 [card]
+primitive=Adder-Staff Boggart
+id=145992
+rarity=C
+[/card]
+[card]
 primitive=Ajani Goldmane
 id=140233
 rarity=R
@@ -109,6 +111,11 @@ id=145966
 rarity=C
 [/card]
 [card]
+primitive=Bog-Strider Ash
+id=139410
+rarity=C
+[/card]
+[card]
 primitive=Boggart Birth Rite
 id=142359
 rarity=C
@@ -144,11 +151,6 @@ id=146446
 rarity=C
 [/card]
 [card]
-primitive=Bog-Strider Ash
-id=139410
-rarity=C
-[/card]
-[card]
 primitive=Briarhorn
 id=142365
 rarity=U
@@ -470,6 +472,11 @@ rarity=R
 [/card]
 [card]
 primitive=Forest
+id=143617
+rarity=L
+[/card]
+[card]
+primitive=Forest
 id=143618
 rarity=L
 [/card]
@@ -480,11 +487,6 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=143617
-rarity=L
-[/card]
-[card]
-primitive=Forest
 id=143633
 rarity=L
 [/card]
@@ -705,7 +707,7 @@ rarity=U
 [/card]
 [card]
 primitive=Island
-id=143628
+id=143619
 rarity=L
 [/card]
 [card]
@@ -715,12 +717,12 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=143632
+id=143628
 rarity=L
 [/card]
 [card]
 primitive=Island
-id=143619
+id=143632
 rarity=L
 [/card]
 [card]
@@ -905,6 +907,11 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
+id=143626
+rarity=L
+[/card]
+[card]
+primitive=Mountain
 id=143627
 rarity=L
 [/card]
@@ -914,11 +921,6 @@ id=143631
 rarity=L
 [/card]
 [card]
-primitive=Mountain
-id=143626
-rarity=L
-[/card]
-[card]
 primitive=Mournwhelk
 id=145800
 rarity=C
@@ -1020,12 +1022,12 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=143621
+id=143620
 rarity=L
 [/card]
 [card]
 primitive=Plains
-id=143630
+id=143621
 rarity=L
 [/card]
 [card]
@@ -1035,7 +1037,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=143620
+id=143630
 rarity=L
 [/card]
 [card]
@@ -1275,7 +1277,7 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=143636
+id=143629
 rarity=L
 [/card]
 [card]
@@ -1285,12 +1287,12 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=143629
+id=143635
 rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=143635
+id=143636
 rarity=L
 [/card]
 [card]

projects/mtg/bin/Res/sets/M10/_cards.dat

@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-name=Wagic 2010
+name=Magic 2010
 year=2009
+total=249
 [/meta]
 [card]
 primitive=Acidic Slime
@@ -730,6 +731,11 @@ rarity=U
 [/card]
 [card]
 primitive=Mountain
+id=191401
+rarity=L
+[/card]
+[card]
+primitive=Mountain
 id=191402
 rarity=L
 [/card]
@@ -744,11 +750,6 @@ id=191404
 rarity=L
 [/card]
 [card]
-primitive=Mountain
-id=191401
-rarity=L
-[/card]
-[card]
 primitive=Naturalize
 id=189896
 rarity=C
@@ -815,11 +816,6 @@ rarity=R
 [/card]
 [card]
 primitive=Plains
-id=191395
-rarity=L
-[/card]
-[card]
-primitive=Plains
 id=191382
 rarity=L
 [/card]
@@ -830,6 +826,11 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
+id=191395
+rarity=L
+[/card]
+[card]
+primitive=Plains
 id=191396
 rarity=L
 [/card]
@@ -1060,7 +1061,7 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=191399
+id=191381
 rarity=L
 [/card]
 [card]
@@ -1070,12 +1071,12 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=191381
+id=191398
 rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=191398
+id=191399
 rarity=L
 [/card]
 [card]

projects/mtg/bin/Res/sets/M11/_cards.dat

@@ -1,9 +1,15 @@
 [meta]
 author=Wagic Team
-name=Wagic 2011
+name=Magic 2011
 year=2010
+total=249
 [/meta]
 [card]
+primitive=AEther Adept
+id=205020
+rarity=C
+[/card]
+[card]
 primitive=Acidic Slime
 id=207333
 rarity=U
@@ -14,11 +20,6 @@ id=205072
 rarity=C
 [/card]
 [card]
-primitive=AEther Adept
-id=205020
-rarity=C
-[/card]
-[card]
 primitive=Air Servant
 id=205070
 rarity=U
@@ -49,16 +50,16 @@ id=204980
 rarity=R
 [/card]
 [card]
-primitive=Angelic Arbiter
-id=204975
-rarity=R
-[/card]
-[card]
 primitive=Angel's Feather
 id=206325
 rarity=U
 [/card]
 [card]
+primitive=Angelic Arbiter
+id=204975
+rarity=R
+[/card]
+[card]
 primitive=Arc Runner
 id=204991
 rarity=C
@@ -425,7 +426,12 @@ rarity=C
 [/card]
 [card]
 primitive=Forest
-id=213631
+id=213628
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=213629
 rarity=L
 [/card]
 [card]
@@ -435,12 +441,7 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=213628
+id=213631
-rarity=L
-[/card]
-[card]
-primitive=Forest
-id=213629
 rarity=L
 [/card]
 [card]
@@ -595,12 +596,12 @@ rarity=C
 [/card]
 [card]
 primitive=Island
-id=213617
+id=213616
 rarity=L
 [/card]
 [card]
 primitive=Island
-id=213619
+id=213617
 rarity=L
 [/card]
 [card]
@@ -610,7 +611,7 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=213616
+id=213619
 rarity=L
 [/card]
 [card]
@@ -669,13 +670,13 @@ id=204993
 rarity=R
 [/card]
 [card]
-primitive=Leyline of the Void
+primitive=Leyline of Vitality
-id=205013
+id=205031
 rarity=R
 [/card]
 [card]
-primitive=Leyline of Vitality
+primitive=Leyline of the Void
-id=205031
+id=205013
 rarity=R
 [/card]
 [card]
@@ -760,25 +761,25 @@ rarity=R
 [/card]
 [card]
 primitive=Mountain
-id=213625
-rarity=L
-[/card]
-[card]
-primitive=Mountain
-id=213627
-rarity=L
-[/card]
-[card]
-primitive=Mountain
 id=213624
 rarity=L
 [/card]
 [card]
 primitive=Mountain
+id=213625
+rarity=L
+[/card]
+[card]
+primitive=Mountain
 id=213626
 rarity=L
 [/card]
 [card]
+primitive=Mountain
+id=213627
+rarity=L
+[/card]
+[card]
 primitive=Mystifying Maze
 id=204978
 rarity=R
@@ -825,12 +826,12 @@ rarity=R
 [/card]
 [card]
 primitive=Ooze T1
-id=66666666
+id=-2050321
 rarity=T
 [/card]
 [card]
 primitive=Ooze T2
-id=77777777
+id=-2050322
 rarity=T
 [/card]
 [card]
@@ -870,7 +871,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=213615
+id=213613
 rarity=L
 [/card]
 [card]
@@ -880,7 +881,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=213613
+id=213615
 rarity=L
 [/card]
 [card]
@@ -1105,7 +1106,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=213623
+id=213621
 rarity=L
 [/card]
 [card]
@@ -1115,7 +1116,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=213621
+id=213623
 rarity=L
 [/card]
 [card]

projects/mtg/bin/Res/sets/M12/_cards.dat

@@ -1,9 +1,15 @@
 [meta]
 author=Wagic Team
-name=Wagic 2012
+name=Magic 2012
 year=2011
+total=249
 [/meta]
 [card]
+primitive=AEther Adept
+id=227222
+rarity=C
+[/card]
+[card]
 primitive=Acidic Slime
 id=226906
 rarity=U
@@ -24,11 +30,6 @@ id=220086
 rarity=R
 [/card]
 [card]
-primitive=AEther Adept
-id=227222
-rarity=C
-[/card]
-[card]
 primitive=Alabaster Mage
 id=220264
 rarity=U
@@ -44,11 +45,6 @@ id=220218
 rarity=C
 [/card]
 [card]
-primitive=Angelic Destiny
-id=220230
-rarity=M
-[/card]
-[card]
 primitive=Angel's Feather
 id=221520
 rarity=U
@@ -59,6 +55,11 @@ id=238569
 rarity=C
 [/card]
 [card]
+primitive=Angelic Destiny
+id=220230
+rarity=M
+[/card]
+[card]
 primitive=Arachnus Spinner
 id=220242
 rarity=R
@@ -194,11 +195,6 @@ id=234070
 rarity=R
 [/card]
 [card]
-primitive=Chandra, the Firebrand
-id=220146
-rarity=M
-[/card]
-[card]
 primitive=Chandra's Outrage
 id=226585
 rarity=C
@@ -209,6 +205,11 @@ id=220298
 rarity=R
 [/card]
 [card]
+primitive=Chandra, the Firebrand
+id=220146
+rarity=M
+[/card]
+[card]
 primitive=Chasm Drake
 id=220225
 rarity=C
@@ -454,16 +455,6 @@ id=220103
 rarity=M
 [/card]
 [card]
-primitive=Garruk, Primal Hunter
-id=220100
-rarity=M
-[/card]
-[card]
-primitive=Wurm Token
-id=-22010012
-rarity=T
-[/card]
-[card]
 primitive=Garruk's Companion
 id=226896
 rarity=C
@@ -474,6 +465,21 @@ id=220077
 rarity=R
 [/card]
 [card]
+primitive=Garruk, Primal Hunter
+id=220100
+rarity=M
+[/card]
+[card]
+primitive=Beast Token
+id=-220100
+rarity=T
+[/card]
+[card]
+primitive=Wurm Token
+id=-22010012
+rarity=T
+[/card]
+[card]
 primitive=Giant Spider
 id=233232
 rarity=C
@@ -635,6 +641,11 @@ rarity=L
 [/card]
 [card]
 primitive=Island
+id=244324
+rarity=L
+[/card]
+[card]
+primitive=Island
 id=244325
 rarity=L
 [/card]
@@ -644,16 +655,6 @@ id=244326
 rarity=L
 [/card]
 [card]
-primitive=Island
-id=244324
-rarity=L
-[/card]
-[card]
-primitive=Jace, Memory Adept
-id=238263
-rarity=M
-[/card]
-[card]
 primitive=Jace's Archivist
 id=220244
 rarity=R
@@ -664,6 +665,11 @@ id=227227
 rarity=C
 [/card]
 [card]
+primitive=Jace, Memory Adept
+id=238263
+rarity=M
+[/card]
+[card]
 primitive=Jade Mage
 id=220279
 rarity=U
@@ -785,7 +791,7 @@ rarity=R
 [/card]
 [card]
 primitive=Mountain
-id=244330
+id=244327
 rarity=L
 [/card]
 [card]
@@ -800,7 +806,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=244327
+id=244330
 rarity=L
 [/card]
 [card]
@@ -870,6 +876,11 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
+id=244332
+rarity=L
+[/card]
+[card]
+primitive=Plains
 id=244333
 rarity=L
 [/card]
@@ -879,11 +890,6 @@ id=244334
 rarity=L
 [/card]
 [card]
-primitive=Plains
-id=244332
-rarity=L
-[/card]
-[card]
 primitive=Plummet
 id=233235
 rarity=C
@@ -959,16 +965,16 @@ id=236464
 rarity=R
 [/card]
 [card]
-primitive=Runeclaw Bear
-id=221893
-rarity=C
-[/card]
-[card]
 primitive=Rune-Scarred Demon
 id=220130
 rarity=R
 [/card]
 [card]
+primitive=Runeclaw Bear
+id=221893
+rarity=C
+[/card]
+[card]
 primitive=Rusted Sentinel
 id=220241
 rarity=U
@@ -1110,22 +1116,22 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=244337
-rarity=L
-[/card]
-[card]
-primitive=Swamp
 id=244335
 rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=244338
+id=244336
 rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=244336
+id=244337
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=244338
 rarity=L
 [/card]
 [card]
@@ -1252,4 +1258,4 @@ rarity=C
 primitive=Zombie Infestation
 id=241860
 rarity=U
-[/card]
+[/card]

projects/mtg/bin/Res/sets/M13/_cards.dat

@@ -1,8 +1,9 @@
 [meta]
 author=Wagic Team
-name=Wagic 2013
+name=Magic 2013
 block=Core
 year=2012
+total=249
 [/meta]
 [card]
 primitive=Acidic Slime
@@ -10,31 +11,31 @@ id=265718
 rarity=U
 [/card]
 [card]
-primitive=Ajani, Caller of the Pride
-id=249695
-rarity=M
-[/card]
-[card]
 primitive=Ajani's Sunstriker
 id=259715
 rarity=C
 [/card]
 [card]
+primitive=Ajani, Caller of the Pride
+id=249695
+rarity=M
+[/card]
+[card]
 primitive=Akroma's Memorial
 id=279712
 rarity=M
 [/card]
 [card]
-primitive=Angelic Benediction
-id=279702
-rarity=U
-[/card]
-[card]
 primitive=Angel's Mercy
 id=259714
 rarity=C
 [/card]
 [card]
+primitive=Angelic Benediction
+id=279702
+rarity=U
+[/card]
+[card]
 primitive=Arbor Elf
 id=249840
 rarity=C
@@ -140,16 +141,16 @@ id=279993
 rarity=C
 [/card]
 [card]
-primitive=Chandra, the Firebrand
-id=259205
-rarity=M
-[/card]
-[card]
 primitive=Chandra's Fury
 id=249682
 rarity=C
 [/card]
 [card]
+primitive=Chandra, the Firebrand
+id=259205
+rarity=M
+[/card]
+[card]
 primitive=Chronomaton
 id=259698
 rarity=U
@@ -370,14 +371,19 @@ id=249712
 rarity=U
 [/card]
 [card]
+primitive=Fog Bank
+id=270314
+rarity=U
+[/card]
+[card]
 primitive=Fog
 id=253673
 rarity=C
 [/card]
 [card]
-primitive=Fog Bank
+primitive=Forest
-id=270314
+id=249718
-rarity=U
+rarity=L
 [/card]
 [card]
 primitive=Forest
@@ -391,11 +397,6 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=249718
-rarity=L
-[/card]
-[card]
-primitive=Forest
 id=249721
 rarity=L
 [/card]
@@ -410,14 +411,19 @@ id=288936
 rarity=U
 [/card]
 [card]
+primitive=Garruk's Packleader
+id=253687
+rarity=U
+[/card]
+[card]
 primitive=Garruk, Primal Hunter
 id=253669
 rarity=M
 [/card]
 [card]
-primitive=Garruk's Packleader
+primitive=Beast Token
-id=253687
+id=-253669
-rarity=U
+rarity=T
 [/card]
 [card]
 primitive=Gem of Becoming
@@ -516,11 +522,6 @@ rarity=R
 [/card]
 [card]
 primitive=Island
-id=249725
-rarity=L
-[/card]
-[card]
-primitive=Island
 id=249723
 rarity=L
 [/card]
@@ -531,13 +532,13 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=249726
+id=249725
 rarity=L
 [/card]
 [card]
-primitive=Jace, Memory Adept
+primitive=Island
-id=254107
+id=249726
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Jace's Phantasm
@@ -545,6 +546,11 @@ id=249672
 rarity=U
 [/card]
 [card]
+primitive=Jace, Memory Adept
+id=254107
+rarity=M
+[/card]
+[card]
 primitive=Jayemdae Tome
 id=275705
 rarity=U
@@ -575,16 +581,16 @@ id=279699
 rarity=C
 [/card]
 [card]
-primitive=Krenko, Mob Boss
-id=253712
-rarity=R
-[/card]
-[card]
 primitive=Krenko's Command
 id=259213
 rarity=C
 [/card]
 [card]
+primitive=Krenko, Mob Boss
+id=253712
+rarity=R
+[/card]
+[card]
 primitive=Liliana of the Dark Realms
 id=259695
 rarity=M
@@ -641,7 +647,12 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=249730
+id=249727
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=249728
 rarity=L
 [/card]
 [card]
@@ -651,12 +662,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=249727
+id=249730
-rarity=L
-[/card]
-[card]
-primitive=Mountain
-id=249728
 rarity=L
 [/card]
 [card]
@@ -731,12 +737,12 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=249732
+id=249731
 rarity=L
 [/card]
 [card]
 primitive=Plains
-id=249734
+id=249732
 rarity=L
 [/card]
 [card]
@@ -746,7 +752,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=249731
+id=249734
 rarity=L
 [/card]
 [card]
@@ -1031,16 +1037,6 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=249740
-rarity=L
-[/card]
-[card]
-primitive=Swamp
-id=249739
-rarity=L
-[/card]
-[card]
-primitive=Swamp
 id=249737
 rarity=L
 [/card]
@@ -1050,21 +1046,31 @@ id=249738
 rarity=L
 [/card]
 [card]
+primitive=Swamp
+id=249739
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=249740
+rarity=L
+[/card]
+[card]
 primitive=Switcheroo
 id=253704
 rarity=U
 [/card]
 [card]
+primitive=Talrand's Invocation
+id=254117
+rarity=U
+[/card]
+[card]
 primitive=Talrand, Sky Summoner
 id=253701
 rarity=R
 [/card]
 [card]
-primitive=Talrand's Invocation
-id=254117
-rarity=U
-[/card]
-[card]
 primitive=Thragtusk
 id=249685
 rarity=R
@@ -1235,17 +1241,17 @@ id=253728
 rarity=R
 [/card]
 [card]
-primitive=Yeva, Nature's Herald
-id=249680
-rarity=R
-[/card]
-[card]
 primitive=Yeva's Forcemage
 id=265840
 rarity=C
 [/card]
 [card]
+primitive=Yeva, Nature's Herald
+id=249680
+rarity=R
+[/card]
+[card]
 primitive=Zombie Goliath
 id=276299
 rarity=C
-[/card]
+[/card]

projects/mtg/bin/Res/sets/M14/_cards.dat

@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-name=Magic 2014
+name=Magic 2014 Core Set
 year=2013
+total=249
 [/meta]
 [card]
 primitive=Academy Raider
@@ -34,16 +35,16 @@ id=370688
 rarity=U
 [/card]
 [card]
-primitive=Ajani, Caller of the Pride
-id=370680
-rarity=M
-[/card]
-[card]
 primitive=Ajani's Chosen
 id=370750
 rarity=R
 [/card]
 [card]
+primitive=Ajani, Caller of the Pride
+id=370680
+rarity=M
+[/card]
+[card]
 primitive=Altar's Reap
 id=370677
 rarity=C
@@ -184,11 +185,6 @@ id=370666
 rarity=C
 [/card]
 [card]
-primitive=Chandra, Pyromaster
-id=370637
-rarity=M
-[/card]
-[card]
 primitive=Chandra's Outrage
 id=370659
 rarity=C
@@ -199,6 +195,11 @@ id=370691
 rarity=R
 [/card]
 [card]
+primitive=Chandra, Pyromaster
+id=370637
+rarity=M
+[/card]
+[card]
 primitive=Charging Griffin
 id=370768
 rarity=C
@@ -449,16 +450,16 @@ id=370590
 rarity=R
 [/card]
 [card]
-primitive=Garruk, Caller of Beasts
-id=370687
-rarity=M
-[/card]
-[card]
 primitive=Garruk's Horde
 id=370684
 rarity=R
 [/card]
 [card]
+primitive=Garruk, Caller of Beasts
+id=370687
+rarity=M
+[/card]
+[card]
 primitive=Giant Growth
 id=370788
 rarity=C
@@ -574,16 +575,16 @@ id=370773
 rarity=L
 [/card]
 [card]
-primitive=Jace, Memory Adept
-id=370728
-rarity=M
-[/card]
-[card]
 primitive=Jace's Mindseeker
 id=370638
 rarity=R
 [/card]
 [card]
+primitive=Jace, Memory Adept
+id=370728
+rarity=M
+[/card]
+[card]
 primitive=Kalonian Hydra
 id=370766
 rarity=M
@@ -829,7 +830,7 @@ id=370656
 rarity=M
 [/card]
 [card]
-primitive=Pyromancer's Guantlet
+primitive=Pyromancer's Gauntlet
 id=370686
 rarity=R
 [/card]
@@ -959,16 +960,16 @@ id=370631
 rarity=U
 [/card]
 [card]
-primitive=Shivan Dragon
-id=370825
-rarity=R
-[/card]
-[card]
 primitive=Shiv's Embrace
 id=370707
 rarity=U
 [/card]
 [card]
+primitive=Shivan Dragon
+id=370825
+rarity=R
+[/card]
+[card]
 primitive=Shock
 id=370654
 rarity=C
@@ -1039,13 +1040,13 @@ id=370676
 rarity=U
 [/card]
 [card]
-primitive=Staff of the Wild Magus
+primitive=Staff of the Sun Magus
-id=370592
+id=370635
 rarity=U
 [/card]
 [card]
-primitive=Staff of the Sun Magus
+primitive=Staff of the Wild Magus
-id=370635
+id=370592
 rarity=U
 [/card]
 [card]

projects/mtg/bin/Res/sets/M15/_cards.dat

@@ -1,9 +1,15 @@
 [meta]
 author=Wagic Team
-name=Magic 2015
+name=Magic 2015 Core Set
 year=2014
+total=284
 [/meta]
 [card]
+primitive=AEtherspouts
+id=383178
+rarity=R
+[/card]
+[card]
 primitive=Accursed Spirit
 id=383175
 rarity=C
@@ -24,11 +30,6 @@ id=383177
 rarity=C
 [/card]
 [card]
-primitive=AEtherspouts
-id=383178
-rarity=R
-[/card]
-[card]
 primitive=Aggressive Mining
 id=383179
 rarity=R
@@ -301,7 +302,7 @@ rarity=C
 [card]
 primitive=Elvish Mystic
 id=383229
-rarity=U
+rarity=C
 [/card]
 [card]
 primitive=Encrust
@@ -414,16 +415,16 @@ id=383250
 rarity=U
 [/card]
 [card]
-primitive=Garruk, Apex Predator
-id=383251
-rarity=M
-[/card]
-[card]
 primitive=Garruk's Packleader
 id=383165
 rarity=U
 [/card]
 [card]
+primitive=Garruk, Apex Predator
+id=383251
+rarity=M
+[/card]
+[card]
 primitive=Gather Courage
 id=383252
 rarity=U
@@ -599,16 +600,16 @@ id=383284
 rarity=L
 [/card]
 [card]
-primitive=Jace, the Living Guildpact
-id=383285
-rarity=M
-[/card]
-[card]
 primitive=Jace's Ingenuity
 id=383286
 rarity=U
 [/card]
 [card]
+primitive=Jace, the Living Guildpact
+id=383285
+rarity=M
+[/card]
+[card]
 primitive=Jalira, Master Polymorphist
 id=383287
 rarity=R
@@ -834,16 +835,16 @@ id=383327
 rarity=C
 [/card]
 [card]
-primitive=Nissa, Worldwaker
-id=383328
-rarity=M
-[/card]
-[card]
 primitive=Nissa's Expedition
 id=383329
 rarity=U
 [/card]
 [card]
+primitive=Nissa, Worldwaker
+id=383328
+rarity=M
+[/card]
+[card]
 primitive=Ob Nixilis, Unshackled
 id=383330
 rarity=R
@@ -1134,16 +1135,16 @@ id=383383
 rarity=C
 [/card]
 [card]
-primitive=Sliver Hive
-id=383384
-rarity=R
-[/card]
-[card]
 primitive=Sliver Hivelord
 id=383385
 rarity=M
 [/card]
 [card]
+primitive=Sliver Hive
+id=383384
+rarity=R
+[/card]
+[card]
 primitive=Solemn Offering
 id=383386
 rarity=C

projects/mtg/bin/Res/sets/MBS/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
-name=MBS
+name=Mirrodin Besieged
+block=Scars of Mirrodin
 year=2011
+total=155
 [/meta]
 [card]
 primitive=Accorder Paladin
@@ -165,12 +167,12 @@ rarity=U
 [/card]
 [card]
 primitive=Forest
-id=214075
+id=214031
 rarity=L
 [/card]
 [card]
 primitive=Forest
-id=214031
+id=214075
 rarity=L
 [/card]
 [card]
@@ -189,16 +191,16 @@ id=214053
 rarity=R
 [/card]
 [card]
-primitive=Glissa, the Traitor
-id=214072
-rarity=M
-[/card]
-[card]
 primitive=Glissa's Courier
 id=213783
 rarity=C
 [/card]
 [card]
+primitive=Glissa, the Traitor
+id=214072
+rarity=M
+[/card]
+[card]
 primitive=Gnathosaur
 id=213763
 rarity=C
@@ -395,12 +397,12 @@ rarity=U
 [/card]
 [card]
 primitive=Mountain
-id=214066
+id=214045
 rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=214045
+id=214066
 rarity=L
 [/card]
 [card]
@@ -515,12 +517,12 @@ rarity=U
 [/card]
 [card]
 primitive=Plains
-id=220366
+id=214057
 rarity=L
 [/card]
 [card]
 primitive=Plains
-id=214057
+id=220366
 rarity=L
 [/card]
 [card]
@@ -665,12 +667,12 @@ rarity=U
 [/card]
 [card]
 primitive=Swamp
-id=220368
+id=220367
 rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=220367
+id=220368
 rarity=L
 [/card]
 [card]
@@ -777,4 +779,4 @@ rarity=C
 primitive=White Sun's Zenith
 id=221555
 rarity=R
-[/card]
+[/card]

projects/mtg/bin/Res/sets/ME2/_cards.dat

@@ -1,9 +1,16 @@
 [meta]
 author=Wagic Team
-block=Master
+name=Masters Edition II
+block=MTGO
 year=2008
+total=245
 [/meta]
 [card]
+primitive=AEther Storm
+id=184722
+rarity=U
+[/card]
+[card]
 primitive=Abbey Gargoyles
 id=184585
 rarity=U
@@ -19,16 +26,16 @@ id=184464
 rarity=C
 [/card]
 [card]
-primitive=AEther Storm
-id=184722
-rarity=U
-[/card]
-[card]
 primitive=Ambush Party
 id=184543
 rarity=C
 [/card]
 [card]
+primitive=An-Zerrin Ruins
+id=184586
+rarity=R
+[/card]
+[card]
 primitive=Anarchy
 id=184600
 rarity=R
@@ -44,9 +51,9 @@ id=184753
 rarity=U
 [/card]
 [card]
-primitive=An-Zerrin Ruins
+primitive=Armor Thrull
-id=184586
+id=184684
-rarity=R
+rarity=C
 [/card]
 [card]
 primitive=Armor of Faith
@@ -54,11 +61,6 @@ id=184726
 rarity=C
 [/card]
 [card]
-primitive=Armor Thrull
-id=184684
-rarity=C
-[/card]
-[card]
 primitive=Armored Griffin
 id=184728
 rarity=C
@@ -664,13 +666,13 @@ id=184732
 rarity=R
 [/card]
 [card]
-primitive=Marjhan
+primitive=Mana Crypt
-id=184593
+id=184773
 rarity=R
 [/card]
 [card]
-primitive=Mana Crypt
+primitive=Marjhan
-id=184773
+id=184593
 rarity=R
 [/card]
 [card]
@@ -1094,13 +1096,13 @@ id=184770
 rarity=R
 [/card]
 [card]
-primitive=Thallid
+primitive=Thallid Devourer
-id=184711
+id=184527
 rarity=C
 [/card]
 [card]
-primitive=Thallid Devourer
+primitive=Thallid
-id=184527
+id=184711
 rarity=C
 [/card]
 [card]

projects/mtg/bin/Res/sets/ME3/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
-block=Master
+name=Masters Edition III
+block=MTGO
 year=2009
+total=230
 [/meta]
 [card]
 primitive=Active Volcano
@@ -219,16 +221,16 @@ id=201131
 rarity=U
 [/card]
 [card]
-primitive=Dance of Many
-id=201253
-rarity=U
-[/card]
-[card]
 primitive=D'Avenant Archer
 id=201134
 rarity=C
 [/card]
 [card]
+primitive=Dance of Many
+id=201253
+rarity=U
+[/card]
+[card]
 primitive=Demonic Torment
 id=201166
 rarity=C
@@ -414,16 +416,16 @@ id=201409
 rarity=R
 [/card]
 [card]
-primitive=Guan Yu, Sainted Warrior
-id=201280
-rarity=U
-[/card]
-[card]
 primitive=Guan Yu's 1,000-Li March
 id=201284
 rarity=R
 [/card]
 [card]
+primitive=Guan Yu, Sainted Warrior
+id=201280
+rarity=U
+[/card]
+[card]
 primitive=Gwendlyn Di Corci
 id=201191
 rarity=R
@@ -495,7 +497,7 @@ rarity=C
 [/card]
 [card]
 primitive=Island
-id=206074
+id=206072
 rarity=L
 [/card]
 [card]
@@ -505,7 +507,7 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=206072
+id=206074
 rarity=L
 [/card]
 [card]
@@ -674,16 +676,16 @@ id=201222
 rarity=U
 [/card]
 [card]
-primitive=Meng Huo, Barbarian King
-id=201287
-rarity=R
-[/card]
-[card]
 primitive=Meng Huo's Horde
 id=201219
 rarity=C
 [/card]
 [card]
+primitive=Meng Huo, Barbarian King
+id=201287
+rarity=R
+[/card]
+[card]
 primitive=Mind Twist
 id=201311
 rarity=R
@@ -695,7 +697,7 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=206077
+id=206075
 rarity=L
 [/card]
 [card]
@@ -705,7 +707,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=206075
+id=206077
 rarity=L
 [/card]
 [card]
@@ -750,11 +752,6 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=206080
-rarity=L
-[/card]
-[card]
-primitive=Plains
 id=206078
 rarity=L
 [/card]
@@ -764,6 +761,11 @@ id=206079
 rarity=L
 [/card]
 [card]
+primitive=Plains
+id=206080
+rarity=L
+[/card]
+[card]
 primitive=Plateau
 id=201402
 rarity=R
@@ -960,11 +962,6 @@ rarity=U
 [/card]
 [card]
 primitive=Swamp
-id=206083
-rarity=L
-[/card]
-[card]
-primitive=Swamp
 id=206081
 rarity=L
 [/card]
@@ -974,6 +971,11 @@ id=206082
 rarity=L
 [/card]
 [card]
+primitive=Swamp
+id=206083
+rarity=L
+[/card]
+[card]
 primitive=Sword of the Ages
 id=201233
 rarity=R

projects/mtg/bin/Res/sets/ME4/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
-name=ME4
+name=Masters Edition IV
+block=MTGO
 year=2010
+total=269
 [/meta]
 [card]
 primitive=Acid Rain
@@ -84,13 +86,13 @@ id=202428
 rarity=U
 [/card]
 [card]
-primitive=Armageddon
+primitive=Armageddon Clock
-id=228262
+id=202414
 rarity=R
 [/card]
 [card]
-primitive=Armageddon Clock
+primitive=Armageddon
-id=202414
+id=228262
 rarity=R
 [/card]
 [card]
@@ -914,16 +916,16 @@ id=220964
 rarity=C
 [/card]
 [card]
-primitive=Savannah
-id=202571
-rarity=R
-[/card]
-[card]
 primitive=Savannah Lions
 id=221577
 rarity=U
 [/card]
 [card]
+primitive=Savannah
+id=202571
+rarity=R
+[/card]
+[card]
 primitive=Scarecrow
 id=202615
 rarity=U

projects/mtg/bin/Res/sets/MED/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
-block=Master
+name=Masters Edition
+block=MTGO
 year=2007
+total=195
 [/meta]
 [card]
 primitive=Adun Oakenshield
@@ -449,6 +451,11 @@ id=159749
 rarity=R
 [/card]
 [card]
+primitive=Island of Wak-Wak
+id=159763
+rarity=R
+[/card]
+[card]
 primitive=Island
 id=159281
 rarity=L
@@ -464,11 +471,6 @@ id=159283
 rarity=L
 [/card]
 [card]
-primitive=Island of Wak-Wak
-id=159763
-rarity=R
-[/card]
-[card]
 primitive=Ivory Tower
 id=159111
 rarity=R
@@ -529,13 +531,13 @@ id=159096
 rarity=R
 [/card]
 [card]
-primitive=Mana Flare
+primitive=Marton Stromgald
-id=159264
+id=159237
 rarity=R
 [/card]
 [card]
-primitive=Marton Stromgald
+primitive=Mana Flare
-id=159237
+id=159264
 rarity=R
 [/card]
 [card]
@@ -564,6 +566,11 @@ id=159308
 rarity=R
 [/card]
 [card]
+primitive=Mountain Yeti
+id=159773
+rarity=C
+[/card]
+[card]
 primitive=Mountain
 id=159284
 rarity=L
@@ -579,11 +586,6 @@ id=159286
 rarity=L
 [/card]
 [card]
-primitive=Mountain Yeti
-id=159773
-rarity=C
-[/card]
-[card]
 primitive=Mystic Remora
 id=159831
 rarity=U
@@ -774,16 +776,16 @@ id=159246
 rarity=C
 [/card]
 [card]
-primitive=Shield of the Ages
-id=159839
-rarity=U
-[/card]
-[card]
 primitive=Shield Sphere
 id=159103
 rarity=C
 [/card]
 [card]
+primitive=Shield of the Ages
+id=159839
+rarity=U
+[/card]
+[card]
 primitive=Singing Tree
 id=159765
 rarity=U

projects/mtg/bin/Res/sets/MIR/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
-year=1996
+name=Mirage
 block=Mirage
+year=1996
+total=350
 [/meta]
 [card]
 primitive=Abyssal Hunter
@@ -585,12 +587,7 @@ rarity=R
 [/card]
 [card]
 primitive=Forest
-id=3569
+id=3566
-rarity=L
-[/card]
-[card]
-primitive=Forest
-id=3568
 rarity=L
 [/card]
 [card]
@@ -600,7 +597,12 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=3566
+id=3568
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=3569
 rarity=L
 [/card]
 [card]
@@ -760,12 +762,7 @@ rarity=U
 [/card]
 [card]
 primitive=Island
-id=3584
+id=3581
-rarity=L
-[/card]
-[card]
-primitive=Island
-id=3583
 rarity=L
 [/card]
 [card]
@@ -775,7 +772,12 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=3581
+id=3583
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=3584
 rarity=L
 [/card]
 [card]
@@ -969,13 +971,13 @@ id=3260
 rarity=U
 [/card]
 [card]
-primitive=Mountain
+primitive=Mountain Valley
-id=3580
+id=3574
-rarity=L
+rarity=U
 [/card]
 [card]
 primitive=Mountain
-id=3579
+id=3577
 rarity=L
 [/card]
 [card]
@@ -985,13 +987,13 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=3577
+id=3579
 rarity=L
 [/card]
 [card]
-primitive=Mountain Valley
+primitive=Mountain
-id=3574
+id=3580
-rarity=U
+rarity=L
 [/card]
 [card]
 primitive=Mtenda Griffin
@@ -1085,12 +1087,7 @@ rarity=U
 [/card]
 [card]
 primitive=Plains
-id=3588
+id=3585
-rarity=L
-[/card]
-[card]
-primitive=Plains
-id=3587
 rarity=L
 [/card]
 [card]
@@ -1100,7 +1097,12 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=3585
+id=3587
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=3588
 rarity=L
 [/card]
 [card]
@@ -1354,16 +1356,16 @@ id=3362
 rarity=C
 [/card]
 [card]
-primitive=Shauku, Endbringer
-id=3311
-rarity=R
-[/card]
-[card]
 primitive=Shauku's Minion
 id=3554
 rarity=U
 [/card]
 [card]
+primitive=Shauku, Endbringer
+id=3311
+rarity=R
+[/card]
+[card]
 primitive=Shimmer
 id=3363
 rarity=R
@@ -1465,12 +1467,7 @@ rarity=U
 [/card]
 [card]
 primitive=Swamp
-id=3565
+id=3562
-rarity=L
-[/card]
-[card]
-primitive=Swamp
-id=3564
 rarity=L
 [/card]
 [card]
@@ -1480,7 +1477,12 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=3562
+id=3564
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=3565
 rarity=L
 [/card]
 [card]
@@ -1524,11 +1526,6 @@ id=3576
 rarity=R
 [/card]
 [card]
-primitive=Telim'Tor
-id=3468
-rarity=R
-[/card]
-[card]
 primitive=Telim'Tor's Darts
 id=3269
 rarity=U
@@ -1539,6 +1536,11 @@ id=3469
 rarity=R
 [/card]
 [card]
+primitive=Telim'Tor
+id=3468
+rarity=R
+[/card]
+[card]
 primitive=Teremko Griffin
 id=3518
 rarity=C

projects/mtg/bin/Res/sets/MOR/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Morningtide
+block=Lorwyn
 year=2008
-block=Morning
+total=150
 [/meta]
 [card]
 primitive=Ambassador Oak
@@ -714,16 +716,16 @@ id=152672
 rarity=U
 [/card]
 [card]
-primitive=Warren Weirding
-id=152732
-rarity=U
-[/card]
-[card]
 primitive=War-Spike Changeling
 id=143199
 rarity=C
 [/card]
 [card]
+primitive=Warren Weirding
+id=152732
+rarity=U
+[/card]
+[card]
 primitive=Waterspout Weavers
 id=152656
 rarity=U

projects/mtg/bin/Res/sets/MRD/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Mirrodin
+block=Mirrodin
 year=2003
-block=Mirror
+total=306
 [/meta]
 [card]
 primitive=AEther Spellbomb
@@ -564,6 +566,11 @@ id=49437
 rarity=C
 [/card]
 [card]
+primitive=Krark's Thumb
+id=48923
+rarity=R
+[/card]
+[card]
 primitive=Krark-Clan Grunt
 id=45992
 rarity=C
@@ -574,11 +581,6 @@ id=45994
 rarity=C
 [/card]
 [card]
-primitive=Krark's Thumb
-id=48923
-rarity=R
-[/card]
-[card]
 primitive=Leaden Myr
 id=46040
 rarity=C

projects/mtg/bin/Res/sets/MRQ/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Mercadian Masques
+block=Masque
 year=1999
-block=Masks
+total=350
 [/meta]
 [card]
 primitive=Aerial Caravan
@@ -259,16 +261,16 @@ id=19779
 rarity=U
 [/card]
 [card]
-primitive=Cho-Manno, Revolutionary
-id=20411
-rarity=R
-[/card]
-[card]
 primitive=Cho-Manno's Blessing
 id=19551
 rarity=C
 [/card]
 [card]
+primitive=Cho-Manno, Revolutionary
+id=20411
+rarity=R
+[/card]
+[card]
 primitive=Cinder Elemental
 id=19608
 rarity=U
@@ -579,16 +581,16 @@ id=19740
 rarity=R
 [/card]
 [card]
-primitive=Fountain of Cho
-id=19893
-rarity=U
-[/card]
-[card]
 primitive=Fountain Watch
 id=19784
 rarity=R
 [/card]
 [card]
+primitive=Fountain of Cho
+id=19893
+rarity=U
+[/card]
+[card]
 primitive=Fresh Volunteers
 id=19542
 rarity=C
@@ -919,6 +921,11 @@ id=19733
 rarity=R
 [/card]
 [card]
+primitive=Mercadia's Downfall
+id=19850
+rarity=U
+[/card]
+[card]
 primitive=Mercadian Atlas
 id=20844
 rarity=R
@@ -934,11 +941,6 @@ id=19754
 rarity=R
 [/card]
 [card]
-primitive=Mercadia's Downfall
-id=19850
-rarity=U
-[/card]
-[card]
 primitive=Midnight Ritual
 id=19707
 rarity=R
@@ -1459,16 +1461,16 @@ id=19871
 rarity=R
 [/card]
 [card]
-primitive=Squall
-id=19636
-rarity=C
-[/card]
-[card]
 primitive=Squallmonger
 id=19856
 rarity=U
 [/card]
 [card]
+primitive=Squall
+id=19636
+rarity=C
+[/card]
+[card]
 primitive=Squee, Goblin Nabob
 id=19716
 rarity=R

projects/mtg/bin/Res/sets/NMS/_cards.dat

@@ -1,19 +1,21 @@
 [meta]
 author=Wagic Team
+name=Nemesis
+block=Masque
 year=2000
-block=Masks
+total=143
 [/meta]
 [card]
-primitive=Accumulated Knowledge
-id=21285
-rarity=C
-[/card]
-[card]
 primitive=AEther Barrier
 id=22289
 rarity=R
 [/card]
 [card]
+primitive=Accumulated Knowledge
+id=21285
+rarity=C
+[/card]
+[card]
 primitive=Air Bladder
 id=22377
 rarity=C
@@ -439,6 +441,11 @@ id=21396
 rarity=U
 [/card]
 [card]
+primitive=Rath's Edge
+id=21402
+rarity=R
+[/card]
+[card]
 primitive=Rathi Assassin
 id=22890
 rarity=R
@@ -454,11 +461,6 @@ id=21307
 rarity=C
 [/card]
 [card]
-primitive=Rath's Edge
-id=21402
-rarity=R
-[/card]
-[card]
 primitive=Refreshing Rain
 id=21378
 rarity=U

projects/mtg/bin/Res/sets/NPH/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
-name=NPH
+name=New Phyrexia
+block=Scars of Mirrodin
 year=2011
+total=175
 [/meta]
 [card]
 primitive=Act of Aggression
@@ -235,12 +237,12 @@ rarity=C
 [/card]
 [card]
 primitive=Forest
-id=230081
+id=230071
 rarity=L
 [/card]
 [card]
 primitive=Forest
-id=230071
+id=230081
 rarity=L
 [/card]
 [card]
@@ -345,12 +347,12 @@ rarity=R
 [/card]
 [card]
 primitive=Island
-id=227530
+id=227505
 rarity=L
 [/card]
 [card]
 primitive=Island
-id=227505
+id=227530
 rarity=L
 [/card]
 [card]
@@ -519,6 +521,11 @@ id=233085
 rarity=C
 [/card]
 [card]
+primitive=Phyrexia's Core
+id=218015
+rarity=U
+[/card]
+[card]
 primitive=Phyrexian Hulk
 id=214379
 rarity=C
@@ -549,23 +556,18 @@ id=218058
 rarity=R
 [/card]
 [card]
-primitive=Phyrexia's Core
-id=218015
-rarity=U
-[/card]
-[card]
 primitive=Pith Driller
 id=230079
 rarity=C
 [/card]
 [card]
 primitive=Plains
-id=227552
+id=227518
 rarity=L
 [/card]
 [card]
 primitive=Plains
-id=227518
+id=227552
 rarity=L
 [/card]
 [card]
@@ -877,4 +879,4 @@ rarity=U
 primitive=Xenograft
 id=227544
 rarity=R
-[/card]
+[/card]

projects/mtg/bin/Res/sets/ODY/_cards.dat

@@ -1,24 +1,31 @@
 [meta]
 author=Wagic Team
-year=2001
+name=Odyssey
 block=Odyssey
+year=2001
+total=350
 [/meta]
 [card]
+primitive=AEther Burst
+id=29725
+rarity=C
+[/card]
+[card]
 primitive=Abandoned Outpost
 id=31761
 rarity=C
 [/card]
 [card]
-primitive=Aboshan, Cephalid Emperor
-id=31821
-rarity=R
-[/card]
-[card]
 primitive=Aboshan's Desire
 id=29728
 rarity=C
 [/card]
 [card]
+primitive=Aboshan, Cephalid Emperor
+id=31821
+rarity=R
+[/card]
+[card]
 primitive=Acceptable Losses
 id=30692
 rarity=C
@@ -29,11 +36,6 @@ id=29922
 rarity=R
 [/card]
 [card]
-primitive=AEther Burst
-id=29725
-rarity=C
-[/card]
-[card]
 primitive=Afflict
 id=29740
 rarity=C
@@ -154,16 +156,16 @@ id=30569
 rarity=U
 [/card]
 [card]
-primitive=Battle of Wits
-id=29942
-rarity=R
-[/card]
-[card]
 primitive=Battle Strain
 id=29861
 rarity=U
 [/card]
 [card]
+primitive=Battle of Wits
+id=29942
+rarity=R
+[/card]
+[card]
 primitive=Bearscape
 id=30747
 rarity=R
@@ -769,16 +771,16 @@ id=29997
 rarity=R
 [/card]
 [card]
-primitive=Kamahl, Pit Fighter
-id=29963
-rarity=R
-[/card]
-[card]
 primitive=Kamahl's Desire
 id=29761
 rarity=C
 [/card]
 [card]
+primitive=Kamahl, Pit Fighter
+id=29963
+rarity=R
+[/card]
+[card]
 primitive=Karmic Justice
 id=31872
 rarity=R
@@ -1354,16 +1356,16 @@ id=30573
 rarity=R
 [/card]
 [card]
-primitive=Seton, Krosan Protector
-id=29985
-rarity=R
-[/card]
-[card]
 primitive=Seton's Desire
 id=29791
 rarity=C
 [/card]
 [card]
+primitive=Seton, Krosan Protector
+id=29985
+rarity=R
+[/card]
+[card]
 primitive=Shadowblood Egg
 id=30553
 rarity=U

projects/mtg/bin/Res/sets/OGW/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
 name=Oath of the Gatewatch
+block=Battle for Zendikar
 year=2016
+total=186
 [/meta]
 [card]
 primitive=Abstruse Interference

projects/mtg/bin/Res/sets/ONS/_cards.dat

@@ -1,19 +1,21 @@
 [meta]
 author=Wagic Team
+name=Onslaught
+block=Onslaught
 year=2002
-block=Slaughter
+total=350
 [/meta]
 [card]
-primitive=Accursed Centaur
-id=26715
-rarity=C
-[/card]
-[card]
 primitive=AEther Charge
 id=12425
 rarity=U
 [/card]
 [card]
+primitive=Accursed Centaur
+id=26715
+rarity=C
+[/card]
+[card]
 primitive=Aggravated Assault
 id=40195
 rarity=R
@@ -625,12 +627,7 @@ rarity=C
 [/card]
 [card]
 primitive=Forest
-id=40116
+id=40105
-rarity=L
-[/card]
-[card]
-primitive=Forest
-id=40115
 rarity=L
 [/card]
 [card]
@@ -640,7 +637,12 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=40105
+id=40115
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=40116
 rarity=L
 [/card]
 [card]
@@ -865,12 +867,7 @@ rarity=U
 [/card]
 [card]
 primitive=Island
-id=40120
+id=40117
-rarity=L
-[/card]
-[card]
-primitive=Island
-id=40119
 rarity=L
 [/card]
 [card]
@@ -880,13 +877,13 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=40117
+id=40119
 rarity=L
 [/card]
 [card]
-primitive=Ixidor, Reality Sculptor
+primitive=Island
-id=40578
+id=40120
-rarity=R
+rarity=L
 [/card]
 [card]
 primitive=Ixidor's Will
@@ -894,6 +891,11 @@ id=39843
 rarity=C
 [/card]
 [card]
+primitive=Ixidor, Reality Sculptor
+id=40578
+rarity=R
+[/card]
+[card]
 primitive=Jareth, Leonine Titan
 id=39861
 rarity=R
@@ -904,16 +906,16 @@ id=39559
 rarity=R
 [/card]
 [card]
-primitive=Kamahl, Fist of Krosa
-id=40538
-rarity=R
-[/card]
-[card]
 primitive=Kamahl's Summons
 id=34228
 rarity=U
 [/card]
 [card]
+primitive=Kamahl, Fist of Krosa
+id=40538
+rarity=R
+[/card]
+[card]
 primitive=Krosan Colossus
 id=39669
 rarity=R
@@ -1020,12 +1022,7 @@ rarity=R
 [/card]
 [card]
 primitive=Mountain
-id=40110
+id=40107
-rarity=L
-[/card]
-[card]
-primitive=Mountain
-id=40109
 rarity=L
 [/card]
 [card]
@@ -1035,7 +1032,12 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=40107
+id=40109
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=40110
 rarity=L
 [/card]
 [card]
@@ -1115,12 +1117,7 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=40124
+id=40121
-rarity=L
-[/card]
-[card]
-primitive=Plains
-id=40123
 rarity=L
 [/card]
 [card]
@@ -1130,7 +1127,12 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=40121
+id=40123
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=40124
 rarity=L
 [/card]
 [card]
@@ -1269,16 +1271,16 @@ id=39455
 rarity=C
 [/card]
 [card]
-primitive=Searing Flesh
-id=35386
-rarity=U
-[/card]
-[card]
 primitive=Sea's Claim
 id=39446
 rarity=C
 [/card]
 [card]
+primitive=Searing Flesh
+id=35386
+rarity=U
+[/card]
+[card]
 primitive=Seaside Haven
 id=40539
 rarity=U
@@ -1480,12 +1482,7 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=40114
+id=40111
-rarity=L
-[/card]
-[card]
-primitive=Swamp
-id=40113
 rarity=L
 [/card]
 [card]
@@ -1495,7 +1492,12 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=40111
+id=40113
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=40114
 rarity=L
 [/card]
 [card]

projects/mtg/bin/Res/sets/ORI/_cards.dat

@@ -1,7 +1,8 @@
 [meta]
-author=Wagic Team 
+author=Wagic Team
-name=Magic Origins 
+name=Magic Origins
-year=2015 
+year=2015
+total=293
 [/meta]
 [card]
 primitive=Abbot of Keral Keep
@@ -19,6 +20,11 @@ id=398578
 rarity=C
 [/card]
 [card]
+primitive=Aegis Angel
+id=401452
+rarity=R
+[/card]
+[card]
 primitive=Aerial Volley
 id=398565
 rarity=C
@@ -39,16 +45,16 @@ id=398640
 rarity=C
 [/card]
 [card]
-primitive=Alhammarret, High Arbiter
-id=398436
-rarity=R
-[/card]
-[card]
 primitive=Alhammarret's Archive
 id=398564
 rarity=M
 [/card]
 [card]
+primitive=Alhammarret, High Arbiter
+id=398436
+rarity=R
+[/card]
+[card]
 primitive=Ampryn Tactician
 id=398603
 rarity=C
@@ -189,16 +195,6 @@ id=398488
 rarity=C
 [/card]
 [card]
-primitive=Chandra, Fire of Kaladesh
-id=398422
-rarity=M
-[/card]
-[card]
-primitive=Chandra, Roaring Flame
-id=398423
-rarity=T
-[/card]
-[card]
 primitive=Chandra's Fury
 id=398632
 rarity=C
@@ -209,6 +205,16 @@ id=398416
 rarity=R
 [/card]
 [card]
+primitive=Chandra, Fire of Kaladesh
+id=398422
+rarity=M
+[/card]
+[card]
+primitive=Chandra, Roaring Flame
+id=398423
+rarity=T
+[/card]
+[card]
 primitive=Charging Griffin
 id=398560
 rarity=C
@@ -319,6 +325,11 @@ id=398580
 rarity=R
 [/card]
 [card]
+primitive=Divine Verdict
+id=401453
+rarity=C
+[/card]
+[card]
 primitive=Dragon Fodder
 id=398647
 rarity=C
@@ -329,14 +340,19 @@ id=398405
 rarity=C
 [/card]
 [card]
+primitive=Dwynen's Elite
+id=398609
+rarity=U
+[/card]
+[card]
 primitive=Dwynen, Gilt-Leaf Daen
 id=398546
 rarity=R
 [/card]
 [card]
-primitive=Dwynen's Elite
+primitive=Eagle of the Watch
-id=398609
+id=401454
-rarity=U
+rarity=C
 [/card]
 [card]
 primitive=Elemental Bond
@@ -414,6 +430,11 @@ id=398497
 rarity=U
 [/card]
 [card]
+primitive=Fiery Hellhound
+id=401463
+rarity=C
+[/card]
+[card]
 primitive=Fiery Impulse
 id=398516
 rarity=C
@@ -429,6 +450,11 @@ id=398547
 rarity=R
 [/card]
 [card]
+primitive=Flesh to Dust
+id=401459
+rarity=C
+[/card]
+[card]
 primitive=Fleshbag Marauder
 id=398625
 rarity=U
@@ -479,16 +505,16 @@ id=398681
 rarity=C
 [/card]
 [card]
-primitive=Gideon, Battle-Forged
-id=398429
-rarity=T
-[/card]
-[card]
 primitive=Gideon's Phalanx
 id=398471
 rarity=R
 [/card]
 [card]
+primitive=Gideon, Battle-Forged
+id=398429
+rarity=T
+[/card]
+[card]
 primitive=Gilt-Leaf Winnower
 id=398495
 rarity=R
@@ -604,6 +630,11 @@ id=398503
 rarity=R
 [/card]
 [card]
+primitive=Into the Void
+id=401456
+rarity=U
+[/card]
+[card]
 primitive=Iroas's Champion
 id=398653
 rarity=U
@@ -629,6 +660,11 @@ id=398664
 rarity=L
 [/card]
 [card]
+primitive=Jace's Sanctum
+id=398614
+rarity=R
+[/card]
+[card]
 primitive=Jace, Telepath Unbound
 id=398435
 rarity=T
@@ -639,11 +675,6 @@ id=398434
 rarity=M
 [/card]
 [card]
-primitive=Jace's Sanctum
-id=398614
-rarity=R
-[/card]
-[card]
 primitive=Jayemdae Tome
 id=398530
 rarity=U
@@ -679,11 +710,6 @@ id=398443
 rarity=R
 [/card]
 [card]
-primitive=Kytheon, Hero of Akros
-id=398428
-rarity=M
-[/card]
-[card]
 primitive=Kytheon's Irregulars
 id=398561
 rarity=R
@@ -694,6 +720,11 @@ id=398470
 rarity=C
 [/card]
 [card]
+primitive=Kytheon, Hero of Akros
+id=398428
+rarity=M
+[/card]
+[card]
 primitive=Languish
 id=398597
 rarity=R
@@ -754,6 +785,11 @@ id=398496
 rarity=U
 [/card]
 [card]
+primitive=Mahamoti Djinn
+id=401457
+rarity=R
+[/card]
+[card]
 primitive=Malakir Cullblade
 id=398556
 rarity=U
@@ -789,6 +825,11 @@ id=398630
 rarity=C
 [/card]
 [card]
+primitive=Mind Rot
+id=401460
+rarity=C
+[/card]
+[card]
 primitive=Mizzium Meddler
 id=398596
 rarity=R
@@ -839,21 +880,16 @@ id=398629
 rarity=C
 [/card]
 [card]
+primitive=Nightmare
+id=401461
+rarity=R
+[/card]
+[card]
 primitive=Nightsnare
 id=398562
 rarity=C
 [/card]
 [card]
-primitive=Nissa, Sage Animist
-id=398432
-rarity=T
-[/card]
-[card]
-primitive=Nissa, Vastwood Seer
-id=398438
-rarity=M
-[/card]
-[card]
 primitive=Nissa's Pilgrimage
 id=398593
 rarity=C
@@ -864,6 +900,16 @@ id=398506
 rarity=R
 [/card]
 [card]
+primitive=Nissa, Sage Animist
+id=398432
+rarity=T
+[/card]
+[card]
+primitive=Nissa, Vastwood Seer
+id=398438
+rarity=M
+[/card]
+[card]
 primitive=Nivix Barrier
 id=398465
 rarity=C
@@ -919,6 +965,11 @@ id=398675
 rarity=L
 [/card]
 [card]
+primitive=Plummet
+id=401465
+rarity=C
+[/card]
+[card]
 primitive=Possessed Skaab
 id=398657
 rarity=U
@@ -939,6 +990,11 @@ id=398646
 rarity=U
 [/card]
 [card]
+primitive=Prized Unicorn
+id=401466
+rarity=U
+[/card]
+[card]
 primitive=Psychic Rebuttal
 id=398479
 rarity=U
@@ -1044,6 +1100,11 @@ id=398545
 rarity=C
 [/card]
 [card]
+primitive=Sengir Vampire
+id=401462
+rarity=U
+[/card]
+[card]
 primitive=Sentinel of the Eternal Watch
 id=398659
 rarity=U
@@ -1054,6 +1115,11 @@ id=398608
 rarity=C
 [/card]
 [card]
+primitive=Serra Angel
+id=401455
+rarity=U
+[/card]
+[card]
 primitive=Shadows of the Past
 id=398522
 rarity=U
@@ -1069,13 +1135,13 @@ id=398552
 rarity=C
 [/card]
 [card]
-primitive=Shivan Reef
+primitive=Shivan Dragon
-id=398444
+id=401464
 rarity=R
 [/card]
 [card]
-primitive=Sigil of the Empty Throne
+primitive=Shivan Reef
-id=398524
+id=398444
 rarity=R
 [/card]
 [card]
@@ -1084,6 +1150,11 @@ id=398515
 rarity=U
 [/card]
 [card]
+primitive=Sigil of the Empty Throne
+id=398524
+rarity=R
+[/card]
+[card]
 primitive=Sigiled Starfish
 id=398592
 rarity=U
@@ -1194,6 +1265,11 @@ id=398483
 rarity=R
 [/card]
 [card]
+primitive=Terra Stomper
+id=401467
+rarity=R
+[/card]
+[card]
 primitive=The Great Aurora
 id=398679
 rarity=M
@@ -1229,13 +1305,13 @@ id=398445
 rarity=C
 [/card]
 [card]
-primitive=Titanic Growth
+primitive=Titan's Strength
-id=398648
+id=398680
 rarity=C
 [/card]
 [card]
-primitive=Titan's Strength
+primitive=Titanic Growth
-id=398680
+id=398648
 rarity=C
 [/card]
 [card]
@@ -1339,6 +1415,11 @@ id=398540
 rarity=C
 [/card]
 [card]
+primitive=Weave Fate
+id=401458
+rarity=C
+[/card]
+[card]
 primitive=Weight of the Underworld
 id=398544
 rarity=C

projects/mtg/bin/Res/sets/P02/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
-year=1998
+name=Portal Second Age
 block=Portal
+year=1998
+total=165
 [/meta]
 [card]
 primitive=Abyssal Nightstalker
@@ -169,6 +171,11 @@ id=6606
 rarity=R
 [/card]
 [card]
+primitive=Deja Vu
+id=6528
+rarity=C
+[/card]
+[card]
 primitive=Dakmor Bat
 id=6553
 rarity=C
@@ -204,11 +211,6 @@ id=6631
 rarity=U
 [/card]
 [card]
-primitive=Deja Vu
-id=6528
-rarity=C
-[/card]
-[card]
 primitive=Denizen of the Deep
 id=6546
 rarity=R
@@ -245,7 +247,7 @@ rarity=C
 [/card]
 [card]
 primitive=Forest
-id=8410
+id=8408
 rarity=L
 [/card]
 [card]
@@ -255,7 +257,7 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=8408
+id=8410
 rarity=L
 [/card]
 [card]
@@ -350,7 +352,7 @@ rarity=U
 [/card]
 [card]
 primitive=Island
-id=8391
+id=8387
 rarity=L
 [/card]
 [card]
@@ -360,7 +362,7 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=8387
+id=8391
 rarity=L
 [/card]
 [card]
@@ -420,7 +422,7 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=8407
+id=8395
 rarity=L
 [/card]
 [card]
@@ -430,7 +432,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=8395
+id=8407
 rarity=L
 [/card]
 [card]
@@ -520,7 +522,7 @@ rarity=R
 [/card]
 [card]
 primitive=Plains
-id=8380
+id=8354
 rarity=L
 [/card]
 [card]
@@ -530,7 +532,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=8354
+id=8380
 rarity=L
 [/card]
 [card]
@@ -660,7 +662,7 @@ rarity=C
 [/card]
 [card]
 primitive=Swamp
-id=8394
+id=8392
 rarity=L
 [/card]
 [card]
@@ -670,7 +672,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=8392
+id=8394
 rarity=L
 [/card]
 [card]

projects/mtg/bin/Res/sets/PCY/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Prophecy
+block=Masque
 year=2000
-block=Masks
+total=143
 [/meta]
 [card]
 primitive=Abolish
@@ -14,16 +16,16 @@ id=24601
 rarity=C
 [/card]
 [card]
-primitive=Alexi, Zephyr Mage
-id=24591
-rarity=R
-[/card]
-[card]
 primitive=Alexi's Cloak
 id=24579
 rarity=C
 [/card]
 [card]
+primitive=Alexi, Zephyr Mage
+id=24591
+rarity=R
+[/card]
+[card]
 primitive=Aura Fracture
 id=24560
 rarity=C
@@ -239,16 +241,16 @@ id=24549
 rarity=C
 [/card]
 [card]
-primitive=Greel, Mind Raker
-id=24619
-rarity=R
-[/card]
-[card]
 primitive=Greel's Caress
 id=24604
 rarity=C
 [/card]
 [card]
+primitive=Greel, Mind Raker
+id=24619
+rarity=R
+[/card]
+[card]
 primitive=Gulf Squid
 id=24573
 rarity=C
@@ -284,16 +286,16 @@ id=24566
 rarity=R
 [/card]
 [card]
-primitive=Jolrael, Empress of Beasts
-id=24673
-rarity=R
-[/card]
-[card]
 primitive=Jolrael's Favor
 id=24660
 rarity=C
 [/card]
 [card]
+primitive=Jolrael, Empress of Beasts
+id=24673
+rarity=R
+[/card]
+[card]
 primitive=Keldon Arsonist
 id=24637
 rarity=U
@@ -314,16 +316,16 @@ id=24648
 rarity=R
 [/card]
 [card]
-primitive=Latulla, Keldon Overseer
-id=24646
-rarity=R
-[/card]
-[card]
 primitive=Latulla's Orders
 id=24632
 rarity=C
 [/card]
 [card]
+primitive=Latulla, Keldon Overseer
+id=24646
+rarity=R
+[/card]
+[card]
 primitive=Lesser Gargadon
 id=24647
 rarity=U

projects/mtg/bin/Res/sets/PLC/_cards.dat

@@ -1,19 +1,21 @@
 [meta]
 author=Wagic Team
+name=Planar Chaos
+block=Time Spiral
 year=2007
-block=Time
+total=165
 [/meta]
 [card]
-primitive=Aeon Chronicler
-id=122449
-rarity=R
-[/card]
-[card]
 primitive=AEther Membrane
 id=124504
 rarity=U
 [/card]
 [card]
+primitive=Aeon Chronicler
+id=122449
+rarity=R
+[/card]
+[card]
 primitive=Akroma, Angel of Fury
 id=122432
 rarity=R
@@ -74,16 +76,10 @@ id=122321
 rarity=C
 [/card]
 [card]
-primitive=Boom // Bust (Boom)
+primitive=Boom // Bust
 id=126218
 rarity=R
 [/card]
-#need to find a way to deal with multipart cards
-#[card]
-#primitive=Boom // Bust (Bust)
-#id=126218
-#rarity=R
-#[/card]
 [card]
 primitive=Braids, Conjurer Adept
 id=124316
@@ -115,7 +111,7 @@ id=111066
 rarity=R
 [/card]
 [card]
-primitive=Chronozoa (Chronozoa)
+primitive=Chronozoa Token
 id=-111066
 rarity=T
 [/card]
@@ -160,16 +156,10 @@ id=124080
 rarity=C
 [/card]
 [card]
-primitive=Dead // Gone (Dead)
+primitive=Dead // Gone
 id=126419
 rarity=C
 [/card]
-#need to find a way to deal with multipart cards
-#[card]
-#primitive=Dead // Gone (Gone)
-#id=126419
-#rarity=C
-#[/card]
 [card]
 primitive=Deadly Grub
 id=111046
@@ -621,16 +611,10 @@ id=122431
 rarity=R
 [/card]
 [card]
-primitive=Rough // Tumble (Rough)
+primitive=Rough // Tumble
 id=126420
 rarity=U
 [/card]
-#need to find a way to deal with multipart cards
-#[card]
-#primitive=Rough // Tumble (Tumble)
-#id=126420
-#rarity=U
-#[/card]
 [card]
 primitive=Saltblast
 id=122435
@@ -832,9 +816,7 @@ id=126303
 rarity=R
 [/card]
 [card]
-primitive=Vorosh the Hunter
+primitive=Vorosh, the Hunter
-#The comma needed to be stripped from the name to make the card work.
-#Reintroducing it requires an update to mtg.txt as well.
 id=124057
 rarity=R
 [/card]

projects/mtg/bin/Res/sets/PLS/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
-year=2001
+name=Planeshift
 block=Invasion
+year=2001
+total=146
 [/meta]
 [card]
 primitive=Allied Strategies
@@ -159,9 +161,9 @@ id=25646
 rarity=R
 [/card]
 [card]
-primitive=Ertai, the Corrupted
+primitive=Ertai's Trickery
-id=29292
+id=26590
-rarity=R
+rarity=U
 [/card]
 [card]
 primitive=Ertai, the Corrupted
@@ -169,9 +171,9 @@ id=25614
 rarity=R
 [/card]
 [card]
-primitive=Ertai's Trickery
+primitive=Ertai, the Corrupted
-id=26590
+id=29292
-rarity=U
+rarity=R
 [/card]
 [card]
 primitive=Escape Routes
@@ -570,12 +572,12 @@ rarity=C
 [/card]
 [card]
 primitive=Skyship Weatherlight
-id=29293
+id=26480
 rarity=R
 [/card]
 [card]
 primitive=Skyship Weatherlight
-id=26480
+id=29293
 rarity=R
 [/card]
 [card]
@@ -660,12 +662,12 @@ rarity=U
 [/card]
 [card]
 primitive=Tahngarth, Talruum Hero
-id=29291
+id=26408
 rarity=R
 [/card]
 [card]
 primitive=Tahngarth, Talruum Hero
-id=26408
+id=29291
 rarity=R
 [/card]
 [card]

projects/mtg/bin/Res/sets/POR/_cards.dat

@@ -1,9 +1,9 @@
-#PORTAL
-#Thanks to Dr.Solomat for the initial release 2009/01/01
 [meta]
 author=Wagic Team
-year=1997
+name=Portal
 block=Portal
+year=1997
+total=222
 [/meta]
 [card]
 primitive=Alabaster Dragon
@@ -17,12 +17,12 @@ rarity=R
 [/card]
 [card]
 primitive=Anaconda
-id=4288
+id=4287
 rarity=U
 [/card]
 [card]
 primitive=Anaconda
-id=4287
+id=4288
 rarity=U
 [/card]
 [card]
@@ -82,12 +82,12 @@ rarity=U
 [/card]
 [card]
 primitive=Blaze
-id=4329
+id=4328
 rarity=U
 [/card]
 [card]
 primitive=Blaze
-id=4328
+id=4329
 rarity=U
 [/card]
 [card]
@@ -216,6 +216,11 @@ id=4215
 rarity=R
 [/card]
 [card]
+primitive=Deja Vu
+id=4259
+rarity=C
+[/card]
+[card]
 primitive=Deep Wood
 id=4292
 rarity=U
@@ -231,11 +236,6 @@ id=4380
 rarity=U
 [/card]
 [card]
-primitive=Deja Vu
-id=4259
-rarity=C
-[/card]
-[card]
 primitive=Desert Drake
 id=4333
 rarity=U
@@ -282,12 +282,12 @@ rarity=R
 [/card]
 [card]
 primitive=Elite Cat Warrior
-id=4294
+id=4293
 rarity=C
 [/card]
 [card]
 primitive=Elite Cat Warrior
-id=4293
+id=4294
 rarity=C
 [/card]
 [card]
@@ -367,12 +367,7 @@ rarity=C
 [/card]
 [card]
 primitive=Forest
-id=4416
+id=4413
-rarity=L
-[/card]
-[card]
-primitive=Forest
-id=4415
 rarity=L
 [/card]
 [card]
@@ -382,7 +377,12 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=4413
+id=4415
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=4416
 rarity=L
 [/card]
 [card]
@@ -432,12 +432,12 @@ rarity=C
 [/card]
 [card]
 primitive=Hand of Death
-id=4225
+id=4224
 rarity=C
 [/card]
 [card]
 primitive=Hand of Death
-id=4224
+id=4225
 rarity=C
 [/card]
 [card]
@@ -487,12 +487,7 @@ rarity=U
 [/card]
 [card]
 primitive=Island
-id=4424
+id=4421
-rarity=L
-[/card]
-[card]
-primitive=Island
-id=4423
 rarity=L
 [/card]
 [card]
@@ -502,7 +497,12 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=4421
+id=4423
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=4424
 rarity=L
 [/card]
 [card]
@@ -582,12 +582,12 @@ rarity=C
 [/card]
 [card]
 primitive=Monstrous Growth
-id=4305
+id=4304
 rarity=C
 [/card]
 [card]
 primitive=Monstrous Growth
-id=4304
+id=4305
 rarity=C
 [/card]
 [card]
@@ -596,13 +596,13 @@ id=4306
 rarity=U
 [/card]
 [card]
-primitive=Mountain
+primitive=Mountain Goat
-id=4420
+id=4352
-rarity=L
+rarity=U
 [/card]
 [card]
 primitive=Mountain
-id=4419
+id=4417
 rarity=L
 [/card]
 [card]
@@ -612,13 +612,13 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=4417
+id=4419
 rarity=L
 [/card]
 [card]
-primitive=Mountain Goat
+primitive=Mountain
-id=4352
+id=4420
-rarity=U
+rarity=L
 [/card]
 [card]
 primitive=Muck Rats
@@ -702,12 +702,7 @@ rarity=R
 [/card]
 [card]
 primitive=Plains
-id=4428
+id=4425
-rarity=L
-[/card]
-[card]
-primitive=Plains
-id=4427
 rarity=L
 [/card]
 [card]
@@ -717,7 +712,12 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=4425
+id=4427
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=4428
 rarity=L
 [/card]
 [card]
@@ -752,12 +752,12 @@ rarity=C
 [/card]
 [card]
 primitive=Raging Goblin
-id=4357
+id=4356
 rarity=C
 [/card]
 [card]
 primitive=Raging Goblin
-id=4356
+id=4357
 rarity=C
 [/card]
 [card]
@@ -922,12 +922,7 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=4412
+id=4409
-rarity=L
-[/card]
-[card]
-primitive=Swamp
-id=4411
 rarity=L
 [/card]
 [card]
@@ -937,7 +932,12 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=4409
+id=4411
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=4412
 rarity=L
 [/card]
 [card]
@@ -1062,12 +1062,12 @@ rarity=U
 [/card]
 [card]
 primitive=Warrior's Charge
-id=4407
+id=4406
 rarity=C
 [/card]
 [card]
 primitive=Warrior's Charge
-id=4406
+id=4407
 rarity=C
 [/card]
 [card]

projects/mtg/bin/Res/sets/PTK/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
-year=1999
+name=Portal Three Kingdoms
 block=Portal
+year=1999
+total=180
 [/meta]
 [card]
 primitive=Alert Shu Infantry
@@ -204,6 +206,11 @@ id=10622
 rarity=C
 [/card]
 [card]
+primitive=Forest Bear
+id=10505
+rarity=C
+[/card]
+[card]
 primitive=Forest
 id=10532
 rarity=L
@@ -219,23 +226,18 @@ id=10640
 rarity=L
 [/card]
 [card]
-primitive=Forest Bear
-id=10505
-rarity=C
-[/card]
-[card]
 primitive=Ghostly Visit
 id=10546
 rarity=C
 [/card]
 [card]
-primitive=Guan Yu, Sainted Warrior
+primitive=Guan Yu's 1,000-Li March
-id=10494
+id=10597
 rarity=R
 [/card]
 [card]
-primitive=Guan Yu's 1,000-Li March
+primitive=Guan Yu, Sainted Warrior
-id=10597
+id=10494
 rarity=R
 [/card]
 [card]
@@ -294,13 +296,13 @@ id=10642
 rarity=L
 [/card]
 [card]
-primitive=Kongming, "Sleeping Dragon"
+primitive=Kongming's Contraptions
-id=10490
+id=10495
 rarity=R
 [/card]
 [card]
-primitive=Kongming's Contraptions
+primitive=Kongming, "Sleeping Dragon"
-id=10495
+id=10490
 rarity=R
 [/card]
 [card]
@@ -359,21 +361,26 @@ id=10547
 rarity=R
 [/card]
 [card]
-primitive=Meng Huo, Barbarian King
-id=10732
-rarity=R
-[/card]
-[card]
 primitive=Meng Huo's Horde
 id=10503
 rarity=C
 [/card]
 [card]
+primitive=Meng Huo, Barbarian King
+id=10732
+rarity=R
+[/card]
+[card]
 primitive=Misfortune's Gain
 id=10579
 rarity=C
 [/card]
 [card]
+primitive=Mountain Bandit
+id=10585
+rarity=C
+[/card]
+[card]
 primitive=Mountain
 id=10563
 rarity=L
@@ -389,11 +396,6 @@ id=10644
 rarity=L
 [/card]
 [card]
-primitive=Mountain Bandit
-id=10585
-rarity=C
-[/card]
-[card]
 primitive=Mystic Denial
 id=10565
 rarity=U
@@ -799,16 +801,16 @@ id=10584
 rarity=C
 [/card]
 [card]
-primitive=Yuan Shao, the Indecisive
-id=10516
-rarity=R
-[/card]
-[card]
 primitive=Yuan Shao's Infantry
 id=10559
 rarity=U
 [/card]
 [card]
+primitive=Yuan Shao, the Indecisive
+id=10516
+rarity=R
+[/card]
+[card]
 primitive=Zhang Fei, Fierce Warrior
 id=10604
 rarity=R

projects/mtg/bin/Res/sets/PVC/_cards.dat

@@ -1,6 +1,9 @@
 [meta]
-year=2010
 author=Wagic Team
+name=Duel Decks: Phyrexia vs. the Coalition
+block=Duel
+year=2010
+total=71
 [/meta]
 [card]
 primitive=Allied Strategies
@@ -33,16 +36,16 @@ id=209158
 rarity=R
 [/card]
 [card]
-primitive=Darigaaz, the Igniter
-id=209111
-rarity=R
-[/card]
-[card]
 primitive=Darigaaz's Charm
 id=209149
 rarity=U
 [/card]
 [card]
+primitive=Darigaaz, the Igniter
+id=209111
+rarity=R
+[/card]
+[card]
 primitive=Dark Ritual
 id=209137
 rarity=C
@@ -248,16 +251,16 @@ id=210557
 rarity=C
 [/card]
 [card]
-primitive=Rith, the Awakener
-id=209118
-rarity=R
-[/card]
-[card]
 primitive=Rith's Charm
 id=209152
 rarity=U
 [/card]
 [card]
+primitive=Rith, the Awakener
+id=209118
+rarity=R
+[/card]
+[card]
 primitive=Sanguine Guard
 id=209161
 rarity=U
@@ -328,16 +331,16 @@ id=209155
 rarity=U
 [/card]
 [card]
-primitive=Treva, the Renewer
-id=209121
-rarity=R
-[/card]
-[card]
 primitive=Treva's Charm
 id=209156
 rarity=U
 [/card]
 [card]
+primitive=Treva, the Renewer
+id=209121
+rarity=R
+[/card]
+[card]
 primitive=Tribal Flames
 id=209145
 rarity=C

projects/mtg/bin/Res/sets/RAV/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Ravnica: City of Guilds
+block=Ravnica
 year=2005
-block=Guild
+total=306
 [/meta]
 [card]
 primitive=Agrus Kos, Wojek Veteran
@@ -490,12 +492,12 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=95099
+id=95098
 rarity=L
 [/card]
 [card]
 primitive=Forest
-id=95098
+id=95099
 rarity=L
 [/card]
 [card]
@@ -720,6 +722,11 @@ rarity=U
 [/card]
 [card]
 primitive=Island
+id=95100
+rarity=L
+[/card]
+[card]
+primitive=Island
 id=95103
 rarity=L
 [/card]
@@ -730,11 +737,6 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=95100
-rarity=L
-[/card]
-[card]
-primitive=Island
 id=95113
 rarity=L
 [/card]
@@ -865,12 +867,12 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=95104
+id=95102
 rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=95102
+id=95104
 rarity=L
 [/card]
 [card]
@@ -975,6 +977,11 @@ rarity=R
 [/card]
 [card]
 primitive=Plains
+id=95105
+rarity=L
+[/card]
+[card]
+primitive=Plains
 id=95108
 rarity=L
 [/card]
@@ -985,11 +992,6 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=95105
-rarity=L
-[/card]
-[card]
-primitive=Plains
 id=95115
 rarity=L
 [/card]
@@ -1034,13 +1036,13 @@ id=83680
 rarity=C
 [/card]
 [card]
-primitive=Razia, Boros Archangel
+primitive=Razia's Purification
-id=89061
+id=89115
 rarity=R
 [/card]
 [card]
-primitive=Razia's Purification
+primitive=Razia, Boros Archangel
-id=89115
+id=89061
 rarity=R
 [/card]
 [card]
@@ -1300,7 +1302,7 @@ rarity=U
 [/card]
 [card]
 primitive=Swamp
-id=95111
+id=95101
 rarity=L
 [/card]
 [card]
@@ -1310,7 +1312,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=95101
+id=95111
 rarity=L
 [/card]
 [card]
@@ -1474,16 +1476,16 @@ id=89082
 rarity=R
 [/card]
 [card]
-primitive=Warp World
-id=89084
-rarity=R
-[/card]
-[card]
 primitive=War-Torch Goblin
 id=87971
 rarity=C
 [/card]
 [card]
+primitive=Warp World
+id=89084
+rarity=R
+[/card]
+[card]
 primitive=Watchwolf
 id=83625
 rarity=U

projects/mtg/bin/Res/sets/RTR/_cards.dat

@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
-name=RTR
+name=Return to Ravnica
+block=Return to Ravnica
 year=2012
+total=274
 [/meta]
 [card]
 primitive=Abrupt Decay
@@ -84,6 +86,11 @@ id=265383
 rarity=C
 [/card]
 [card]
+primitive=Azor's Elocutors
+id=265418
+rarity=R
+[/card]
+[card]
 primitive=Azorius Arrester
 id=270972
 rarity=C
@@ -109,11 +116,6 @@ id=253519
 rarity=U
 [/card]
 [card]
-primitive=Azor's Elocutors
-id=265418
-rarity=R
-[/card]
-[card]
 primitive=Batterhorn
 id=265399
 rarity=C
@@ -299,13 +301,13 @@ id=270970
 rarity=R
 [/card]
 [card]
-primitive=Deathrite Shaman
+primitive=Death's Presence
-id=290529
+id=270793
 rarity=R
 [/card]
 [card]
-primitive=Death's Presence
+primitive=Deathrite Shaman
-id=270793
+id=290529
 rarity=R
 [/card]
 [card]
@@ -435,6 +437,11 @@ rarity=R
 [/card]
 [card]
 primitive=Forest
+id=289325
+rarity=L
+[/card]
+[card]
+primitive=Forest
 id=289326
 rarity=L
 [/card]
@@ -445,7 +452,7 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=289325
+id=289328
 rarity=L
 [/card]
 [card]
@@ -454,11 +461,6 @@ id=333718
 rarity=L
 [/card]
 [card]
-primitive=Forest
-id=289328
-rarity=L
-[/card]
-[card]
 primitive=Frostburn Weird
 id=289230
 rarity=C
@@ -605,11 +607,6 @@ rarity=C
 [/card]
 [card]
 primitive=Island
-id=289315
-rarity=L
-[/card]
-[card]
-primitive=Island
 id=289313
 rarity=L
 [/card]
@@ -620,6 +617,11 @@ rarity=L
 [/card]
 [card]
 primitive=Island
+id=289315
+rarity=L
+[/card]
+[card]
+primitive=Island
 id=289316
 rarity=L
 [/card]
@@ -629,16 +631,16 @@ id=333719
 rarity=L
 [/card]
 [card]
-primitive=Isperia, Supreme Judge
-id=290531
-rarity=M
-[/card]
-[card]
 primitive=Isperia's Skywatch
 id=270958
 rarity=C
 [/card]
 [card]
+primitive=Isperia, Supreme Judge
+id=290531
+rarity=M
+[/card]
+[card]
 primitive=Izzet Charm
 id=253528
 rarity=U
@@ -664,16 +666,16 @@ id=253653
 rarity=M
 [/card]
 [card]
-primitive=Jarad, Golgari Lich Lord
-id=290534
-rarity=M
-[/card]
-[card]
 primitive=Jarad's Orders
 id=253633
 rarity=R
 [/card]
 [card]
+primitive=Jarad, Golgari Lich Lord
+id=290534
+rarity=M
+[/card]
+[card]
 primitive=Judge's Familiar
 id=289221
 rarity=U
@@ -760,7 +762,7 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=289324
+id=289321
 rarity=L
 [/card]
 [card]
@@ -770,7 +772,12 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=289321
+id=289323
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=289324
 rarity=L
 [/card]
 [card]
@@ -779,11 +786,6 @@ id=333720
 rarity=L
 [/card]
 [card]
-primitive=Mountain
-id=289323
-rarity=L
-[/card]
-[card]
 primitive=Necropolis Regent
 id=253569
 rarity=M
@@ -794,6 +796,11 @@ id=270367
 rarity=U
 [/card]
 [card]
+primitive=Niv-Mizzet, Dracogenius
+id=253626
+rarity=M
+[/card]
+[card]
 primitive=Nivix Guildmage
 id=270366
 rarity=U
@@ -804,11 +811,6 @@ id=290526
 rarity=R
 [/card]
 [card]
-primitive=Niv-Mizzet, Dracogenius
-id=253626
-rarity=M
-[/card]
-[card]
 primitive=Oak Street Innkeeper
 id=270362
 rarity=U
@@ -855,7 +857,7 @@ rarity=R
 [/card]
 [card]
 primitive=Plains
-id=289311
+id=289309
 rarity=L
 [/card]
 [card]
@@ -865,7 +867,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=289309
+id=289311
 rarity=L
 [/card]
 [card]
@@ -939,13 +941,13 @@ id=253591
 rarity=C
 [/card]
 [card]
-primitive=Rakdos, Lord of Riots
+primitive=Rakdos's Return
-id=253532
+id=253574
 rarity=M
 [/card]
 [card]
-primitive=Rakdos's Return
+primitive=Rakdos, Lord of Riots
-id=253574
+id=253532
 rarity=M
 [/card]
 [card]
@@ -999,16 +1001,16 @@ id=265388
 rarity=U
 [/card]
 [card]
-primitive=Search the City
-id=265404
-rarity=R
-[/card]
-[card]
 primitive=Search Warrant
 id=253614
 rarity=C
 [/card]
 [card]
+primitive=Search the City
+id=265404
+rarity=R
+[/card]
+[card]
 primitive=Security Blockade
 id=270790
 rarity=U
@@ -1180,12 +1182,7 @@ rarity=C
 [/card]
 [card]
 primitive=Swamp
-id=289320
+id=289317
-rarity=L
-[/card]
-[card]
-primitive=Swamp
-id=289319
 rarity=L
 [/card]
 [card]
@@ -1195,12 +1192,17 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=333722
+id=289319
 rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=289317
+id=289320
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=333722
 rarity=L
 [/card]
 [card]
@@ -1289,16 +1291,16 @@ id=289220
 rarity=C
 [/card]
 [card]
-primitive=Trostani, Selesnya's Voice
-id=253641
-rarity=M
-[/card]
-[card]
 primitive=Trostani's Judgment
 id=289225
 rarity=C
 [/card]
 [card]
+primitive=Trostani, Selesnya's Voice
+id=253641
+rarity=M
+[/card]
+[card]
 primitive=Ultimate Price
 id=253538
 rarity=U
@@ -1377,4 +1379,4 @@ rarity=M
 primitive=Zanikev Locust
 id=289229
 rarity=U
-[/card]
+[/card]

projects/mtg/bin/Res/sets/RV/_cards.dat

@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-name=3rd Edition
+name=Revised Edition
 year=1994
+total=306
 [/meta]
 [card]
 primitive=Air Elemental
@@ -39,13 +40,13 @@ id=1094
 rarity=R
 [/card]
 [card]
-primitive=Armageddon
+primitive=Armageddon Clock
-id=1328
+id=1095
 rarity=R
 [/card]
 [card]
-primitive=Armageddon Clock
+primitive=Armageddon
-id=1095
+id=1328
 rarity=R
 [/card]
 [card]
@@ -485,7 +486,7 @@ rarity=R
 [/card]
 [card]
 primitive=Forest
-id=1388
+id=1386
 rarity=L
 [/card]
 [card]
@@ -495,7 +496,7 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=1386
+id=1388
 rarity=L
 [/card]
 [card]
@@ -644,8 +645,18 @@ id=1253
 rarity=C
 [/card]
 [card]
+primitive=Island Fish Jasconius
+id=1203
+rarity=R
+[/card]
+[card]
+primitive=Island Sanctuary
+id=1351
+rarity=R
+[/card]
+[card]
 primitive=Island
-id=1394
+id=1392
 rarity=L
 [/card]
 [card]
@@ -655,20 +666,10 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=1392
+id=1394
 rarity=L
 [/card]
 [card]
-primitive=Island Fish Jasconius
-id=1203
-rarity=R
-[/card]
-[card]
-primitive=Island Sanctuary
-id=1351
-rarity=R
-[/card]
-[card]
 primitive=Ivory Cup
 id=1114
 rarity=U
@@ -880,7 +881,7 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=1391
+id=1389
 rarity=L
 [/card]
 [card]
@@ -890,7 +891,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=1389
+id=1391
 rarity=L
 [/card]
 [card]
@@ -990,7 +991,7 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=1397
+id=1395
 rarity=L
 [/card]
 [card]
@@ -1000,7 +1001,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=1395
+id=1397
 rarity=L
 [/card]
 [card]
@@ -1129,13 +1130,13 @@ id=1364
 rarity=C
 [/card]
 [card]
-primitive=Savannah
+primitive=Savannah Lions
-id=1379
+id=1365
 rarity=R
 [/card]
 [card]
-primitive=Savannah Lions
+primitive=Savannah
-id=1365
+id=1379
 rarity=R
 [/card]
 [card]
@@ -1189,16 +1190,16 @@ id=1265
 rarity=C
 [/card]
 [card]
-primitive=Shatter
-id=1316
-rarity=C
-[/card]
-[card]
 primitive=Shatterstorm
 id=1317
 rarity=U
 [/card]
 [card]
+primitive=Shatter
+id=1316
+rarity=C
+[/card]
+[card]
 primitive=Shivan Dragon
 id=1318
 rarity=R
@@ -1275,7 +1276,7 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=1375
+id=1373
 rarity=L
 [/card]
 [card]
@@ -1285,7 +1286,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=1373
+id=1375
 rarity=L
 [/card]
 [card]

projects/mtg/bin/Res/sets/S00/_cards.dat

@@ -1,8 +1,9 @@
 [meta]
 author=Wagic Team
-name=Starter '00
+name=Starter 2000
 block=Starter
 year=2000
+total=57
 [/meta]
 [card]
 primitive=Angelic Blessing
@@ -66,12 +67,12 @@ rarity=C
 [/card]
 [card]
 primitive=Forest
-id=25483
+id=25482
 rarity=L
 [/card]
 [card]
 primitive=Forest
-id=25482
+id=25483
 rarity=L
 [/card]
 [card]
@@ -106,12 +107,12 @@ rarity=C
 [/card]
 [card]
 primitive=Island
-id=25452
+id=25451
 rarity=L
 [/card]
 [card]
 primitive=Island
-id=25451
+id=25452
 rarity=L
 [/card]
 [card]
@@ -151,12 +152,12 @@ rarity=U
 [/card]
 [card]
 primitive=Mountain
-id=25481
+id=25480
 rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=25480
+id=25481
 rarity=L
 [/card]
 [card]
@@ -176,12 +177,12 @@ rarity=U
 [/card]
 [card]
 primitive=Plains
-id=25454
+id=25453
 rarity=L
 [/card]
 [card]
 primitive=Plains
-id=25453
+id=25454
 rarity=L
 [/card]
 [card]
@@ -241,12 +242,12 @@ rarity=C
 [/card]
 [card]
 primitive=Swamp
-id=25479
+id=25478
 rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=25478
+id=25479
 rarity=L
 [/card]
 [card]

projects/mtg/bin/Res/sets/S99/_cards.dat

@@ -1,8 +1,9 @@
 [meta]
 author=Wagic Team
-name=Starter '99
+name=Starter 1999
 block=Starter
 year=1999
+total=173
 [/meta]
 [card]
 primitive=Abyssal Horror
@@ -246,16 +247,6 @@ rarity=C
 [/card]
 [card]
 primitive=Forest
-id=21807
-rarity=L
-[/card]
-[card]
-primitive=Forest
-id=21808
-rarity=L
-[/card]
-[card]
-primitive=Forest
 id=21805
 rarity=L
 [/card]
@@ -265,6 +256,16 @@ id=21806
 rarity=L
 [/card]
 [card]
+primitive=Forest
+id=21807
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=21808
+rarity=L
+[/card]
+[card]
 primitive=Gerrard's Wisdom
 id=20386
 rarity=R
@@ -381,12 +382,12 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=21800
+id=21795
 rarity=L
 [/card]
 [card]
 primitive=Island
-id=21795
+id=21800
 rarity=L
 [/card]
 [card]
@@ -461,7 +462,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=21804
+id=21802
 rarity=L
 [/card]
 [card]
@@ -471,7 +472,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=21802
+id=21804
 rarity=L
 [/card]
 [card]
@@ -536,7 +537,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=21792
+id=21790
 rarity=L
 [/card]
 [card]
@@ -546,7 +547,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=21790
+id=21792
 rarity=L
 [/card]
 [card]
@@ -711,25 +712,25 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=21797
-rarity=L
-[/card]
-[card]
-primitive=Swamp
-id=21799
-rarity=L
-[/card]
-[card]
-primitive=Swamp
 id=21796
 rarity=L
 [/card]
 [card]
 primitive=Swamp
+id=21797
+rarity=L
+[/card]
+[card]
+primitive=Swamp
 id=21798
 rarity=L
 [/card]
 [card]
+primitive=Swamp
+id=21799
+rarity=L
+[/card]
+[card]
 primitive=Sylvan Basilisk
 id=20218
 rarity=R