Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git

forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java

@@ -1042,7 +1042,7 @@ public final class CMatchUI
         if (delayedReveal != null) {
             reveal(delayedReveal.getMessagePrefix(), delayedReveal.getCards()); //TODO: Merge this into search dialog
         }
-        return (List<GameEntityView>) order(title,"Selected", min, max, optionList, null, null, false);
+        return (List<GameEntityView>) order(title,"Selected", optionList.size() - max, optionList.size() - min, optionList, null, null, false);
     }
 
     @Override

forge-gui/release-files/CHANGES.txt

@@ -1,2 +1,5 @@
 - Bug fixes -
 As always, this release of Forge features an assortment of bug fixes and improvements based on user feedback during the previous release run.
+
+- Random Modern World -
+Just like the random standard world, there is now also a random modern world for quest mode that includes randomly generated deck archetypes and is limited to the modern card pool

forge-gui/res/blockdata/printsheets.txt

@@ -1481,20 +1481,46 @@ Vivien, Nature's Avenger
 Ethereal Elk
 Gnarlback Rhino
 Vivien's Crocodile
+Angelic Guardian
+Bastion Enforcer
+Concordia Pegasus
+Haazda Officer
 Impassioned Orator
 Imperial Outrider
+Ironclad Krovod
+Prowling Caracal
 Serra's Guardian
+Show of Valor
+Siege Mastodon
+Take Vengeance
+Trusted Pegasus
+Coral Merfolk
+Phantom Warrior
 Riddlemaster Sphinx
+Snapping Drake
+Bartizan Bats
+Bogstomper
 Dark Remedy
+Disentomb
 Gravewaker
+Skeleton Archer
 Sorin's Thirst
 Vampire Opportunist
+Walking Corpse
 Engulfing Eruption
+Fearless Halberdier
+Goblin Assailant
+Hostile Minotaur
 Immortal Phoenix
 Nimble Birdsticker
 Rubblebelt Recluse
 Shivan Dragon
+Volcanic Dragon
 Aggressive Mammoth
 Bristling Boar
+Canopy Spider
+Frilled Sandwalla
+Oakenform
 Prized Unicorn
 Titanic Growth
+Woodland Mystic

forge-gui/res/cardsfolder/b/budoka_gardener_dokai_weaver_of_life.txt

@@ -15,7 +15,7 @@ ManaCost:1 G
 Colors:green
 Types:Legendary Creature Human Monk
 PT:3/3
-A:AB$Token | Cost$ 4 G G T | TokenAmount$ 1 | TokenScript$ g_x_x_elemental | LegacyImage$ g x x elemental chk | TokenOwner$ You | SpellDescription$ Create an X/X green Elemental creature token, where X is the number of lands you control.
+A:AB$Token | Cost$ 4 G G T | TokenAmount$ 1 | TokenScript$ g_x_x_elemental | LegacyImage$ g x x elemental chk | TokenPower$ X | TokenToughness$ X | References$ X | TokenOwner$ You | SpellDescription$ Create an X/X green Elemental creature token, where X is the number of lands you control.
 SVar:X:Count$Valid Land.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dokai_weaver_of_life.jpg
 Oracle:{4}{G}{G}, {T}: Create an X/X green Elemental creature token, where X is the number of lands you control.

forge-gui/res/cardsfolder/d/diviners_lockbox.txt

@@ -2,7 +2,7 @@ Name:Diviner's Lockbox
 ManaCost:4
 Types:Artifact
 A:AB$ NameCard | Cost$ 1 T | Defined$ You | SubAbility$ DBReveal | SorcerySpeed$ True | SpellDescription$ Choose a card name, then reveal the top card of your library. If that card has the chosen name, sacrifice CARDNAME and draw three cards. Activate this ability only any time you could cast a sorcery.
-SVar:DBReveal:DB$ PeekAndReveal | NoPeek$ True | RememberRevealed$ True | SubAbility$ DBSac
+SVar:DBReveal:DB$ PeekAndReveal | RememberRevealed$ True | SubAbility$ DBSac
 SVar:DBSac:DB$ Sacrifice | SacValid$ Self | ConditionDefined$ Remembered | ConditionPresent$ Card.NamedCard | ConditionCompare$ GE1 | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | NumCards$ 3 | ConditionDefined$ Remembered | ConditionPresent$ Card.NamedCard | ConditionCompare$ GE1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True