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

Conflicts: forge-gui/res/languages/zh-CN.properties
2025-11-14 17:58:01 +00:00 · 2019-09-23 12:45:49 +02:00
parent 0a57342524 76a0fc6fa2
commit f15e051cc4
5 changed files with 308 additions and 63 deletions
--- a/forge-gui/res/blockdata/blocks.txt
+++ b/forge-gui/res/blockdata/blocks.txt
@@ -81,4 +81,5 @@ Ultimate Masters, 3/6/M19, UMA
 Ravnica Allegiance, 3/6/RNA, RNA
 War of the Spark, 3/6/WAR, WAR
 Modern Horizons, 3/6/WAR, MH1
-Core Set 2020, 3/6/M20, M20
+Core Set 2020, 3/6/M20, M20
+Throne of Eldraine, 3/6/ELD, ELD
--- a/forge-gui/res/blockdata/printsheets.txt
+++ b/forge-gui/res/blockdata/printsheets.txt
@@ -1553,4 +1553,37 @@ Evolving Wilds
 13 Island|M20
 13 Mountain|M20
 13 Plains|M20
-13 Swamp|M20
+13 Swamp|M20
+
+[ELD Secret Cards]
+Kenrith, the Returned King
+Rowan, Fearless Sparkmage
+Garrison Griffin
+Rowan's Battleguard
+Rowan's Stalwarts
+Wind-Scarred Crag
+Oko, the Trickster
+Oko's Accomplices
+Bramblefort Fink
+Oko's Hospitality
+Thornwood Falls
+Mace of the Valiant
+Silverwing Squadron
+Faerie Formation
+Shimmer Dragon
+Workshop Elders
+Chittering Witch
+Taste of Death
+Embereth Skyblazer
+Steelbane Hydra
+Thorn Mammoth
+Alela, Artful Provocateur
+Banish into Fable
+Chulane, Teller of Tales
+Gluttonous Troll
+Knights' Charge
+Korvold, Fae-Cursed King
+Syr Gwyn, Hero of Ashvale
+Arcane Signet
+Tome of Legends
+Command Tower
--- a/forge-gui/res/draft/rankings.txt
+++ b/forge-gui/res/draft/rankings.txt
@@ -1,4 +1,253 @@
 //Rank|Name|Rarity|Set
+#1|Garruk, Cursed Huntsman|M|ELD
+#2|Harmonious Archon|M|ELD
+#3|Murderous Rider|R|ELD
+#4|Oko, Thief of Crowns|M|ELD
+#5|Lochmere Serpent|R|ELD
+#6|The Circle of Loyalty|M|ELD
+#7|Brazen Borrower|M|ELD
+#8|The Great Henge|M|ELD
+#9|Bonecrusher Giant|R|ELD
+#10|Stonecoil Serpent|R|ELD
+#11|Opportunistic Dragon|R|ELD
+#12|Clackbridge Troll|R|ELD
+#13|Questing Beast|M|ELD
+#14|Realm-Cloaked Giant|M|ELD
+#15|Wicked Wolf|R|ELD
+#16|Irencrag Pyromancer|R|ELD
+#17|Feasting Troll King|R|ELD
+#18|Rankle, Master of Pranks|M|ELD
+#19|Gadwick, the Wizened|R|ELD
+#20|Sundering Stroke|R|ELD
+#21|Outlaws' Merriment|M|ELD
+#22|The Royal Scions|M|ELD
+#23|Yorvo, Lord of Garenbrig|R|ELD
+#24|Linden, the Steadfast Queen|R|ELD
+#25|Torbran, Thane of Red Fell|R|ELD
+#26|Epic Downfall|U|ELD
+#27|Stolen by the Fae|R|ELD
+#28|Worthy Knight|R|ELD
+#29|Wildborn Preserver|R|ELD
+#30|Piper of the Swarm|R|ELD
+#31|Lovestruck Beast|R|ELD
+#32|Syr Alin, the Lion's Claw|U|ELD
+#33|Faeburrow Elder|R|ELD
+#34|Oathsworn Knight|R|ELD
+#35|Robber of the Rich|M|ELD
+#36|Embercleave|M|ELD
+#37|Arcanist's Owl|U|ELD
+#38|Acclaimed Contender|R|ELD
+#39|Giant Killer|R|ELD
+#40|Bake into a Pie|C|ELD
+#41|Slaying Fire|U|ELD
+#42|Maraleaf Pixie|U|ELD
+#43|Syr Faren, the Hengehammer|U|ELD
+#44|Rampart Smasher|U|ELD
+#45|Archon of Absolution|U|ELD
+#46|Grumgully, the Generous|U|ELD
+#47|Bog Naughty|U|ELD
+#48|Scorching Dragonfire|C|ELD
+#49|Syr Carah, the Bold|U|ELD
+#50|Savvy Hunter|U|ELD
+#51|Inspiring Veteran|U|ELD
+#52|Fireborn Knight|U|ELD
+#53|Syr Konrad, the Grim|U|ELD
+#54|Wintermoor Commander|U|ELD
+#55|Return of the Wildspeaker|R|ELD
+#56|Blacklance Paragon|R|ELD
+#57|Loch Dragon|U|ELD
+#58|Reave Soul|C|ELD
+#59|Trapped in the Tower|C|ELD
+#60|Shinechaser|U|ELD
+#61|Steelclaw Lance|U|ELD
+#62|Order of Midnight|U|ELD
+#63|Charmed Sleep|C|ELD
+#64|Resolute Rider|U|ELD
+#65|Improbable Alliance|U|ELD
+#66|Stormfist Crusader|R|ELD
+#67|Fierce Witchstalker|C|ELD
+#68|Elite Headhunter|U|ELD
+#69|Syr Elenora, the Discerning|U|ELD
+#70|Searing Barrage|C|ELD
+#71|Covetous Urge|U|ELD
+#72|Outmuscle|C|ELD
+#73|Witch's Vengeance|R|ELD
+#74|Oakhame Ranger|U|ELD
+#75|Foulmire Knight|U|ELD
+#76|Deathless Knight|U|ELD
+#77|Vantress Gargoyle|R|ELD
+#78|Thunderous Snapper|U|ELD
+#79|Glass Casket|U|ELD
+#80|Wandermare|U|ELD
+#81|Ayara, First of Locthwain|R|ELD
+#82|Charming Prince|R|ELD
+#83|Keeper of Fables|U|ELD
+#84|Animating Faerie|U|ELD
+#85|Faerie Vandal|U|ELD
+#86|Tome Raider|C|ELD
+#87|Gilded Goose|R|ELD
+#88|Fae of Wishes|R|ELD
+#89|Shepherd of the Flock|U|ELD
+#90|Mysterious Pathlighter|U|ELD
+#91|Drown in the Loch|U|ELD
+#92|Mirrormade|R|ELD
+#93|Hypnotic Sprite|U|ELD
+#94|Joust|U|ELD
+#95|Beanstalk Giant|U|ELD
+#96|Queen of Ice|C|ELD
+#97|Hushbringer|R|ELD
+#98|Mad Ratter|U|ELD
+#99|Tempting Witch|C|ELD
+#100|Ardenvale Tactician|C|ELD
+#101|Oakhame Adversary|U|ELD
+#102|Into the Story|U|ELD
+#103|Trail of Crumbs|U|ELD
+#104|Scalding Cauldron|C|ELD
+#105|Sage of the Falls|U|ELD
+#106|Foreboding Fruit|C|ELD
+#107|Fabled Passage|R|ELD
+#108|Castle Ardenvale|R|ELD
+#109|Castle Locthwain|R|ELD
+#110|The Cauldron of Eternity|M|ELD
+#111|Rally for the Throne|U|ELD
+#112|Giant Opportunity|U|ELD
+#113|Redcap Melee|U|ELD
+#114|Fervent Champion|R|ELD
+#115|Doom Foretold|R|ELD
+#116|Burning-Yard Trainer|U|ELD
+#117|Once Upon a Time|R|ELD
+#118|Turn into a Pumpkin|U|ELD
+#119|Belle of the Brawl|U|ELD
+#120|Run Away Together|C|ELD
+#121|Youthful Knight|C|ELD
+#122|Outflank|C|ELD
+#123|Dwarven Mine|C|ELD
+#124|Malevolent Noble|C|ELD
+#125|Gingerbread Cabin|C|ELD
+#126|Lucky Clover|U|ELD
+#127|Castle Embereth|R|ELD
+#128|Castle Vantress|R|ELD
+#129|Overwhelmed Apprentice|U|ELD
+#130|Lonesome Unicorn|C|ELD
+#131|Clockwork Servant|U|ELD
+#132|Ferocity of the Wilds|U|ELD
+#133|The Magic Mirror|M|ELD
+#134|Dance of the Manse|R|ELD
+#135|Idyllic Grange|C|ELD
+#136|Merchant of the Vale|C|ELD
+#137|Edgewall Innkeeper|U|ELD
+#138|Spinning Wheel|U|ELD
+#139|Garenbrig Paladin|C|ELD
+#140|Once and Future|U|ELD
+#141|Enchanted Carriage|U|ELD
+#142|Venerable Knight|U|ELD
+#143|Smitten Swordmaster|C|ELD
+#144|Midnight Clock|R|ELD
+#145|Witch's Cottage|C|ELD
+#146|Sporecap Spider|C|ELD
+#147|Didn't Say Please|C|ELD
+#148|Prized Griffin|C|ELD
+#149|Flutterfox|C|ELD
+#150|Thrill of Possibility|C|ELD
+#151|Moonlit Scavengers|C|ELD
+#152|Mystic Sanctuary|C|ELD
+#153|So Tiny|C|ELD
+#154|Kenrith's Transformation|U|ELD
+#155|Steelgaze Griffin|C|ELD
+#156|Bloodhaze Wolverine|C|ELD
+#157|Unexplained Vision|C|ELD
+#158|Garenbrig Carver|C|ELD
+#159|Fortifying Provisions|C|ELD
+#160|Giant's Skewer|C|ELD
+#161|Castle Garenbrig|R|ELD
+#162|Escape to the Wilds|R|ELD
+#163|Forever Young|C|ELD
+#164|Silverflame Squire|C|ELD
+#165|Tuinvale Treefolk|C|ELD
+#166|Henge Walker|C|ELD
+#167|Redcap Raiders|C|ELD
+#168|Revenge of Ravens|U|ELD
+#169|Lost Legion|C|ELD
+#170|Ogre Errant|C|ELD
+#171|Skullknocker Ogre|U|ELD
+#172|Wishclaw Talisman|R|ELD
+#173|Brimstone Trebuchet|C|ELD
+#174|Wicked Guardian|C|ELD
+#175|Witch's Oven|U|ELD
+#176|Rosethorn Acolyte|C|ELD
+#177|Shambling Suit|U|ELD
+#178|Silverflame Ritual|C|ELD
+#179|Heraldic Banner|U|ELD
+#180|Embereth Shieldbreaker|U|ELD
+#181|Signpost Scarecrow|C|ELD
+#182|Barrow Witches|C|ELD
+#183|Merfolk Secretkeeper|C|ELD
+#184|Rimrock Knight|C|ELD
+#185|Festive Funeral|C|ELD
+#186|Rosethorn Halberd|C|ELD
+#187|Locthwain Paladin|C|ELD
+#188|Mantle of Tides|C|ELD
+#189|Vantress Paladin|C|ELD
+#190|Cauldron's Gift|U|ELD
+#191|Garenbrig Squire|C|ELD
+#192|Mistford River Turtle|C|ELD
+#193|Wolf's Quarry|C|ELD
+#194|Raging Redcap|C|ELD
+#195|Maraleaf Rider|C|ELD
+#196|Insatiable Appetite|C|ELD
+#197|Righteousness|U|ELD
+#198|Opt|C|ELD
+#199|Seven Dwarves|C|ELD
+#200|Curious Pair|C|ELD
+#201|Wildwood Tracker|C|ELD
+#202|Faerie Guidemother|C|ELD
+#203|Mystical Dispute|U|ELD
+#204|Frogify|U|ELD
+#205|Shining Armor|C|ELD
+#206|Tournament Grounds|U|ELD
+#207|Golden Egg|C|ELD
+#208|Witching Well|C|ELD
+#209|Crystal Slipper|C|ELD
+#210|Weapon Rack|C|ELD
+#211|Prophet of the Peak|C|ELD
+#212|Crashing Drawbridge|C|ELD
+#213|Fling|C|ELD
+#214|Memory Theft|C|ELD
+#215|Reaper of Night|C|ELD
+#216|Sorcerer's Broom|U|ELD
+#217|Ardenvale Paladin|C|ELD
+#218|Bartered Cow|C|ELD
+#219|Tall as a Beanstalk|C|ELD
+#220|Barge In|C|ELD
+#221|Knight of the Keep|C|ELD
+#222|Jousting Dummy|C|ELD
+#223|Corridor Monitor|C|ELD
+#224|All That Glitters|U|ELD
+#225|Embereth Paladin|C|ELD
+#226|Eye Collector|C|ELD
+#227|Wishful Merfolk|C|ELD
+#228|Lash of Thorns|C|ELD
+#229|Locthwain Gargoyle|C|ELD
+#230|Fell the Pheasant|C|ELD
+#231|Inquisitive Puppet|U|ELD
+#232|Gingerbrute|C|ELD
+#233|True Love's Kiss|C|ELD
+#234|Weaselback Redcap|C|ELD
+#235|Emry, Lurker of the Loch|R|ELD
+#236|Blow Your House Down|C|ELD
+#237|Return to Nature|C|ELD
+#238|Flaxen Intruder|U|ELD
+#239|Specter's Shriek|U|ELD
+#240|Beloved Princess|C|ELD
+#241|Claim the Firstborn|U|ELD
+#242|Roving Keep|C|ELD
+#243|Folio of Fancies|R|ELD
+#244|Cauldron Familiar|U|ELD
+#245|Irencrag Feat|R|ELD
+#246|Fires of Invention|R|ELD
+#247|Sorcerous Spyglass|R|ELD
+#248|Happily Ever After|R|ELD
+//Rank|Name|Rarity|Set
 #1|Nightpack Ambusher|R|M20
 #2|Chandra, Awakened Inferno|M|M20
 #3|Gargos, Vicious Watcher|R|M20
--- a/forge-gui/res/editions/Throne
+++ b/forge-gui/res/editions/Throne
@@ -5,8 +5,8 @@ Name=Throne of Eldraine
 Code2=ELD
 MciCode=eld
 Type=Expansion
-BoosterCovers=3
-Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
+BoosterCovers=5
+Booster=10 Common:!fromSheet("ELD Secret Cards"), 3 Uncommon:!fromSheet("ELD Secret Cards"), 1 RareMythic:!fromSheet("ELD Secret Cards"), 1 BasicLand

 [cards]
 1 R Acclaimed Contender
@@ -258,26 +258,26 @@ Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
 247 C Mystic Sanctuary
 248 U Tournament Grounds
 249 C Witch's Cottage
-250 C Plains
-251 C Plains
-252 C Plains
-253 C Plains
-254 C Island
-255 C Island
-256 C Island
-257 C Island
-258 C Swamp
-259 C Swamp
-260 C Swamp
-261 C Swamp
-262 C Mountain
-263 C Mountain
-264 C Mountain
-265 C Mountain
-266 C Forest
-267 C Forest
-268 C Forest
-269 C Forest
+250 L Plains
+251 L Plains
+252 L Plains
+253 L Plains
+254 L Island
+255 L Island
+256 L Island
+257 L Island
+258 L Swamp
+259 L Swamp
+260 L Swamp
+261 L Swamp
+262 L Mountain
+263 L Mountain
+264 L Mountain
+265 L Mountain
+266 L Forest
+267 L Forest
+268 L Forest
+269 L Forest
 303 M Kenrith, the Returned King
 304 M Rowan, Fearless Sparkmage
 305 C Garrison Griffin
--- a/forge-gui/res/languages/zh-CN.properties
+++ b/forge-gui/res/languages/zh-CN.properties
@@ -1042,42 +1042,4 @@ lblDataLocation=数据位置（例如 设置和探索模式）
 lblImageCacheLocation=图片缓存位置
 lblRestartForgeMoveFilesNewLocation=您必须重启Forge才能使此更改生效。执行此操作之前，请确保将所有必要的文件移动到新的位置。
 lblRestartRequired=需要重启
-lblSelect=选择%s
-#AddBasicLandsDialog
-lblLandSet=Land Set
-lblPlains=Plains
-lblIsland=Island
-lblSwamp=Swamp
-lblMountain=Mountain
-lblForest=Forest
-lblAddBasicLandsAutoSuggest=Add Basic Lands to %s\n(double-tap statistics to auto-suggest)
-lblAssortedArt=Assorted Art
-lblCardArt=Card Art %d
-lblNonLandCount=%d non-lands
-lblOldLandCount=%d lands
-lblNewLandCount=%d added lands
-lblNewTotalCount=%d cards
-#FDeckImportDialog
-lblImportLatestVersionCard=Import latest version of card
-lblUseOnlySetsReleasedBefore=Use only sets released before:
-lblUseOnlyCoreAndExpansionSets=Use only core and expansion sets
-lblFollowingCardsCannotBeImported=The following cards cannot be imported due to misspelling, set restrictions, or not being in Forge yet:
-lblImportRemainingCards=Import remaining cards?
-lblNoKnownCardsOnClipboard=No known cards found on clipboard.\n\nCopy the decklist to the clipboard, then reopen this dialog.
-#FDeckViewer
-lblDeckListCopiedClipboard=Deck list for '%s' copied to clipboard.
-#FSideboardDialog
-lblUpdateMainFromSideboard=Update main deck from sideboard%s
-#FVanguardChooser
-lblRandomVanguard=Random Vanguard
-#FOptionPane
-lblYes=Yes
-lblNo=No
-#FSpinner
-lblSelectANumber=Select a number
-#FTextField
-lblCut=Cut
-lblCopy=Copy
-lblPaste=Paste
-#ListChooser
-lblSearch=Search
+lblSelect=选择%s