Merge remote-tracking branch 'upstream/master'

forge-gui-mobile/src/forge/screens/settings/SettingsPage.java

@@ -109,7 +109,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                     }
         }, 1);
         lstSettings.addItem(new CustomSelectSetting(FPref.UI_CURRENT_AI_PROFILE,
-                "AI Personality",
+                localizer.getMessage("cbpAiProfiles"),
                 localizer.getMessage("nlpAiProfiles"),
                 AiProfileUtil.getProfilesArray()),
                 1);

forge-gui/res/blockdata/printsheets.txt

@@ -1597,4 +1597,81 @@ Sunlit Hoplite
 Ashiok, Sculptor of Fears
 Swimmer in Nightmares
 Mindwrack Harpy
-Ashiok's Forerunner
+Ashiok's Forerunner
+Grasping Giant
+Victory's Envoy
+Sphinx Mindbreaker
+Serpent of Yawning Depths
+Demon of Loathing
+Underworld Sentinel
+Deathbellow War Cry
+Terror of Mount Velus
+Ironscale Hydra
+Treeshaker Chimera
+Elspeth, Sun's Nemesis|THB|2
+Ashiok, Nightmare Muse|THB|2
+Calix, Destiny's Hand|THB|2
+Daxos, Blessed by the Sun|THB|2
+Heliod, Sun-Crowned|THB|2
+Callaphe, Beloved of the Sea|THB|2
+Thassa, Deep-Dwelling|THB|2
+Erebos, Bleak-Hearted|THB|2
+Tymaret, Chosen from Death|THB|2
+Anax, Hardened in the Forge|THB|2
+Purphoros, Bronze-Blooded|THB|2
+Nylea, Keen-Eyed|THB|2
+Renata, Called to the Hunt|THB|2
+Klothys, God of Destiny|THB|2
+Archon of Sun's Grace|THB|2
+Eidolon of Obstruction|THB|2
+Heliod's Intervention|THB|2
+Idyllic Tutor|THB|2
+Shatter the Sky|THB|2
+Ashiok's Erasure|THB|2
+Nadir Kraken|THB|2
+Protean Thaumaturge|THB|2
+Thassa's Intervention|THB|2
+Thassa's Oracle|THB|2
+Thryx, the Sudden Storm|THB|2
+Wavebreak Hippocamp|THB|2
+Aphemia, the Cacophony|THB|2
+Eat to Extinction|THB|2
+Erebos's Intervention|THB|2
+Gravebreaker Lamia|THB|2
+Nightmare Shepherd|THB|2
+Treacherous Blessing|THB|2
+Woe Strider|THB|2
+Ox of Agonas|THB|2
+Phoenix of Ash|THB|2
+Purphoros's Intervention|THB|2
+Storm Herald|THB|2
+Storm's Wrath|THB|2
+Tectonic Giant|THB|2
+Underworld Breach|THB|2
+Arasta of the Endless Web|THB|2
+Dryad of the Ilysian Grove|THB|2
+Mantle of the Wolf|THB|2
+Nessian Boar|THB|2
+Nylea's Intervention|THB|2
+Nyxbloom Ancient|THB|2
+Setessan Champion|THB|2
+Allure of the Unknown|THB|2
+Atris, Oracle of Half-Truths|THB|2
+Bronzehide Lion|THB|2
+Dalakos, Crafter of Wonders|THB|2
+Dream Trawler|THB|2
+Enigmatic Incarnation|THB|2
+Gallia of the Endless Dance|THB|2
+Haktos the Unscarred|THB|2
+Kroxa, Titan of Death's Hunger|THB|2
+Kunoros, Hound of Athreos|THB|2
+Polukranos, Unchained|THB|2
+Uro, Titan of Nature's Wrath|THB|2
+Nyx Lotus|THB|2
+Shadowspear|THB|2
+Labyrinth of Skophos|THB|2
+Temple of Abandon|THB|2
+Temple of Deceit|THB|2
+Temple of Enlightenment|THB|2
+Temple of Malice|THB|2
+Temple of Plenty|THB|2

forge-gui/res/cardsfolder/v/viviens_grizzly.txt

@@ -2,5 +2,8 @@ Name:Vivien's Grizzly
 ManaCost:2 G
 Types:Creature Bear Spirit
 PT:2/3
-A:AB$ Dig | Cost$ 3 G | DigNum$ 1 | ChangeNum$ All | ChangeValid$ Creature,Planeswalker | Optional$ True | PromptToSkipOptionalAbility$ True | DestinationZone$ Hand | AILogic$ Never | SpellDescription$ Look at the top card of your library. If it's a creature or planeswalker card, you may reveal it and put it into your hand. If you don't put the card into your hand, put it on the bottom of your library.
+A:AB$ PeekAndReveal | Cost$ 3 G | AILogic$ EndofOppTurn | PeekAmount$ 1 | RevealValid$ Creature,Planeswalker | RevealOptional$ True | RememberRevealed$ True | SubAbility$ DBChangeZone | SpellDescription$ Look at the top card of your library. If it's a creature or planeswalker card, you may reveal it and put it into your hand. If you don't put the card into your hand, put it on the bottom of your library.
+SVar:DBChangeZone:DB$ ChangeZone | Defined$ TopOfLibrary | Origin$ Library | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Creature,Planeswalker | ConditionCompare$ EQ1 | SubAbility$ DBBottom
+SVar:DBBottom:DB$ ChangeZone | Defined$ TopOfLibrary | Origin$ Library | Destination$ Library | Shuffle$ False | ConditionDefined$ Remembered | ConditionPresent$ Creature,Planeswalker | ConditionCompare$ EQ0 | LibraryPosition$ -1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:{3}{G}: Look at the top card of your library. If it's a creature or planeswalker card, you may reveal it and put it into your hand. If you don't put the card into your hand, put it on the bottom of your library.

forge-gui/res/editions/Theros Beyond Death.txt

@@ -263,6 +263,20 @@ Prerelease=6 Boosters, 1 RareMythic+
 252 L Swamp
 253 L Mountain
 254 L Forest
+#255 M Elspeth, Sun's Nemesis
+#256 M Ashiok, Nightmare Muse
+#257 M Calix, Destiny's Hand
+#258 U Daxos, Blessed by the Sun
+#259 M Heliod, Sun-Crowned
+#260 U Callaphe, Beloved of the Sea
+#261 M Thassa, Deep-Dwelling
+#262 M Erebos, Bleak-Hearted
+#263 U Tymaret, Chosen from Death
+#264 U Anax, Hardened in the Forge
+#265 M Purphoros, Bronze-Blooded
+#266 M Nylea, Keen-Eyed
+#267 U Renata, Called to the Hunt
+#268 M Klothys, God of Destiny
 269 M Athreos, Shroud-Veiled
 270 M Elspeth, Undaunted Hero
 271 U Eidolon of Inspiration
@@ -282,6 +296,69 @@ Prerelease=6 Boosters, 1 RareMythic+
 285 L Mountain
 286 L Forest
 287 L Forest
+288 R Grasping Giant
+289 R Victory's Envoy
+290 R Sphinx Mindbreaker
+291 R Serpent of Yawning Depths
+292 R Demon of Loathing
+293 R Underworld Sentinel
+294 R Deathbellow War Cry
+295 R Terror of Mount Velus
+296 R Ironscale Hydra
+297 R Treeshaker Chimera
+#298 R Archon of Sun's Grace
+#299 R Eidolon of Obstruction
+#300 R Heliod's Intervention
+#301 R Idyllic Tutor
+#302 R Shatter the Sky
+#304 R Ashiok's Erasure
+#305 R Nadir Kraken
+#306 R Protean Thaumaturge
+#307 R Thassa's Intervention
+#308 R Thassa's Oracle
+#309 R Thryx, the Sudden Storm
+#310 R Wavebreak Hippocamp
+#311 R Aphemia, the Cacophony
+#312 R Eat to Extinction
+#313 R Erebos's Intervention
+#314 R Gravebreaker Lamia
+#315 R Nightmare Shepherd
+#316 R Treacherous Blessing
+#317 R Woe Strider
+#318 M Ox of Agonas
+#319 R Phoenix of Ash
+#320 R Purphoros's Intervention
+#321 R Storm Herald
+#322 R Storm's Wrath
+#323 R Tectonic Giant
+#324 R Underworld Breach
+#325 R Arasta of the Endless Web
+#326 R Dryad of the Ilysian Grove
+#327 R Mantle of the Wolf
+#328 R Nessian Boar
+#329 R Nylea's Intervention
+#330 M Nyxbloom Ancient
+#331 R Setessan Champion
+#332 R Allure of the Unknown
+#333 R Atris, Oracle of Half-Truths
+#334 R Bronzehide Lion
+#335 R Dalakos, Crafter of Wonders
+#336 R Dream Trawler
+#337 R Enigmatic Incarnation
+#338 R Gallia of the Endless Dance
+#339 R Haktos the Unscarred
+#340 M Kroxa, Titan of Death's Hunger
+#341 R Kunoros, Hound of Athreos
+#342 M Polukranos, Unchained
+#343 M Uro, Titan of Nature's Wrath
+#344 R Nyx Lotus
+#345 R Shadowspear
+#346 R Labyrinth of Skophos
+#347 R Temple of Abandon
+#348 R Temple of Deceit
+#349 R Temple of Enlightenment
+#350 R Temple of Malice
+#351 R Temple of Plenty
 
 [tokens]
 b_2_2_zombie

forge-gui/tools/cardnamesTranslations.py

@@ -9,8 +9,8 @@ database = 'scryfall-all-cards.json'
 scryfalldburl = 'https://archive.scryfall.com/json/' + database
 # 'scryfall lang code':'ISO 639 lang code'
 languages = {'es': 'es-ES', 'de': 'de-DE',
-             'zhs': 'zh-CN'}
-langfiles = {'es': None, 'de': None, 'zhs': None}
+             'it': 'it-IT', 'zhs': 'zh-CN'}
+langfiles = {'es': None, 'de': None, 'it': None, 'zhs': None}
 
 urllib.request.urlretrieve(scryfalldburl, database)