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
leriomaggio
84763e5dbc
Adding support for deck name in Forge Deck Format
...
Signed-off-by: leriomaggio <valeriomaggio@gmail.com >
2021-09-07 00:35:08 +01:00
leriomaggio
dabb40714e
Updated translations and added new DeckStats classes to automate stats report generation with less duplications.
...
Signed-off-by: leriomaggio <valeriomaggio@gmail.com >
2021-09-07 00:24:35 +01:00
Bug Hunter
120edf85e4
Merge branch 'typo' into 'master'
...
brackish_trudge.txt fix bad SpellDescription
See merge request core-developers/forge!5303
2021-09-06 21:17:19 +00:00
Northmoc
db469affcc
cant_stay_away.txt
2021-09-06 16:23:49 -04:00
Northmoc
d57c2d849d
brackish_trudge.txt fix bad SpellDescription
2021-09-06 13:57:17 -04:00
Northmoc
9f139a8a35
foul_play.txt
2021-09-06 13:56:10 -04:00
Northmoc
2015a03c59
dawnhart_rejuvenator.txt
2021-09-06 13:49:47 -04:00
Northmoc
dda4dde655
stormrider_spirit.txt
2021-09-06 13:48:18 -04:00
Northmoc
21338a7f1e
famished_foragers.txt
2021-09-06 13:47:11 -04:00
paul_snoops
2537cf4cd7
lunar frenzy fix
2021-09-06 18:43:52 +01:00
paul_snoops
f6ff8ca38c
fixes
2021-09-06 18:30:14 +01:00
Northmoc
0ab8c24a1a
arrogant_outlaw.txt
2021-09-06 13:13:56 -04:00
Northmoc
502d0685f6
apply spacing to the extra param part
2021-09-06 13:02:26 -04:00
Northmoc
5d35cd9f82
gisa_glorious_resurrector.txt add CheckSelfLKIZone param
2021-09-06 12:46:29 -04:00
paul_snoops
3e122fa76e
MID 06 Sep
2021-09-06 17:26:55 +01:00
paul_snoops
a21488ee43
MID 06 Sep
2021-09-06 17:24:54 +01:00
Northmoc
813e5ccf1f
GameActionUtil.java allow multiple extra params to be added to Flashback costs
2021-09-06 11:46:05 -04:00
leriomaggio
ef1ea8e60d
FIX Issue #1413
...
This commit includes support to the XMage format in Deck Recognizer along with corresponding new tests and updates to labels for UI
Signed-off-by: leriomaggio <valeriomaggio@gmail.com >
2021-09-06 12:41:04 +01:00
leriomaggio
6118f67b08
Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format
2021-09-06 12:09:28 +01:00
leriomaggio
f81e7364a1
Improvements to deck import labels (instructions)
...
Signed-off-by: leriomaggio <valeriomaggio@gmail.com >
2021-09-06 12:09:12 +01:00
leriomaggio
151c6d3ec9
Removed displaying comment tokens, and unsued translation labels + impros to UI
...
Signed-off-by: leriomaggio <valeriomaggio@gmail.com >
2021-09-06 12:08:06 +01:00
leriomaggio
54193e0ac0
Added support to TappedOut Markdown format, and to TOARENA MTGGOLDFISH export.
...
Signed-off-by: leriomaggio <valeriomaggio@gmail.com >
2021-09-06 12:07:11 +01:00
Michael Kamensky
553dba687f
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2021-09-06 07:20:12 +03:00
Michael Kamensky
ac3afbdd8c
Merge branch 'typo' into 'master'
...
primeval_titan.txt typos
See merge request core-developers/forge!5297
2021-09-06 04:19:47 +00:00
Michael Kamensky
9ddaacc8df
Merge branch 'mid_5' into 'master'
...
MID - 5 Sep
See merge request core-developers/forge!5298
2021-09-06 04:19:21 +00:00
