Commit Graph

46877 Commits

Author SHA1 Message Date
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
CCTV-1
8c72cd38fb update some translation 2020-11-09 17:56:02 +08:00
Hythonia
99d3678925 Update nicol_bolas_the_ravager.txt 2020-11-09 09:23:46 +00: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
Michael Kamensky
69d132880d Merge branch 'cmr8' into 'master'
CMR - 8 Nov

See merge request core-developers/forge!3358
2020-11-09 04:37:22 +00:00
Northmoc
68e4f86642 Add Triggered Type to StoreSVarEffect.java 2020-11-08 21:19:43 -05: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
Northmoc
7efeeffb48 soul_of_eternity.txt (medusa) 2020-11-08 12:32:15 -05:00
Northmoc
a705214665 tuya_bearclaw.txt (medusa) 2020-11-08 12:30:23 -05:00
Northmoc
09ef98d5d6 kinsbaile_courier.txt (medusa) 2020-11-08 12:28:13 -05:00
Northmoc
ae79734b4e crimson_fleet_commodore.txt (medusa) 2020-11-08 12:26:03 -05:00
Northmoc
e98a13b906 flamekin_herald.txt (medusa) 2020-11-08 12:25:02 -05:00
Hans Mackowiak
1a8b10c1c8 cards: update Destory Defined$ Triggered 2020-11-08 17:33:18 +01:00
Hans Mackowiak
8e6fffe363 update cards 2020-11-08 16:55:36 +01:00
Hans Mackowiak
384d687b2f ~ update zone lki list 2020-11-08 16:55:36 +01:00
Hans Mackowiak
0d2765f787 DestroyEffect: use timestamp check for triggered cards 2020-11-08 16:55:30 +01:00
Michael Kamensky
8ca9739bf3 Merge branch 'removeIntrinsicAbilitiesCleanup' into 'master'
AnimateEffect: combine into the BaseEffect, remove not needed RemoveIntrinsicAbilities

See merge request core-developers/forge!3357
2020-11-08 15:50:09 +00:00
Hans Mackowiak
460960123e AnimateEffect: combine into the BaseEffect, remove not needed RemoveIntrinsicAbilities 2020-11-08 15:50:09 +00:00
Michael Kamensky
a492a52fe1 Merge branch 'cmr7' into 'master'
CMR - 7 Nov

See merge request core-developers/forge!3352
2020-11-08 13:44:09 +00:00
Michael Kamensky
9611a6960e Merge branch 'tokenizerfix' into 'master'
Tokenizer CARDNAME substitution fix

See merge request core-developers/forge!3350
2020-11-08 13:43:29 +00:00