Commit Graph

37527 Commits

Author SHA1 Message Date
swordshine
1911d6915c Merge branch 'patch' into 'master'
DOM: Added some cards

See merge request core-developers/forge!373
2018-04-10 13:10:45 +00:00
maustin
b4526df691 Merge branch 'master' into historicformats 2018-04-10 14:07:06 +01:00
Luke Way
6e0ba80d12 Tokens created with Karn's third ability only buff themselves 2018-04-10 09:05:54 -04:00
Luke Way
48fdac42f4 Tempest Djinn has Flying 2018-04-10 09:04:54 -04:00
Luke Way
cb5dca5c69 Zahid is Legendary 2018-04-10 09:04:16 -04:00
Misha Colbourne
36c699970b DOM: Added some cards 2018-04-10 12:23:52 +00:00
Misha Colbourne
7ebb70247c DOM: Added some cards 2018-04-10 12:21:38 +00:00
Misha Colbourne
4a65c70668 DOM: Added some cards 2018-04-10 12:20:04 +00:00
austinio7116
4f6cddebd3 Readded corrected type 1/2 renamed formats 2018-04-10 10:06:41 +01:00
Michael Kamensky
b7a0500f25 Merge branch 'cleanup-multiplayer-android' into 'master'
Cleanup multiplayer Android code, fix player heights in two player mode in Landscape orientation

See merge request core-developers/forge!371
2018-04-10 08:58:33 +00:00
Agetian
809b047523 - Added PS_RIX1 puzzle.
- Fixed Puzzle Mode init for setting the player's hand size which sometimes failed to work.
2018-04-10 11:56:07 +03:00
maustin
ae2c56abce Updated GameFormat reader to support nested folders plus user defined custom formats from their local user directory. Moved Digital formats to a subfolder to demonstrate 2018-04-10 09:49:02 +01:00
austinio7116
68ad165fb1 Updated tooltip on filter to show additional cards in format
Updated restricted and banned lists from new historic formats to use semicolons instead of commas as required
2018-04-10 09:26:40 +01:00
Agetian
afe040d0b6 - Minor cleanup. 2018-04-10 10:58:51 +03:00
Agetian
9a43c1b3ae - Ensure that players have equal player panel heights in a two-player game in Landscape mode 2018-04-10 10:56:33 +03:00
Agetian
7e58e204ed - Code style cleanup/unification in multiplayer Forge for Android. 2018-04-10 10:49:24 +03:00
maustin
e51d39dcc3 Removed duplicate renamed formats
Corrected extended additional cards list to separate with ; not , - I've realized all the other historic formats have this issue in their banned/restricted list and will need updating
2018-04-10 08:25:08 +01:00
maustin
93047c5fda Merge remote-tracking branch 'origin/historicformats' into historicformats
# Conflicts:
#	forge-game/src/main/java/forge/game/GameFormat.java
#	forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java
#	forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
#	forge-gui/res/formats/Amonkhet Block.txt
#	forge-gui/res/formats/Antiquities.txt
#	forge-gui/res/formats/Arabian Nights.txt
#	forge-gui/res/formats/Aug 2 1994.txt
#	forge-gui/res/formats/Battle for Zendikar Block.txt
#	forge-gui/res/formats/Classic Restricted, Apr 1999.txt
#	forge-gui/res/formats/Classic Restricted, Classic Sixth Edition.txt
#	forge-gui/res/formats/Classic Restricted, Exodus.txt
#	forge-gui/res/formats/Classic Restricted, Fifth Edition.txt
#	forge-gui/res/formats/Classic Restricted, Jan 1997.txt
#	forge-gui/res/formats/Classic Restricted, Jan 1999.txt
#	forge-gui/res/formats/Classic Restricted, Mirage.txt
#	forge-gui/res/formats/Classic Restricted, Oct 1996.txt
#	forge-gui/res/formats/Classic Restricted, Stronghold.txt
#	forge-gui/res/formats/Classic Restricted, Tempest.txt
#	forge-gui/res/formats/Classic Restricted, Urza's Destiny.txt
#	forge-gui/res/formats/Classic Restricted, Urza's Legacy.txt
#	forge-gui/res/formats/Classic Restricted, Urza's Saga.txt
#	forge-gui/res/formats/Classic Restricted, Visions.txt
#	forge-gui/res/formats/Classic Restricted, Weatherlight.txt
#	forge-gui/res/formats/Classic, Apr 1999.txt
#	forge-gui/res/formats/Classic, Classic Sixth Edition.txt
#	forge-gui/res/formats/Classic, Exodus.txt
#	forge-gui/res/formats/Classic, Fifth Edition.txt
#	forge-gui/res/formats/Classic, Mirage.txt
#	forge-gui/res/formats/Classic, Oct 1996.txt
#	forge-gui/res/formats/Classic, Stronghold.txt
#	forge-gui/res/formats/Classic, Tempest.txt
#	forge-gui/res/formats/Classic, Urza's Destiny.txt
#	forge-gui/res/formats/Classic, Urza's Legacy.txt
#	forge-gui/res/formats/Classic, Urza's Saga.txt
#	forge-gui/res/formats/Classic, Visions.txt
#	forge-gui/res/formats/Classic, Weatherlight.txt
#	forge-gui/res/formats/Conspiracy.txt
#	forge-gui/res/formats/Duels.txt
#	forge-gui/res/formats/Extended, Alara Reborn.txt
#	forge-gui/res/formats/Extended, Apr 1999.txt
#	forge-gui/res/formats/Extended, Apr 2000.txt
#	forge-gui/res/formats/Extended, Apr 2001.txt
#	forge-gui/res/formats/Extended, Aug 1999.txt
#	forge-gui/res/formats/Extended, Avacyn Restored.txt
#	forge-gui/res/formats/Extended, Betrayers of Kamigawa.txt
#	forge-gui/res/formats/Extended, Champions of Kamigawa.txt
#	forge-gui/res/formats/Extended, Classic Sixth Edition.txt
#	forge-gui/res/formats/Extended, Coldsnap.txt
#	forge-gui/res/formats/Extended, Conflux.txt
#	forge-gui/res/formats/Extended, Dark Ascension.txt
#	forge-gui/res/formats/Extended, Darksteel.txt
#	forge-gui/res/formats/Extended, Dissension.txt
#	forge-gui/res/formats/Extended, Eighth Edition.txt
#	forge-gui/res/formats/Extended, Eventide.txt
#	forge-gui/res/formats/Extended, Exodus.txt
#	forge-gui/res/formats/Extended, Fifth Dawn.txt
#	forge-gui/res/formats/Extended, Future Sight.txt
#	forge-gui/res/formats/Extended, Guildpact.txt
#	forge-gui/res/formats/Extended, Innistrad.txt
#	forge-gui/res/formats/Extended, Invasion.txt
#	forge-gui/res/formats/Extended, Jan 1999.txt
#	forge-gui/res/formats/Extended, Jan 2004.txt
#	forge-gui/res/formats/Extended, Judgment.txt
#	forge-gui/res/formats/Extended, July 2010.txt
#	forge-gui/res/formats/Extended, Legions.txt
#	forge-gui/res/formats/Extended, Lorwyn.txt
#	forge-gui/res/formats/Extended, Magic 2010.txt
#	forge-gui/res/formats/Extended, Magic 2011.txt
#	forge-gui/res/formats/Extended, Magic 2012.txt
#	forge-gui/res/formats/Extended, Magic 2013.txt
#	forge-gui/res/formats/Extended, Mercadian Masques.txt
#	forge-gui/res/formats/Extended, Mirrodin Besieged.txt
#	forge-gui/res/formats/Extended, Mirrodin.txt
#	forge-gui/res/formats/Extended, Morningtide.txt
#	forge-gui/res/formats/Extended, Nemesis.txt
#	forge-gui/res/formats/Extended, New Phyrexia.txt
#	forge-gui/res/formats/Extended, Ninth Edition.txt
#	forge-gui/res/formats/Extended, Oct 1999.txt
#	forge-gui/res/formats/Extended, Oct 2003.txt
#	forge-gui/res/formats/Extended, October 2011.txt
#	forge-gui/res/formats/Extended, Odyssey.txt
#	forge-gui/res/formats/Extended, Onslaught.txt
#	forge-gui/res/formats/Extended, Planar Chaos.txt
#	forge-gui/res/formats/Extended, Planeshift.txt
#	forge-gui/res/formats/Extended, Prophecy.txt
#	forge-gui/res/formats/Extended, Ravnica_ City of Guilds.txt
#	forge-gui/res/formats/Extended, Rise of the Eldrazi.txt
#	forge-gui/res/formats/Extended, Saviors of Kamigawa.txt
#	forge-gui/res/formats/Extended, Scars of Mirrodin.txt
#	forge-gui/res/formats/Extended, Scourge.txt
#	forge-gui/res/formats/Extended, Sep 2004.txt
#	forge-gui/res/formats/Extended, Sep 2005.txt
#	forge-gui/res/formats/Extended, Sep 2008.txt
#	forge-gui/res/formats/Extended, Seventh Edition.txt
#	forge-gui/res/formats/Extended, Shadowmoor.txt
#	forge-gui/res/formats/Extended, Shards of Alara.txt
#	forge-gui/res/formats/Extended, Stronghold.txt
#	forge-gui/res/formats/Extended, Tempest.txt
#	forge-gui/res/formats/Extended, Tenth Edition.txt
#	forge-gui/res/formats/Extended, Time Spiral.txt
#	forge-gui/res/formats/Extended, Torment.txt
#	forge-gui/res/formats/Extended, Urza's Destiny.txt
#	forge-gui/res/formats/Extended, Urza's Legacy.txt
#	forge-gui/res/formats/Extended, Urza's Saga.txt
#	forge-gui/res/formats/Extended, Weatherlight.txt
#	forge-gui/res/formats/Extended, Worldwake.txt
#	forge-gui/res/formats/Extended, Zendikar.txt
#	forge-gui/res/formats/Fallen Empires.txt
#	forge-gui/res/formats/Feb 23 1994.txt
#	forge-gui/res/formats/Ice Age Block Constructed, Coldsnap.txt
#	forge-gui/res/formats/Ice Age Block.txt
#	forge-gui/res/formats/Ice Age-Only, Oct 1996.txt
#	forge-gui/res/formats/Innistrad Block Constructed, April 2012.txt
#	forge-gui/res/formats/Innistrad Block Constructed, Avacyn Restored.txt
#	forge-gui/res/formats/Innistrad Block Constructed, Dark Ascension.txt
#	forge-gui/res/formats/Innistrad Block Constructed, Innistrad.txt
#	forge-gui/res/formats/Innistrad-Avacyn Restored Block.txt
#	forge-gui/res/formats/Invasion Block Constructed, Apocalypse.txt
#	forge-gui/res/formats/Invasion Block Constructed, Invasion.txt
#	forge-gui/res/formats/Invasion Block Constructed, Planeshift.txt
#	forge-gui/res/formats/Invasion Block.txt
#	forge-gui/res/formats/Ixalan Block.txt
#	forge-gui/res/formats/Jan 1999 Classic.txt
#	forge-gui/res/formats/Jan 25 1994.txt
#	forge-gui/res/formats/Jun 13 1994.txt
#	forge-gui/res/formats/Kaladesh Block.txt
#	forge-gui/res/formats/Kamigawa Block Constructed, Betrayers of Kamigawa.txt
#	forge-gui/res/formats/Kamigawa Block Constructed, Champions of Kamigawa.txt
#	forge-gui/res/formats/Kamigawa Block Constructed, Saviors of Kamigawa.txt
#	forge-gui/res/formats/Kamigawa Block.txt
#	forge-gui/res/formats/Khans of Tarkir Block.txt
#	forge-gui/res/formats/Legacy, Alara Reborn.txt
#	forge-gui/res/formats/Legacy, Avacyn Restored.txt
#	forge-gui/res/formats/Legacy, Betrayers of Kamigawa.txt
#	forge-gui/res/formats/Legacy, Champions of Kamigawa.txt
#	forge-gui/res/formats/Legacy, Coldsnap.txt
#	forge-gui/res/formats/Legacy, Conflux.txt
#	forge-gui/res/formats/Legacy, Dark Ascension.txt
#	forge-gui/res/formats/Legacy, Dissension.txt
#	forge-gui/res/formats/Legacy, Eventide.txt
#	forge-gui/res/formats/Legacy, Future Sight.txt
#	forge-gui/res/formats/Legacy, Guildpact.txt
#	forge-gui/res/formats/Legacy, Innistrad.txt
#	forge-gui/res/formats/Legacy, January 2011.txt
#	forge-gui/res/formats/Legacy, July 2010.txt
#	forge-gui/res/formats/Legacy, July 2012.txt
#	forge-gui/res/formats/Legacy, Jun 2007.txt
#	forge-gui/res/formats/Legacy, Lorwyn.txt
#	forge-gui/res/formats/Legacy, Magic 2010.txt
#	forge-gui/res/formats/Legacy, Magic 2011.txt
#	forge-gui/res/formats/Legacy, Magic 2012.txt
#	forge-gui/res/formats/Legacy, Magic 2013.txt
#	forge-gui/res/formats/Legacy, Mirrodin Besieged.txt
#	forge-gui/res/formats/Legacy, Morningtide.txt
#	forge-gui/res/formats/Legacy, New Phyrexia.txt
#	forge-gui/res/formats/Legacy, Ninth Edition.txt
#	forge-gui/res/formats/Legacy, October 2009.txt
#	forge-gui/res/formats/Legacy, Planar Chaos.txt
#	forge-gui/res/formats/Legacy, Ravnica_ City of Guilds.txt
#	forge-gui/res/formats/Legacy, Rise of the Eldrazi.txt
#	forge-gui/res/formats/Legacy, Saviors of Kamigawa.txt
#	forge-gui/res/formats/Legacy, Scars of Mirrodin.txt
#	forge-gui/res/formats/Legacy, Sep 2007.txt
#	forge-gui/res/formats/Legacy, Sep 2008.txt
#	forge-gui/res/formats/Legacy, Shadowmoor.txt
#	forge-gui/res/formats/Legacy, Shards of Alara.txt
#	forge-gui/res/formats/Legacy, Tenth Edition.txt
#	forge-gui/res/formats/Legacy, Time Spiral.txt
#	forge-gui/res/formats/Legacy, Worldwake.txt
#	forge-gui/res/formats/Legacy, Zendikar.txt
#	forge-gui/res/formats/Legends.txt
#	forge-gui/res/formats/Limited Edition Alpha.txt
#	forge-gui/res/formats/Limited Edition Beta.txt
#	forge-gui/res/formats/Lorwyn Block Constructed, Lorwyn.txt
#	forge-gui/res/formats/Lorwyn Block Constructed, Morningtide.txt
#	forge-gui/res/formats/Lorwyn-Shadowmoor Block Constructed, Eventide.txt
#	forge-gui/res/formats/Lorwyn-Shadowmoor Block Constructed, Shadowmoor.txt
#	forge-gui/res/formats/Lorwyn-Shadowmoor Block.txt
#	forge-gui/res/formats/MTGO.txt
#	forge-gui/res/formats/Mar 23 1994.txt
#	forge-gui/res/formats/Masques Block Constructed, Mercadian Masques.txt
#	forge-gui/res/formats/Masques Block Constructed, Nemesis.txt
#	forge-gui/res/formats/Masques Block Constructed, Prophecy.txt
#	forge-gui/res/formats/Masques Block.txt
#	forge-gui/res/formats/May 1994.txt
#	forge-gui/res/formats/MicroProse.txt
#	forge-gui/res/formats/Mirage Block.txt
#	forge-gui/res/formats/Mirrodin Block Constructed, Darksteel.txt
#	forge-gui/res/formats/Mirrodin Block Constructed, Fifth Dawn.txt
#	forge-gui/res/formats/Mirrodin Block Constructed, Jun 2004.txt
#	forge-gui/res/formats/Mirrodin Block Constructed, Mar 2006.txt
#	forge-gui/res/formats/Mirrodin Block Constructed, Mirrodin.txt
#	forge-gui/res/formats/Mirrodin Block.txt
#	forge-gui/res/formats/Modern, August 2011.txt
#	forge-gui/res/formats/Modern, Avacyn Restored.txt
#	forge-gui/res/formats/Modern, Dark Ascension.txt
#	forge-gui/res/formats/Modern, Innistrad.txt
#	forge-gui/res/formats/Modern, January 2012.txt
#	forge-gui/res/formats/Modern, Magic 2013.txt
#	forge-gui/res/formats/Modern, October 2011.txt
#	forge-gui/res/formats/Oct 10 1994.txt
#	forge-gui/res/formats/Odyssey Block Constructed, Judgment.txt
#	forge-gui/res/formats/Odyssey Block Constructed, Odyssey.txt
#	forge-gui/res/formats/Odyssey Block Constructed, Torment.txt
#	forge-gui/res/formats/Odyssey Block.txt
#	forge-gui/res/formats/Onslaught Block Constructed, Legions.txt
#	forge-gui/res/formats/Onslaught Block Constructed, Onslaught.txt
#	forge-gui/res/formats/Onslaught Block Constructed, Scourge.txt
#	forge-gui/res/formats/Onslaught Block.txt
#	forge-gui/res/formats/Ravnica Block Constructed, Dissension.txt
#	forge-gui/res/formats/Ravnica Block Constructed, Guildpact.txt
#	forge-gui/res/formats/Ravnica Block Constructed, Ravnica_ City of Guilds.txt
#	forge-gui/res/formats/Ravnica Block.txt
#	forge-gui/res/formats/Return to Ravnica Block.txt
#	forge-gui/res/formats/Revised Edition.txt
#	forge-gui/res/formats/Scars of Mirrodin Block Constructed, Mirrodin Besieged.txt
#	forge-gui/res/formats/Scars of Mirrodin Block Constructed, New Phyrexia.txt
#	forge-gui/res/formats/Scars of Mirrodin Block Constructed, Scars of Mirrodin.txt
#	forge-gui/res/formats/Scars of Mirrodin Block.txt
#	forge-gui/res/formats/Shadows over Innistrad Block.txt
#	forge-gui/res/formats/Shards of Alara Block Constructed, Alara Reborn.txt
#	forge-gui/res/formats/Shards of Alara Block Constructed, Conflux.txt
#	forge-gui/res/formats/Shards of Alara Block Constructed, Shards of Alara.txt
#	forge-gui/res/formats/Shards of Alara Block.txt
#	forge-gui/res/formats/Standard, Alara Reborn.txt
#	forge-gui/res/formats/Standard, Apocalypse.txt
#	forge-gui/res/formats/Standard, Apr 1999.txt
#	forge-gui/res/formats/Standard, Avacyn Restored.txt
#	forge-gui/res/formats/Standard, Betrayers of Kamigawa.txt
#	forge-gui/res/formats/Standard, Champions of Kamigawa.txt
#	forge-gui/res/formats/Standard, Classic Sixth Edition.txt
#	forge-gui/res/formats/Standard, Coldsnap.txt
#	forge-gui/res/formats/Standard, Conflux.txt
#	forge-gui/res/formats/Standard, Dark Ascension.txt
#	forge-gui/res/formats/Standard, Darksteel.txt
#	forge-gui/res/formats/Standard, Dissension.txt
#	forge-gui/res/formats/Standard, Eighth Edition.txt
#	forge-gui/res/formats/Standard, Eventide.txt
#	forge-gui/res/formats/Standard, Exodus.txt
#	forge-gui/res/formats/Standard, Fifth Dawn.txt
#	forge-gui/res/formats/Standard, Fifth Edition.txt
#	forge-gui/res/formats/Standard, Future Sight.txt
#	forge-gui/res/formats/Standard, Guildpact.txt
#	forge-gui/res/formats/Standard, Innistrad.txt
#	forge-gui/res/formats/Standard, Invasion.txt
#	forge-gui/res/formats/Standard, Jan 1997.txt
#	forge-gui/res/formats/Standard, Jan 1999.txt
#	forge-gui/res/formats/Standard, Judgment.txt
#	forge-gui/res/formats/Standard, July 2011.txt
#	forge-gui/res/formats/Standard, Jun 2004.txt
#	forge-gui/res/formats/Standard, Legions.txt
#	forge-gui/res/formats/Standard, Lorwyn.txt
#	forge-gui/res/formats/Standard, Magic 2010.txt
#	forge-gui/res/formats/Standard, Magic 2011.txt
#	forge-gui/res/formats/Standard, Magic 2012.txt
#	forge-gui/res/formats/Standard, Magic 2013.txt
#	forge-gui/res/formats/Standard, Mar 2005.txt
#	forge-gui/res/formats/Standard, Mercadian Masques.txt
#	forge-gui/res/formats/Standard, Mirage.txt
#	forge-gui/res/formats/Standard, Mirrodin Besieged.txt
#	forge-gui/res/formats/Standard, Mirrodin.txt
#	forge-gui/res/formats/Standard, Morningtide.txt
#	forge-gui/res/formats/Standard, Nemesis.txt
#	forge-gui/res/formats/Standard, New Phyrexia.txt
#	forge-gui/res/formats/Standard, Ninth Edition.txt
#	forge-gui/res/formats/Standard, Oct 1996.txt
#	forge-gui/res/formats/Standard, Odyssey.txt
#	forge-gui/res/formats/Standard, Onslaught.txt
#	forge-gui/res/formats/Standard, Planar Chaos.txt
#	forge-gui/res/formats/Standard, Planeshift.txt
#	forge-gui/res/formats/Standard, Prophecy.txt
#	forge-gui/res/formats/Standard, Ravnica_City of Guilds.txt
#	forge-gui/res/formats/Standard, Rise of the Eldrazi.txt
#	forge-gui/res/formats/Standard, Saviors of Kamigawa.txt
#	forge-gui/res/formats/Standard, Scars of Mirrodin.txt
#	forge-gui/res/formats/Standard, Scourge.txt
#	forge-gui/res/formats/Standard, Seventh Edition.txt
#	forge-gui/res/formats/Standard, Shadowmoor.txt
#	forge-gui/res/formats/Standard, Shards of Alara.txt
#	forge-gui/res/formats/Standard, Stronghold.txt
#	forge-gui/res/formats/Standard, Tempest.txt
#	forge-gui/res/formats/Standard, Tenth Edition.txt
#	forge-gui/res/formats/Standard, Time Spiral.txt
#	forge-gui/res/formats/Standard, Torment.txt
#	forge-gui/res/formats/Standard, Urza's Destiny.txt
#	forge-gui/res/formats/Standard, Urza's Legacy.txt
#	forge-gui/res/formats/Standard, Urza's Saga.txt
#	forge-gui/res/formats/Standard, Visions.txt
#	forge-gui/res/formats/Standard, Weatherlight.txt
#	forge-gui/res/formats/Standard, Worldwake.txt
#	forge-gui/res/formats/Standard, Zendikar.txt
#	forge-gui/res/formats/Tempest Block, Tempest.txt
#	forge-gui/res/formats/Tempest Block.txt
#	forge-gui/res/formats/The Dark.txt
#	forge-gui/res/formats/Theros Block.txt
#	forge-gui/res/formats/Time Spiral Block Constructed, Future Sight.txt
#	forge-gui/res/formats/Time Spiral Block Constructed, Planar Chaos.txt
#	forge-gui/res/formats/Time Spiral Block Constructed, Time Spiral.txt
#	forge-gui/res/formats/Time Spiral Block.txt
#	forge-gui/res/formats/Type 1, Apocalypse.txt
#	forge-gui/res/formats/Type 1, Apr 2003.txt
#	forge-gui/res/formats/Type 1, Chronicles.txt
#	forge-gui/res/formats/Type 1, Darksteel.txt
#	forge-gui/res/formats/Type 1, Eighth Edition.txt
#	forge-gui/res/formats/Type 1, Fifth Dawn.txt
#	forge-gui/res/formats/Type 1, Fourth Edition.txt
#	forge-gui/res/formats/Type 1, Ice Age.txt
#	forge-gui/res/formats/Type 1, Invasion.txt
#	forge-gui/res/formats/Type 1, Jan 2002.txt
#	forge-gui/res/formats/Type 1, Jan 2004.txt
#	forge-gui/res/formats/Type 1, Judgment.txt
#	forge-gui/res/formats/Type 1, Jul 2003.txt
#	forge-gui/res/formats/Type 1, Legions.txt
#	forge-gui/res/formats/Type 1, Mercadian Masques.txt
#	forge-gui/res/formats/Type 1, Mirrodin.txt
#	forge-gui/res/formats/Type 1, Nemesis.txt
#	forge-gui/res/formats/Type 1, Oct 1999.txt
#	forge-gui/res/formats/Type 1, Oct 2000.txt
#	forge-gui/res/formats/Type 1, Odyssey.txt
#	forge-gui/res/formats/Type 1, Onslaught.txt
#	forge-gui/res/formats/Type 1, Planeshift.txt
#	forge-gui/res/formats/Type 1, Prophecy.txt
#	forge-gui/res/formats/Type 1, Scourge.txt
#	forge-gui/res/formats/Type 1, Seventh Edition.txt
#	forge-gui/res/formats/Type 1, Torment.txt
#	forge-gui/res/formats/Type 1.5, Apocalypse.txt
#	forge-gui/res/formats/Type 1.5, Apr 2003.txt
#	forge-gui/res/formats/Type 1.5, Darksteel.txt
#	forge-gui/res/formats/Type 1.5, Eighth Edition.txt
#	forge-gui/res/formats/Type 1.5, Fifth Dawn.txt
#	forge-gui/res/formats/Type 1.5, Invasion.txt
#	forge-gui/res/formats/Type 1.5, Jan 2002.txt
#	forge-gui/res/formats/Type 1.5, Jan 2004.txt
#	forge-gui/res/formats/Type 1.5, Judgment.txt
#	forge-gui/res/formats/Type 1.5, Jul 2003.txt
#	forge-gui/res/formats/Type 1.5, Legions.txt
#	forge-gui/res/formats/Type 1.5, Mercadian Masques.txt
#	forge-gui/res/formats/Type 1.5, Mirrodin.txt
#	forge-gui/res/formats/Type 1.5, Nemesis.txt
#	forge-gui/res/formats/Type 1.5, Oct 1999.txt
#	forge-gui/res/formats/Type 1.5, Oct 2000.txt
#	forge-gui/res/formats/Type 1.5, Odyssey.txt
#	forge-gui/res/formats/Type 1.5, Onslaught.txt
#	forge-gui/res/formats/Type 1.5, Planeshift.txt
#	forge-gui/res/formats/Type 1.5, Prophecy.txt
#	forge-gui/res/formats/Type 1.5, Scourge.txt
#	forge-gui/res/formats/Type 1.5, Sep 2004.txt
#	forge-gui/res/formats/Type 1.5, Seventh Edition.txt
#	forge-gui/res/formats/Type 1.5, Torment.txt
#	forge-gui/res/formats/Type 2, Chronicles.txt
#	forge-gui/res/formats/Type 2, Fourth Edition.txt
#	forge-gui/res/formats/Type 2, Ice Age.txt
#	forge-gui/res/formats/Un-Sets.txt
#	forge-gui/res/formats/Unlimited Edition.txt
#	forge-gui/res/formats/Urza Block Constructed, Apr 1999.txt
#	forge-gui/res/formats/Urza Block Constructed, Urza's Destiny.txt
#	forge-gui/res/formats/Urza Block Constructed, Urza's Legacy.txt
#	forge-gui/res/formats/Urza Block.txt
#	forge-gui/res/formats/Urza's Saga Block, Urza's Saga.txt
#	forge-gui/res/formats/Vintage, Alara Reborn.txt
#	forge-gui/res/formats/Vintage, Avacyn Restored.txt
#	forge-gui/res/formats/Vintage, Betrayers of Kamigawa.txt
#	forge-gui/res/formats/Vintage, Champions of Kamigawa.txt
#	forge-gui/res/formats/Vintage, Coldsnap.txt
#	forge-gui/res/formats/Vintage, Conflux.txt
#	forge-gui/res/formats/Vintage, Dark Ascension.txt
#	forge-gui/res/formats/Vintage, Dec 2004.txt
#	forge-gui/res/formats/Vintage, Dissension.txt
#	forge-gui/res/formats/Vintage, Eventide.txt
#	forge-gui/res/formats/Vintage, Future Sight.txt
#	forge-gui/res/formats/Vintage, Guildpact.txt
#	forge-gui/res/formats/Vintage, Innistrad.txt
#	forge-gui/res/formats/Vintage, July 2009.txt
#	forge-gui/res/formats/Vintage, Jun 2007.txt
#	forge-gui/res/formats/Vintage, Jun 2008.txt
#	forge-gui/res/formats/Vintage, Lorwyn.txt
#	forge-gui/res/formats/Vintage, Magic 2010.txt
#	forge-gui/res/formats/Vintage, Magic 2011.txt
#	forge-gui/res/formats/Vintage, Magic 2012.txt
#	forge-gui/res/formats/Vintage, Magic 2013.txt
#	forge-gui/res/formats/Vintage, Mar 2005.txt
#	forge-gui/res/formats/Vintage, Mirrodin Besieged.txt
#	forge-gui/res/formats/Vintage, Morningtide.txt
#	forge-gui/res/formats/Vintage, New Phyrexia.txt
#	forge-gui/res/formats/Vintage, Ninth Edition.txt
#	forge-gui/res/formats/Vintage, October 2011.txt
#	forge-gui/res/formats/Vintage, Planar Chaos.txt
#	forge-gui/res/formats/Vintage, Ravnica_ City of Guilds.txt
#	forge-gui/res/formats/Vintage, Rise of the Eldrazi.txt
#	forge-gui/res/formats/Vintage, Saviors of Kamigawa.txt
#	forge-gui/res/formats/Vintage, Scars of Mirrodin.txt
#	forge-gui/res/formats/Vintage, Sep 2004.txt
#	forge-gui/res/formats/Vintage, Sep 2005.txt
#	forge-gui/res/formats/Vintage, Sep 2007.txt
#	forge-gui/res/formats/Vintage, Sep 2008.txt
#	forge-gui/res/formats/Vintage, Shadowmoor.txt
#	forge-gui/res/formats/Vintage, Shards of Alara.txt
#	forge-gui/res/formats/Vintage, Tenth Edition.txt
#	forge-gui/res/formats/Vintage, Time Spiral.txt
#	forge-gui/res/formats/Vintage, Worldwake.txt
#	forge-gui/res/formats/Vintage, Zendikar.txt
#	forge-gui/res/formats/Zendikar Block Constructed, Rise of the Eldrazi.txt
#	forge-gui/res/formats/Zendikar Block Constructed, Worldwake.txt
#	forge-gui/res/formats/Zendikar Block Constructed, Zendikar.txt
#	forge-gui/res/formats/Zendikar Block.txt
2018-04-10 07:35:36 +01:00
austinio7116
a5d964a334 Updated formats to include subtype enum and made a first batch attempt to set the value
Now sorting formats by type, subtype then name
Added new "additional" property to gameformats to allow additional non printed but legal cards to be included e.g. dual lands in extended 1999
2018-04-10 07:28:31 +01:00
Hanmac
b5be110f0c Replacement Effect instead of StaticDamage 2018-04-10 07:15:41 +02:00
Hanmac
81ea744e38 fixed Druid's Deliverance 2018-04-10 07:15:26 +02:00
austinio7116
3e1f5c7632 Added set code validation check to gameformat parser 2018-04-09 23:35:08 +01:00
austinio7116
00a2a1ef4d Enabled historic/casual formats as starting pools for quest mode on desktop 2018-04-09 23:35:08 +01:00
maustin
ba793ac44e Renamed "Sanctioned format" to "Defined format" in quest starting pool options and enabled selecting from historic and other non-sanctioned formats in android quests 2018-04-09 23:35:08 +01:00
austinio7116
49dd3c0659 Modified format filter selection options to support large numbers of historic formats in the menu - uses a similar UI to the set selector 2018-04-09 23:35:08 +01:00
austinio7116
def7ba5faf Updates to UI to separate out format filters 2018-04-09 23:35:08 +01:00
austinio7116
e01eab131f Attempt to add other formats to format filter submenu on android 2018-04-09 23:35:08 +01:00
austinio7116
0636695052 Just use sanctioned formats where relevant, exclude historic formats where needed - may add these back later via new UI elements 2018-04-09 23:35:08 +01:00
austinio7116
1e893af9df Re-parsed historic formats to ensure AAA, BBB with correct spacing
Reindexed so order field increments only once between each format
2018-04-09 23:35:08 +01:00
austinio7116
0f5c6c0b0c Added individual formats from parsed historic formats.txt file 2018-04-09 23:35:08 +01:00
Michael Kamensky
f014285143 Merge branch 'patch' into 'master'
DOM: Added some cards

See merge request core-developers/forge!370
2018-04-09 17:31:00 +00:00
Misha Colbourne
2f194a99d3 DOM: Added some cards 2018-04-09 16:00:31 +00:00
Michael Kamensky
63094bee7a Merge branch 'cube-update' into 'master'
- Update some ported draft cubes and add a new cube (Legacy 2018).

See merge request core-developers/forge!369
2018-04-09 09:00:15 +00:00
Agetian
7d2965ee34 - Update some ported draft cubes and add the February 2018 legacy cube. 2018-04-09 11:59:02 +03:00
Michael Kamensky
aabfb0ab1c Merge branch 'deckgenimprovements' into 'master'
Updated card deck generation files, plus fixed bug with recent generation code change

See merge request core-developers/forge!368
2018-04-09 08:43:09 +00:00
austinio7116
bd321edd20 Updated card deck generation files, plus fixed bug with recent generation code change 2018-04-09 09:31:58 +01:00
Michael Kamensky
334be5afc7 Merge branch 'CopyPermPopulate' into 'master'
CopyPerm: rewoke and update with Populate

See merge request core-developers/forge!367
2018-04-09 08:28:56 +00:00
Hanmac
0bc12e744e CopyPerm: rewoke and update with Populate 2018-04-09 07:50:44 +02:00
austinio7116
15772e20ac Merge branch 'vital-promo-sets' into 'master'
Vital promo sets

See merge request core-developers/forge!366
2018-04-09 05:24:26 +00:00
Rob Schnautz
75d3972196 Delete Promo set for Gatherer.txt 2018-04-08 20:47:06 +00:00
Rob Schnautz
e89d6f7de3 Update DragonCon 1994.txt 2018-04-08 20:36:56 +00:00
Rob Schnautz
1a5f79732a Add new file 2018-04-08 20:35:52 +00:00
Rob Schnautz
1e2077cf91 Add new file 2018-04-08 20:32:29 +00:00
Rob Schnautz
6dbdfe2fb4 Add new file 2018-04-08 20:31:55 +00:00
Rob Schnautz
e7702f97b0 Add new file 2018-04-08 20:31:15 +00:00
Rob Schnautz
e1c47289c9 Add new file 2018-04-08 20:30:30 +00:00
Michael Kamensky
2efa5f6f14 Merge branch 'assorted-fixes' into 'master'
- Added a missing reference to Chandra, Fire of Kaladesh.

See merge request core-developers/forge!365
2018-04-08 20:06:11 +00:00
Michael Kamensky
bb1ab54d13 Merge branch 'patch' into 'master'
DOM: Added some cards

See merge request core-developers/forge!364
2018-04-08 20:06:09 +00:00
Agetian
f49bd65526 - Added a missing reference to Chandra, Fire of Kaladesh. 2018-04-08 23:04:58 +03:00
austinio7116
37624bec61 Added set code validation check to gameformat parser 2018-04-08 20:21:16 +01:00