betasteward 1e60605d84 Merge branch 'master' of https://github.com/magefree/mage into Network_Upgrade ... Conflicts: Mage.Client/src/main/java/mage/client/cards/Card.java Mage.Client/src/main/java/mage/client/draft/DraftPanel.java Mage.Client/src/main/java/mage/client/game/GamePanel.java Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java		2015-08-25 14:07:31 -04:00
..
assembly	Release 1.4.0v2	2015-05-25 23:33:41 +02:00
java	Merge branch 'master' of https://github.com/magefree/mage into Network_Upgrade	2015-08-25 14:07:31 -04:00
resources	Updated mtg-cards-data with 4 new BFZ cards and all DDP cards. Added DDP set and reprints. Implemented Retreat to Kazandu and Veteran Warleader for BFZ/DDP. Implemented Battle Squadron and Lithophage. Fixed Phage the Untouchable creature type.	2015-08-17 14:20:01 -05:00