Michael Kamensky
7591bd6def
Merge branch 'cost' into 'master'
...
Add confirm when discarding hand as payment
See merge request core-developers/forge!5354
2021-09-14 03:54:10 +00:00
Michael Kamensky
ece8f2f2d7
Merge branch 'mid_13' into 'master'
...
MID - 13 Sep
See merge request core-developers/forge!5348
2021-09-14 03:53:51 +00:00
Northmoc
a35be3968b
sludge_monster.txt AITgts
2021-09-13 18:11:11 -04:00
Northmoc
abb6f24327
necrosynthesis.txt
2021-09-13 16:56:07 -04:00
Northmoc
1218986c99
old_stickfingers.txt
2021-09-13 16:38:24 -04:00
Northmoc
ba8daebf98
vanquish_the_horde.txt
2021-09-13 15:50:01 -04:00
Northmoc
d058584278
startle.txt
2021-09-13 15:38:06 -04:00
Northmoc
d175e6dcbd
sunset_revelry.txt
2021-09-13 15:19:38 -04:00
Northmoc
7a458f49f6
hungry_for_more.txt and token
2021-09-13 15:10:50 -04:00
Northmoc
e54b886bab
briarbridge_tracker.txt
2021-09-13 14:50:16 -04:00
tool4EvEr
664a3471c9
Add confirm when discarding hand as payment
2021-09-13 20:40:59 +02:00
Northmoc
7c90200ca3
loyal_gryff.txt
2021-09-13 14:31:28 -04:00
leriomaggio
f8cb6141bd
Further optimised cardDb method with filter using AlwaysTrue + and Chain
...
Signed-off-by: leriomaggio <valeriomaggio@gmail.com >
2021-09-13 18:58:54 +01:00
leriomaggio
a9f1cd3c97
Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format
2021-09-13 18:47:35 +01:00
leriomaggio
de4763cd71
New translation entries (en-US) for DeckImport and the new VStatisticsImporter
...
Signed-off-by: leriomaggio <valeriomaggio@gmail.com >
2021-09-13 18:47:26 +01:00
Northmoc
cf1a637585
chaplain_of_alms_chapel_shieldgeist.txt
2021-09-13 13:43:55 -04:00
Bug Hunter
71eae2f1a8
Merge branch 'commander_ban' into 'master'
...
Commander: Golas banned; Worldfire unbanned
See merge request core-developers/forge!5352
2021-09-13 17:42:55 +00:00
paul_snoops
4f1219b305
Commander: Golas banned; Worldfire unbanned
2021-09-13 18:32:49 +01:00
Northmoc
1e6beae1e1
grafted_identity.txt
2021-09-13 12:27:49 -04:00
Northmoc
e51b4d9abf
some keyword formatting updates
2021-09-13 11:42:52 -04:00
Northmoc
76dbd6311b
nebelgast_intruder.txt
2021-09-13 11:41:48 -04:00
Northmoc
f744404bee
mysterious_tome_chilling_chronicle.txt
2021-09-13 11:41:47 -04:00
Anthony Calosa
aa1c1a10c5
Merge branch 'master' into 'master'
...
[Mobile] Fix card image not loading
See merge request core-developers/forge!5349
2021-09-13 15:07:00 +00:00
Anthony Calosa
ac350a0bfb
[Mobile] Fix card image not loading
2021-09-13 23:01:13 +08:00
Michael Kamensky
5d61f2f938
Merge branch 'mid_12' into 'master'
...
MID - 12 Sep
See merge request core-developers/forge!5337
2021-09-13 14:58:32 +00:00
Northmoc
928a1df4e7
fix typo
2021-09-13 10:42:50 -04:00
Northmoc
2473ace8a1
add AI hints
2021-09-13 10:42:22 -04:00
Michael Kamensky
ad1086cd79
Merge branch 'MID/some-cards' into 'master'
...
MID Cards
See merge request core-developers/forge!5328
2021-09-13 14:10:16 +00:00
Stu Bob
4f1eec23e6
Bounding Wolf
...
Raze the Effigy
Novice Occultist
Shadowbeast Sighting
Gavony Trapper
Defend the Celestus
As well as fixing typos.
2021-09-13 14:10:14 +00:00
Michael Kamensky
176f86aa62
Merge branch 'patch-carddb-performance' into 'master'
...
HOT FIX: CardDb Tests with ImageKeys Interactions
See merge request core-developers/forge!5344
2021-09-13 11:01:31 +00:00
leriomaggio
adf44be732
removed unused imports
2021-09-13 11:26:05 +01:00
Michael Kamensky
7e723d48cd
Merge branch 'cleanup' into 'master'
...
Minor Cleanup
See merge request core-developers/forge!5345
2021-09-13 10:03:17 +00:00
tool4EvEr
90e5bef028
Clean up
2021-09-13 11:33:56 +02:00
tool4EvEr
4e2a6d3c24
Remove old code
2021-09-13 11:33:44 +02:00
leriomaggio
3685724fb7
Merge remote-tracking branch 'upstream/master' into patch-carddb-performance
2021-09-13 10:16:00 +01:00
leriomaggio
236fd99862
FIX cardDb tests in Maven for ImageKeys Mock configuration between subclasses
2021-09-13 10:15:32 +01:00
Anthony Calosa
d185f16991
Merge branch 'kevlahnota-master-patch-62431' into 'master'
...
Update Commander Collection Black.txt
See merge request core-developers/forge!5343
2021-09-13 08:04:54 +00:00
Anthony Calosa
e97cdbb293
Update Commander Collection Black.txt
2021-09-13 08:04:31 +00:00
Michael Kamensky
99fdd4b551
Merge branch 'MID/cards-2' into 'master'
...
More cards
See merge request core-developers/forge!5335
2021-09-13 03:28:51 +00:00
Stu Bob
9cfc6897c5
More cards:
...
clarion_cathars
gavony_silversmith
soul_guide_gryff
homestead_courage
Something is wrong with Hedgewitch's Mask the can't be blocked clause doesn't seem to be working.
2021-09-13 03:28:49 +00:00
Michael Kamensky
3785caa9b7
Merge branch 'typo' into 'master'
...
Minor typos and AI
See merge request core-developers/forge!5340
2021-09-13 03:24:06 +00:00
Michael Kamensky
3b5fe84bb2
Merge branch 'MID/initial-draft-rankings' into 'master'
...
Initial Draft ranking
See merge request core-developers/forge!5342
2021-09-13 03:19:29 +00:00
Michael Kamensky
33a32517ad
Merge branch 'smallfix' into 'master'
...
Follow up fixes
See merge request core-developers/forge!5336
2021-09-13 03:19:05 +00:00
stubob
01516d2019
Initial Draft ranking from https://draftsim.com/MID-pick-order.php
2021-09-12 20:25:08 -06:00
Northmoc
db34d1f341
covert_cutpurse_covetous_geist.txt add missing triggers
2021-09-12 21:45:32 -04:00
Northmoc
75d7f2abf3
ritual_guardian.txt
2021-09-12 21:20:22 -04:00
Northmoc
257e32a4e3
candlegrove_witch.txt & covetous_castaway_ghostly_castigator.txt
2021-09-12 21:18:07 -04:00
Northmoc
2d1c665fc0
gravebreaker_lamia.txt add AI hints
2021-09-12 20:50:44 -04:00
Northmoc
d5c8b0106d
patrician_geist.txt
2021-09-12 20:49:47 -04:00
Northmoc
e24d6a6495
augur_of_autumn.txt
2021-09-12 20:41:39 -04:00