Merge pull request #6 from WagicProject/master

getting master

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 
 ## [latest-master] (https://github.com/WagicProject/wagic/tree/latest-master)
+#### 7/4/16
+- *Merged pull-request:* Fails but I have no idea why [#\717] (https://github.com/WagicProject/wagic/pull/717) ([zethfoxster](https://github.com/zethfoxster))
+
+- *Merged pull-request:* Updated Sets [#\715] (https://github.com/WagicProject/wagic/pull/715) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/2/16
+- *Merged pull-request:* Updated Masters, Beginners, Duels and Vault Sets [#\714] (https://github.com/WagicProject/wagic/pull/714) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/1/16
+- *Merged pull-request:* Cleaned and Sorted all Core and Expansion Sets [#\713] (https://github.com/WagicProject/wagic/pull/713) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* Soulbond Pair Indicator [#\712] (https://github.com/WagicProject/wagic/pull/712) ([kevlahnota](https://github.com/kevlahnota))
 
 #### 6/30/16
 - *Merged pull-request:* Sorted Primitives [#\711] (https://github.com/WagicProject/wagic/pull/711) ([kevlahnota](https://github.com/kevlahnota))

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

@@ -0,0 +1,96 @@
+[meta]
+author=Wagic Team
+name=Commander's Arsenal
+year=2012
+total=18
+[/meta]
+[card]
+primitive=Chaos Warp
+id=338441
+rarity=R
+[/card]
+[card]
+primitive=Command Tower
+id=338442
+rarity=C
+[/card]
+[card]
+primitive=Decree of Pain
+id=338453
+rarity=R
+[/card]
+[card]
+primitive=Desertion
+id=338454
+rarity=R
+[/card]
+[card]
+primitive=Diaochan, Artful Beauty
+id=338449
+rarity=R
+[/card]
+[card]
+primitive=Dragonlair Spider
+id=338446
+rarity=R
+[/card]
+[card]
+primitive=Duplicant
+id=338451
+rarity=R
+[/card]
+[card]
+primitive=Edric, Spymaster of Trest
+id=338443
+rarity=R
+[/card]
+[card]
+primitive=Kaalia of the Vast
+id=338444
+rarity=M
+[/card]
+[card]
+primitive=Loyal Retainers
+id=338450
+rarity=U
+[/card]
+[card]
+primitive=Maelstrom Wanderer
+id=338447
+rarity=M
+[/card]
+[card]
+primitive=Mind's Eye
+id=338452
+rarity=R
+[/card]
+[card]
+primitive=Mirari's Wake
+id=338455
+rarity=R
+[/card]
+[card]
+primitive=Rhystic Study
+id=338457
+rarity=C
+[/card]
+[card]
+primitive=Scroll Rack
+id=338458
+rarity=R
+[/card]
+[card]
+primitive=Sylvan Library
+id=338456
+rarity=R
+[/card]
+[card]
+primitive=The Mimeoplasm
+id=338445
+rarity=M
+[/card]
+[card]
+primitive=Vela the Night-Clad
+id=338448
+rarity=M
+[/card]

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

@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-block=Duel
+name=Premium Deck Series: Fire and Lightning
 year=2010
+total=34
 [/meta]
 [card]
 primitive=Ball Lightning
@@ -115,17 +116,12 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=234739
-rarity=L
-[/card]
-[card]
-primitive=Mountain
 id=234738
 rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=234741
+id=234739
 rarity=L
 [/card]
 [card]
@@ -134,6 +130,11 @@ id=234740
 rarity=L
 [/card]
 [card]
+primitive=Mountain
+id=234741
+rarity=L
+[/card]
+[card]
 primitive=Pillage
 id=234720
 rarity=U

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

@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-block=Premium 
+name=Premium Deck Series: Graveborn
 year=2011
+total=30
 [/meta]
 [card]
 primitive=Animate Dead
@@ -152,4 +153,4 @@ rarity=R
 primitive=Zombie Infestation
 id=270454
 rarity=U
-[/card]
+[/card]

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

@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-block=Premium
+name=Premium Deck Series: Slivers
 year=2009
+total=41
 [/meta]
 [card]
 primitive=Acidic Sliver

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

@@ -0,0 +1,81 @@
+[meta]
+author=Wagic Team
+name=From the Vault: Angels
+year=2015
+total=15
+[/meta]
+[card]
+primitive=Akroma, Angel of Fury
+id=401628
+rarity=M
+[/card]
+[card]
+primitive=Akroma, Angel of Wrath
+id=401629
+rarity=M
+[/card]
+[card]
+primitive=Archangel of Strife
+id=401630
+rarity=M
+[/card]
+[card]
+primitive=Aurelia, the Warleader
+id=401631
+rarity=M
+[/card]
+[card]
+primitive=Avacyn, Angel of Hope
+id=401632
+rarity=M
+[/card]
+[card]
+primitive=Baneslayer Angel
+id=401633
+rarity=M
+[/card]
+[card]
+primitive=Entreat the Angels
+id=401634
+rarity=M
+[/card]
+[card]
+primitive=Exalted Angel
+id=401635
+rarity=M
+[/card]
+[card]
+primitive=Iona, Shield of Emeria
+id=401636
+rarity=M
+[/card]
+[card]
+primitive=Iridescent Angel
+id=401637
+rarity=M
+[/card]
+[card]
+primitive=Jenara, Asura of War
+id=401638
+rarity=M
+[/card]
+[card]
+primitive=Lightning Angel
+id=401639
+rarity=M
+[/card]
+[card]
+primitive=Platinum Angel
+id=401640
+rarity=M
+[/card]
+[card]
+primitive=Serra Angel
+id=401641
+rarity=M
+[/card]
+[card]
+primitive=Tariel, Reckoner of Souls
+id=401642
+rarity=M
+[/card]