Commit Graph

46155 Commits

Author SHA1 Message Date
Northmoc
a89f2bc1d9 EndTurnEffect - Optional and Defined support 2020-11-11 01:27:11 -05:00
Northmoc
08392d7fab obeka_brute_chronologist.txt 2020-11-11 01:26:34 -05:00
Michael Kamensky
bfdeeade84 Merge branch 'sphinx2nd' into 'master'
CMR: Sphinx of the Second Sun

See merge request core-developers/forge!3371
2020-11-11 04:08:31 +00:00
Michael Kamensky
0e57d35e16 Merge branch 'nevin' into 'master'
CMR: Nevinyrral, Urborg Tyrant

See merge request core-developers/forge!3372
2020-11-11 04:08:05 +00:00
Michael Kamensky
64cfa70c6e Merge branch 'jared' into 'master'
CMR: Jared, True Hair Metal Band and support for "you can't become monarch"

See merge request core-developers/forge!3376
2020-11-11 04:07:49 +00:00
Michael Kamensky
e59ad09ca1 Merge branch 'fixChangeZoneTriggerNewCard' into 'master'
TriggerChangesZone: add NewCard for leave the battlefield trigger

See merge request core-developers/forge!3373
2020-11-11 04:07:04 +00:00
Hans Mackowiak
f0ed3f095d TriggerChangesZone: add NewCard for leave the battlefield trigger 2020-11-11 04:07:04 +00:00
Northmoc
b2e6987eae (KW$ You can’t become the monarch this turn) support 2020-11-10 16:07:12 -05:00
Northmoc
e5e81c0290 jared_carthalion_true_heir.txt 2020-11-10 16:06:35 -05:00
Northmoc
cb9682a7b8 "AdditionalBeginningPhase" support 2020-11-10 15:02:47 -05:00
Northmoc
8b55e9d417 sphinx_of_the_second_sun.txt 2020-11-10 15:02:46 -05:00
Northmoc
6406def04b more AI, NICKNAME 2020-11-10 15:01:30 -05:00
Northmoc
75ad926855 nevinyrral_urborg_tyrant.txt 2020-11-10 15:01:30 -05:00
Northmoc
1a35ee06b8 nevinyrral_urborg_tyrant.txt 2020-11-10 15:01:29 -05:00
Tim Mocny
e022f5f1be Merge branch 'rollbacktokenizerfix' into 'master'
rollback my bad tokenizer fix

See merge request core-developers/forge!3375
2020-11-10 19:59:22 +00:00
Tim Mocny
b9cba90b8f Merge branch 'patch-6' into 'master'
Update de-DE.properties

See merge request core-developers/forge!3374
2020-11-10 19:58:16 +00:00
Northmoc
e752c6264a rollback my bad tokenizer fix 2020-11-10 14:54:57 -05:00
Hans Mackowiak
ece0887135 fix TargetChoices 2020-11-10 17:48:32 +01:00
Andreas Bendel
35f2511bb0 Update de-DE.properties
lblChooseAColorFor
"Choose a color for X" label
2020-11-10 16:42:52 +00:00
Michael Kamensky
7b18fc4474 Merge branch 'fixes' into 'master'
Various card fixes

See merge request core-developers/forge!3369
2020-11-10 03:48:07 +00:00
Sol
92b03ba34c Merge branch 'dfd' into 'master'
(dire_fleet_daredevil.txt) chained Effects memory issue

Closes #1497

See merge request core-developers/forge!2975
2020-11-10 02:21:46 +00:00
Northmoc
f433a19312 dire_fleet_daredevil.txt works 2020-11-09 19:42:45 -05:00
Northmoc
6de467c71a jeska_thrice_reborn.txt Effect SVars typo 2020-11-09 19:37:56 -05:00
Northmoc
42cf7bb1b7 ich_tekik_salvage_splicer.txt all Artifacts cause trigger 2020-11-09 19:37:56 -05:00
Northmoc
0d35c0a558 yidris_maelstrom_wielder.txt 2020-11-09 19:37:55 -05:00
Northmoc
174a2148ea trove_warden.txt 2020-11-09 19:37:55 -05:00
Tim Mocny
2807e97170 Merge branch 'kediss' into 'master'
fix this thing's name

See merge request core-developers/forge!3370
2020-11-10 00:25:17 +00:00
Northmoc
a4cda30a7c fix this thing's name 2020-11-09 19:24:37 -05:00
Michael Kamensky
55878cf37b Merge branch 'theprismaticpiper' into 'master'
CMR: The Prismatic Piper and support

Closes #1546

See merge request core-developers/forge!3359
2020-11-09 18:44:34 +00:00
Anthony Calosa
37c3f00d5e Merge branch 'master' into 'master'
Remove Unnecessary Import

See merge request core-developers/forge!3366
2020-11-09 15:18:04 +00:00
Anthony Calosa
4d769999f4 Remove Unnecessary Import 2020-11-09 23:17:30 +08:00
Northmoc
553c28cc02 RemoveDeck:All... for now 2020-11-09 09:55:33 -05:00
Northmoc
b44b4fe944 translation 2020-11-09 09:55:33 -05:00
Northmoc
92bcece207 "Choose a color for X" label (3 translations needed) 2020-11-09 09:55:32 -05:00
Northmoc
66f0f0c864 support for choose color before game keyword 2020-11-09 09:55:32 -05:00
Northmoc
7e3de4d128 the_prismatic_piper.txt 2020-11-09 09:55:32 -05:00
Michael Kamensky
9fe838b041 Merge branch 'cmrtokens' into 'master'
CMR editions (tokens and categories)

See merge request core-developers/forge!3365
2020-11-09 14:49:36 +00:00
Michael Kamensky
1069b60b2a Merge branch 'dargo' into 'master'
CMR: Dargo and support

See merge request core-developers/forge!3323
2020-11-09 14:49:02 +00:00
Michael Kamensky
644403834f Merge branch 'master' into 'master'
update chinese translation

See merge request core-developers/forge!3363
2020-11-09 14:48:24 +00:00
Michael Kamensky
017e709a46 Merge branch '1530-reality-acid-glitch-with-flicker-of-fate' into 'master'
Resolve "Reality Acid glitch with Flicker of Fate"

Closes #1530

See merge request core-developers/forge!3121
2020-11-09 14:48:08 +00:00
Northmoc
6af0af8fc6 style fix 2020-11-09 09:47:03 -05:00
Northmoc
a29cb982de PW decks -> precon product 2020-11-09 09:47:02 -05:00
Northmoc
9a97aeedd4 add editions categories to CMR 2020-11-09 09:47:02 -05:00
Northmoc
1785785d4e add tokens to editions file 2020-11-09 09:47:01 -05:00
Michael Kamensky
ae21b9dcdc Merge branch 'runChaosEffect' into 'master'
RunChaos: better effect for Pools of Becoming

See merge request core-developers/forge!3362
2020-11-09 13:23:41 +00:00
Northmoc
cd46705791 Dargo better detail pane 2020-11-09 07:51:16 -05:00
Northmoc
94e3b5ac91 dargo_the_shipwrecker.txt and support 2020-11-09 07:51:16 -05:00
Northmoc
689a4516fd dargo v1 2020-11-09 07:51:15 -05:00
Tim Mocny
c39a611a6e Merge branch 'quickfix' into 'master'
Quick fix in ZNR editions file

See merge request core-developers/forge!3364
2020-11-09 12:30:39 +00:00
Northmoc
4849cac9f1 promos -> promo 2020-11-09 07:28:30 -05:00