Commit Graph

53916 Commits

Author SHA1 Message Date
Northmoc
07bbd32af5 devoted_grafkeeper_departed_soulkeeper.txt 2021-09-09 22:18:27 -04:00
Northmoc
6ebff84f72 curse_of_silence.txt 2021-09-09 22:17:27 -04:00
Northmoc
d390be2812 blast_from_the_past.txt 2021-09-09 21:42:14 -04:00
Anthony Calosa
ffbfb06530 Merge branch 'fix' into 'master'
Quest mode precon: card is now implemented

See merge request core-developers/forge!5311
2021-09-10 01:00:38 +00:00
Northmoc
e22069021c card is now implemented 2021-09-09 20:50:22 -04:00
Northmoc
d82a412480 make all Coven hyphens long 2021-09-09 20:49:41 -04:00
Northmoc
b90b2477fd hobbling_zombie.txt 2021-09-09 20:48:39 -04:00
Northmoc
554f34c0f1 contortionist_troupe.txt 2021-09-09 20:48:16 -04:00
leriomaggio
b9d468bf70 Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-09-09 20:20:16 +01:00
Michael Kamensky
8c49535c6e Merge branch 'mid_7' into 'master'
MID - 8 Sep

See merge request core-developers/forge!5309
2021-09-09 04:02:51 +00:00
Grimm
5f0656bf03 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure 2021-09-09 03:56:39 +02:00
Grimm
88b6ac0964 commit res 2021-09-09 02:44:56 +02:00
Grimm
b5450d47d3 commit res 2021-09-09 02:43:59 +02:00
Grimm
7acb42a01c commit res 2021-09-09 02:42:14 +02:00
Northmoc
cd6b7963c4 geistflame_reservoir.txt 2021-09-08 19:27:56 -04:00
Grimm
84b6ebfec6 commit res 2021-09-09 00:02:22 +02:00
leriomaggio
2297f34ce2 Added full support to all Deckstats deck exports + bug fix&extra tests
Now DeckRecognizer supports all the exports of decks from Deckstats.net.
This now also includes card lists grouped by Rarity, CMC, and Mana Colours.

A new set of tests have been also added to test for the new non-card token types parsing, as well as a condition with multiple constraints imposed on the deck recogniser at a time. In particular, now all the combinations of constraints (also together) have been tested, and therefore the types of token returned has been adjusted.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-08 21:27:43 +01:00
Northmoc
f471d062cb life is lowercase in MtG syntax in this context 2021-09-08 08:18:39 -04:00
Northmoc
78b23e4316 heirloom_mirror_inherited_fiend.txt and ritual counters 2021-09-08 08:17:51 -04:00
Michael Kamensky
93a85b06ff Merge branch 'MID_update' into 'master'
MID update

See merge request core-developers/forge!5308
2021-09-08 04:03:34 +00:00
Grimm
70f8302bcf commit res 2021-09-08 03:49:54 +02:00
paul_snoops
8e865b939e MID update 2021-09-07 18:33:27 +01:00
paul_snoops
fda597a3c9 MID update 2021-09-07 15:05:31 +01:00
leriomaggio
20d9dbdb57 Perf Impro to Deck Editor Loading Issue #1847
This is another extra improvement which avoids setting up card catalog in current editor whenever it is actually **not** needed.

To do so, ItemPool now implements and equal method, which reflects to equality of contained items.
This is because card pool is set up multiple times whenever the Deck Editor tab is initialised - and the operation of setting up the catalog manager is particularly expensive (let alone useless when it's already done!)

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-07 11:46:44 +01:00
leriomaggio
7c1bcaaf34 Re-enabling Basic Lands in Rarity Statistics
This is done similarly in DeckStats (Rarity grouped) deck export.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-07 11:43:09 +01:00
Michael Kamensky
c21c7b8471 Merge branch 'johnwilliams7-master-patch-18874' into 'master'
Update Online Promos.txt

See merge request core-developers/forge!5307
2021-09-07 10:17:23 +00:00
leriomaggio
c2e34573f8 Merge branch 'deck-importer-decks-file-format' of git.cardforge.org:leriomaggio/forge into deck-importer-decks-file-format 2021-09-07 10:44:26 +01:00
leriomaggio
e3eb012b20 Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-09-07 10:43:40 +01:00
leriomaggio
ed8772c613 Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-09-07 10:43:28 +01:00
Northmoc
9cc6c1772d brackish_trudge.txt fix bad SpellDescription 2021-09-07 10:43:22 +01:00
leriomaggio
43196e7c74 FIX a bug which caused the deck catalog not to update after saving the deck when current game type was not constructed!
This commit FIX #1961

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-07 10:43:22 +01:00
John Williams
36a5ae3573 Update Online Promos.txt 2021-09-07 08:33:20 +00:00
Anthony Calosa
70f6246941 Merge branch 'master' into 'master'
Update check for NYX

See merge request core-developers/forge!5306
2021-09-07 03:44:08 +00:00
Anthony Calosa
08af6a52db Update check 2021-09-07 11:42:21 +08:00
Michael Kamensky
2ccdfb7ce0 Merge branch 'MID_update' into 'master'
MID 06 Sep

See merge request core-developers/forge!5301
2021-09-07 03:38:58 +00:00
Michael Kamensky
d27b8e9a57 Merge branch 'mid_6' into 'master'
MID - 6 Sep

See merge request core-developers/forge!5302
2021-09-07 03:38:25 +00:00
Michael Kamensky
88b1206df2 Merge branch 'tweaks' into 'master'
MID – Various Q.O.L. fixes tied to Corpse Cobble

See merge request core-developers/forge!5300
2021-09-07 03:38:01 +00:00
Michael Kamensky
fad5798d2a Merge branch 'master' into 'master'
Update CardBG for PW and NYX

See merge request core-developers/forge!5305
2021-09-07 03:37:03 +00:00
Michael Kamensky
3fc6f9deef Merge branch 'TRT-master-patch-54277' into 'master'
Update forge-gui/res/cardsfolder/m/murktide_regent.txt

See merge request core-developers/forge!5299
2021-09-07 03:36:37 +00:00
Bug Hunter
2782ca0d1b Update forge-gui/res/cardsfolder/m/murktide_regent.txt 2021-09-07 03:36:36 +00:00
Anthony Calosa
ab14772304 Update CardBG for PW and NYX 2021-09-07 11:25:19 +08:00
Northmoc
4b0ae93dd2 allow reminder text insert for Flashback 2021-09-06 21:51:26 -04:00
Northmoc
355773ed98 tweak for prompt 2021-09-06 21:51:26 -04:00
Northmoc
c04a3944d3 remove "a" (for things like "Select a artifact") 2021-09-06 21:51:25 -04:00
Northmoc
cc9fbb8a13 Straighten out stringbuilder for Sac<X costs 2021-09-06 21:51:25 -04:00
Northmoc
4e96312f86 corpse_cobble.txt and token 2021-09-06 21:51:24 -04:00
Northmoc
68befe5951 add space 2021-09-06 21:51:24 -04:00
Northmoc
38482b7c40 brackish_trudge.txt fix bad SpellDescription 2021-09-06 21:51:24 -04:00
leriomaggio
00dd6d99b8 Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-09-07 01:13:16 +01:00
leriomaggio
cafdfbc33b FIX a bug which caused the deck catalog not to update after saving the deck when current game type was not constructed!
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-07 01:11:49 +01:00