Commit Graph

13837 Commits

Author SHA1 Message Date
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
e5e81c0290 jared_carthalion_true_heir.txt 2020-11-10 16:06:35 -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
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
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
Northmoc
a4cda30a7c fix this thing's name 2020-11-09 19:24:37 -05: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
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
Northmoc
4849cac9f1 promos -> promo 2020-11-09 07:28:30 -05:00
CCTV-1
8c72cd38fb update some translation 2020-11-09 17:56:02 +08:00
CCTV-1
96c1fdd32f translate new button 2020-11-09 17:02:07 +08:00
Hans Mackowiak
5a8429351b RunChaos: better effect for Pools of Becoming 2020-11-09 08:43:05 +01:00
Michael Kamensky
94e5c99694 Merge branch 'bell_borca' into 'master'
CMR: Bell Borca and support

See merge request core-developers/forge!3361
2020-11-09 04:39:01 +00:00
Michael Kamensky
57b9260d8a Merge branch 'true_editions' into 'master'
Editions can generate their own print sheets now

See merge request core-developers/forge!3344
2020-11-09 04:38:04 +00:00
Michael Kamensky
76cb42a0d9 Merge branch 'patch-6' into 'master'
Update de-DE.properties

See merge request core-developers/forge!3360
2020-11-09 04:37:48 +00:00
Northmoc
1665667a2b bell_borca_spectral_sergeant.txt 2020-11-08 21:19:09 -05:00
Andreas Bendel
1560fedbfd Update de-DE.properties
lblPlayMultipleOpponents NEW
2020-11-08 20:41:36 +00:00
Northmoc
1dc6a97f78 impulsive_pilferer.txt (medusa) 2020-11-08 12:47:43 -05:00
Northmoc
2898274fc7 fathom_fleet_swordjack.txt (medusa) 2020-11-08 12:45:47 -05:00
Northmoc
296801d08a coercive_recruiter.txt (medusa) 2020-11-08 12:43:41 -05:00
Northmoc
65bebe77a9 nightshade_harvester.txt (medusa) 2020-11-08 12:38:37 -05:00
Northmoc
001d4e9af7 rakshasa_debaser.txt (medusa) 2020-11-08 12:36:46 -05:00
Northmoc
21b4292825 triumphant_reckoning.txt (medusa) 2020-11-08 12:34:16 -05:00