Commit Graph

46850 Commits

Author SHA1 Message Date
Northmoc
9bb425c2ab ValidCards > Defined 2020-10-31 00:28:03 -04:00
Northmoc
8ee13d7abe few more little tweaks 2020-10-30 23:46:09 -04:00
Northmoc
be6d633763 Clean up card detail mess 2020-10-30 19:48:13 -04:00
Northmoc
64131f15e5 Encore keyword/reminder text 2020-10-30 18:44:09 -04:00
Northmoc
ea908ce5ad rest of Encore mechanic 2020-10-30 18:43:45 -04:00
Northmoc
dc8be8c0a0 Encore mechanic 2020-10-30 18:40:35 -04:00
Northmoc
fa619ee16e - small typo 2020-10-30 18:39:36 -04:00
Northmoc
347dfa05bf amphin_mutineer.txt and token 2020-10-30 14:22:25 -04:00
Northmoc
0dd0b50e6f jewelled_lotus.txt (guytrash) 2020-10-30 14:07:52 -04:00
Northmoc
ca9714bbc4 StaticAbility.java add UnlessDefinedPlayer param 2020-10-30 13:50:31 -04:00
Northmoc
60b1b223eb fall_from_favor.txt 2020-10-30 13:49:46 -04:00
Northmoc
25b211012f amareth_the_lustrous.txt 2020-10-30 11:12:08 -04:00
Northmoc
b546b99daf ghost_of_ramirez_depietro.txt and keyword support 2020-10-30 09:42:07 -04:00
Northmoc
0218aee82a AI improvements 2020-10-30 08:15:10 -04:00
Northmoc
a17060bb89 jeskas_will.txt 2020-10-30 08:15:09 -04:00
Northmoc
d4b9d54674 kamahls_will.txt 2020-10-30 08:15:09 -04:00
Northmoc
7925ba2cbb szats_will.txt cleanup 2020-10-30 08:15:09 -04:00
Northmoc
e21f793cfe seraphic_greatsword.txt 2020-10-30 08:15:08 -04:00
Northmoc
0ffc6be2cd szats_will.txt 2020-10-30 08:15:08 -04:00
Northmoc
e7854ab069 kodis_emberclaw_familiar.txt (guytrash) 2020-10-30 08:15:07 -04:00
Northmoc
38174b8b29 kamahl_heart_of_krosa.txt (guytrash) 2020-10-30 08:15:07 -04:00
swordshine
3721873093 Merge branch 'cmr27' into 'master'
CMR - 27 Oct

See merge request core-developers/forge!3296
2020-10-30 04:37:07 +00:00
Michael Kamensky
5438abe24e Merge branch 'triggerDamageAllExtend' into 'master'
TriggerDamageAll: add triggered objects for Sources and Targets, AbilityUtils supports Sets now

Closes #1620

See merge request core-developers/forge!3307
2020-10-30 03:43:47 +00:00
Hythonia
f455b95f80 Belbe, Corrupted Observer 2020-10-29 18:55:21 +01:00
Hythonia
a48db1829f Meteoric Mace and Natural Reclamation 2020-10-29 17:48:00 +01:00
Hythonia
780a877c4b Merge remote-tracking branch 'origin/master' 2020-10-29 17:02:55 +01:00
Hythonia
afbe9ccfe9 Local cards 2020-10-29 17:02:17 +01:00
Hans Mackowiak
ffc4cfebec TriggerDamageAll: add triggered objects for Sources and Targets, AbilityUtils supports Sets now 2020-10-29 14:32:47 +01:00
swordshine
8aabeb0d75 Merge branch 'profane' into 'master'
CMR: Profane Transfusion and support

See merge request core-developers/forge!3302
2020-10-29 11:16:58 +00:00
swordshine
16fac06695 Merge branch 'cmr28' into 'master'
CMR :: 28 Oct

See merge request core-developers/forge!3305
2020-10-29 11:14:46 +00:00
swordshine
0f95d631c2 Merge branch 'master' into 'master'
CMR: Court of Cunning + support

See merge request core-developers/forge!3306
2020-10-29 11:13:41 +00:00
Hythonia
322e26c7bf Revert "Add "isNotMonarch" property"
This reverts commit ec0c826bf2
2020-10-29 10:51:19 +00:00
Hythonia
79daf02db6 Fix "Count$Monarch" 2020-10-29 10:50:38 +00:00
Hythonia
e01fae1daf Fix Court of Cunning 2020-10-29 10:42:36 +00:00
Hythonia
fef9ca7690 Add court_of_cunning.txt 2020-10-29 09:08:20 +00:00
Hythonia
89186afff5 Enable "Count$Monarch.X.Y" 2020-10-29 09:02:07 +00:00
Hythonia
ec0c826bf2 Add "isNotMonarch" property 2020-10-29 08:48:27 +00:00
Michael Kamensky
691f6f27dc Merge branch 'patch-6' into 'master'
Update de-DE.properties

See merge request core-developers/forge!3304
2020-10-29 06:44:44 +00:00
Michael Kamensky
a7790cf94b Merge branch 'master' into 'master'
translate new setting

See merge request core-developers/forge!3299
2020-10-29 06:44:41 +00:00
Hans Mackowiak
188c623365 CharmEffect: hotfix for getCardForUi 2020-10-29 03:07:32 +01:00
Northmoc
e55238e0af radiant_serra_archangel.txt 2020-10-28 20:11:53 -04:00
Northmoc
7dfd0adb7e magus_of_the_order.txt 2020-10-28 20:11:41 -04:00
Northmoc
fd683e73c6 eyeblight_cullers.txt 2020-10-28 20:11:28 -04:00
Andreas Bendel
670d5345d6 Update de-DE.properties
Translation of new AltLifeDisplay entries
2020-10-28 21:08:11 +00:00
Sol
2c7068457b Merge branch 'update-mana-conversion' into 'master'
Update cards for Conversion strings

See merge request core-developers/forge!3301
2020-10-28 17:57:08 +00:00
Northmoc
b33c73c7cf Szat AI improvements 2020-10-28 12:10:12 -04:00
Northmoc
7ca74a25cc merchant_raiders.txt 2020-10-28 12:10:12 -04:00
Northmoc
4dc85e5f2b editions update 2020-10-28 12:10:11 -04:00
Northmoc
6b2b1436de tevesh_szat_doom_of_fools.txt 2020-10-28 12:10:11 -04:00
Northmoc
9a0dd25590 blim_comedic_genius.txt (guytrash) 2020-10-28 12:10:10 -04:00