Hans Mackowiak
|
38fc33342e
|
Merge branch 'thisTurnEnteredProperty' into 'master'
CardProperty: ThisTurnEntered and ThisTurnEnteredFrom for better check
Closes #1711 and #1710
See merge request core-developers/forge!3777
|
2021-02-07 14:40:06 +00:00 |
|
Hans Mackowiak
|
b03a641d34
|
Merge branch 'freezingFlame' into 'master'
Extend DamagedBy and add Aegar the freezing Flame
See merge request core-developers/forge!3778
|
2021-02-07 14:39:35 +00:00 |
|
Hans Mackowiak
|
09dc93f6c3
|
CardProperty: ThisTurnEntered and ThisTurnEnteredFrom for better check
|
2021-02-07 12:10:46 +01:00 |
|
Hans Mackowiak
|
5cb2a0a8ee
|
Merge branch 'fixTree' into 'master'
Fix World Tree missing Tap Cost
See merge request core-developers/forge!3776
|
2021-02-07 10:06:55 +00:00 |
|
Bug Hunter
|
cc8e286933
|
Fix World Tree missing Tap Cost
|
2021-02-07 10:06:55 +00:00 |
|
Sol
|
69f8980c13
|
Merge branch 'Williams-master-patch-12266' into 'master'
Spectral Deluge CMC fix
See merge request core-developers/forge!3775
|
2021-02-06 21:35:02 +00:00 |
|
John
|
81d9706620
|
Spectral Deluge CMC fix
|
2021-02-06 21:35:02 +00:00 |
|
Michael Kamensky
|
be9675d68a
|
Merge branch 'Williams-master-patch-08403' into 'master'
Spirit of Aldergard fix
See merge request core-developers/forge!3774
|
2021-02-06 18:15:43 +00:00 |
|
John
|
19be5a456b
|
Update spirit_of_the_aldergard.txt
|
2021-02-06 17:43:55 +00:00 |
|
Michael Kamensky
|
412e574003
|
Merge branch 'triggerChangesZoneAllPermanent' into 'master'
PermanentEffect: playing cards causes ChangesZoneAll to trigger
See merge request core-developers/forge!3771
|
2021-02-06 14:27:06 +00:00 |
|
Michael Kamensky
|
7d3703bc1e
|
Merge branch 'random_fixes' into 'master'
Various fixes
See merge request core-developers/forge!3765
|
2021-02-06 13:12:59 +00:00 |
|
Hans Mackowiak
|
7355b56246
|
PermanentEffect: playing cards causes ChangesZoneAll to trigger
|
2021-02-06 14:10:07 +01:00 |
|
Michael Kamensky
|
6aa89f900f
|
Merge branch 'abandoned_sarcophagus' into 'master'
Cycling: add Flag if card is discarded for cost with cycling
See merge request core-developers/forge!3770
|
2021-02-06 11:03:29 +00:00 |
|
Hans Mackowiak
|
ab3cd5f80f
|
Cycling: add Flag if card is discarded for cost with cycling
|
2021-02-06 08:48:50 +01:00 |
|
Anthony Calosa
|
d163d75ebd
|
Merge branch 'master' into 'master'
[Android] fix init for displaying error message
See merge request core-developers/forge!3769
|
2021-02-06 07:38:06 +00:00 |
|
Anthony Calosa
|
4d394778a0
|
[Android] fix init for displaying error message
|
2021-02-06 15:34:24 +08:00 |
|
Hans Mackowiak
|
fa2f7c43ae
|
MagicStack: fix Bestow resolve on fizzle
|
2021-02-06 07:45:50 +01:00 |
|
Michael Kamensky
|
0697b4df33
|
Merge branch 'khc5' into 'master'
KHC - 5 Feb
See merge request core-developers/forge!3763
|
2021-02-06 04:18:35 +00:00 |
|
Michael Kamensky
|
80d855d996
|
Merge branch 'klaxnek-master-patch-72751' into 'master'
Update es-ES.properties
See merge request core-developers/forge!3766
|
2021-02-06 04:17:30 +00:00 |
|
Michael Kamensky
|
4ef3a1a3e9
|
Merge branch 'fixOathbreaker' into 'master'
Fix Oathbreaker commander replacement
See merge request core-developers/forge!3767
|
2021-02-06 04:17:22 +00:00 |
|
Michael Kamensky
|
82ae14722b
|
Merge branch 'tales' into 'master'
KHC: Tales of the Ancestors and support
See merge request core-developers/forge!3768
|
2021-02-06 04:17:02 +00:00 |
|
Northmoc
|
c305a9f141
|
stoic_farmer.txt
|
2021-02-05 21:02:32 -05:00 |
|
Northmoc
|
845bd3480b
|
cosmic_intervention.txt
|
2021-02-05 21:02:31 -05:00 |
|
Northmoc
|
a1981f5752
|
add "Count$InRememberedHand"
|
2021-02-05 21:00:56 -05:00 |
|
Northmoc
|
143f2cc4bd
|
allow comparison to variable
|
2021-02-05 21:00:56 -05:00 |
|
Northmoc
|
2be871985a
|
tales_of_the_ancestors.txt
|
2021-02-05 21:00:55 -05:00 |
|
tool4EvEr
|
b10970e6e4
|
Fix Oathbreaker commander replacement
|
2021-02-05 21:36:17 +01:00 |
|
paul_snoops
|
caaf394bc6
|
Merge remote-tracking branch 'origin/random_fixes' into random_fixes
|
2021-02-05 19:07:21 +00:00 |
|
paul_snoops
|
ac1e0eb351
|
Various fixes
|
2021-02-05 19:07:03 +00:00 |
|
klaxnek
|
1214fcae34
|
Update es-ES.properties
|
2021-02-05 18:41:20 +00:00 |
|
paul_snoops
|
7175ec2a93
|
Various fixes
|
2021-02-05 18:34:05 +00:00 |
|
Michael Kamensky
|
1337aaa229
|
Merge branch 'kaldheim' into 'master'
Kaldheim
See merge request core-developers/forge!3764
|
2021-02-05 18:27:35 +00:00 |
|
Sol
|
8d91d23357
|
Update boosterboxes.txt
|
2021-02-05 18:27:01 +00:00 |
|
Sol
|
a7ccc97b33
|
Update Standard.txt
|
2021-02-05 18:25:43 +00:00 |
|
Michael Kamensky
|
6d9027bf47
|
Merge branch 'translate_newstring' into 'master'
update simplified chinese translation
See merge request core-developers/forge!3760
|
2021-02-05 16:58:52 +00:00 |
|
Hans Mackowiak
|
11fa67a396
|
Merge branch 'codespell' into 'master'
KHM: Codespell Cleric and support
See merge request core-developers/forge!3716
|
2021-02-05 16:24:24 +00:00 |
|
Tim Mocny
|
1eec7475fe
|
KHM: Codespell Cleric and support
|
2021-02-05 16:24:24 +00:00 |
|
Michael Kamensky
|
0b6d0914a0
|
Merge branch 'master' into 'master'
mobile:dynamic generate character set for each language.
See merge request core-developers/forge!3731
|
2021-02-05 15:23:17 +00:00 |
|
Michael Kamensky
|
b1dc7f3011
|
Merge branch 'betrayal' into 'master'
add King Narfi's Betrayal
See merge request core-developers/forge!3761
|
2021-02-05 15:23:00 +00:00 |
|
Hans Mackowiak
|
5a970d449f
|
Merge branch 'reckless_crew' into 'master'
add Reckless Crew
See merge request core-developers/forge!3762
|
2021-02-05 14:54:35 +00:00 |
|
Hans Mackowiak
|
093c8647ae
|
add Reckless Crew
|
2021-02-05 15:53:22 +01:00 |
|
Michael Kamensky
|
ff3bd8e7ed
|
Merge branch 'undefined' into 'master'
KHC 3 cards
See merge request core-developers/forge!3759
|
2021-02-05 14:51:51 +00:00 |
|
John
|
a571f4747b
|
Update elderfang_venom.txt
|
2021-02-05 14:47:09 +00:00 |
|
John
|
3a2a5d740b
|
Spectral Deluge
|
2021-02-05 14:18:57 +00:00 |
|
Hans Mackowiak
|
35946678de
|
add King Narfi's Betrayal
|
2021-02-05 14:58:29 +01:00 |
|
John
|
479bb7e361
|
Update sage_of_the_beyond.txt
|
2021-02-05 13:44:50 +00:00 |
|
John
|
86b34f9f3a
|
Sage of the Beyond
|
2021-02-05 13:43:40 +00:00 |
|
CCTV-1
|
e2622f0c26
|
translate new strings.
|
2021-02-05 21:23:58 +08:00 |
|
Hans Mackowiak
|
7478c6121b
|
Foretell cast only by owner
|
2021-02-05 14:06:26 +01:00 |
|
Hans Mackowiak
|
772d1ea6fd
|
Merge branch 'Williams-master-patch-55492' into 'master'
KHM fixes 5 Feb
See merge request core-developers/forge!3758
|
2021-02-05 12:55:38 +00:00 |
|