Commit Graph

46877 Commits

Author SHA1 Message Date
Rob Schnautz
6c862be67d Update forge-gui/res/cardsfolder/upcoming/blast_from_the_past.txt, forge-gui/res/cardsfolder/upcoming/crow_storm.txt, forge-gui/res/cardsfolder/upcoming/earl_of_squirrel.txt, forge-gui/res/cardsfolder/upcoming/form_of_the_squirrel.txt files 2020-11-18 22:03:26 +00:00
Northmoc
1cb21ab124 fix bad label capitalization 2020-11-18 12:32:47 -05:00
Michael Kamensky
6ef6c07391 Merge branch 'comm_plate' into 'master'
StaticAbility mass keyword building updates for CMR (incl Commander's Plate and Rebbec)

See merge request core-developers/forge!3409
2020-11-18 05:28:35 +00:00
Michael Kamensky
a93703ea55 Merge branch 'ofix' into 'master'
explosion_of_riches.txt with ImmediateTrigger

See merge request core-developers/forge!3412
2020-11-18 05:28:03 +00:00
Michael Kamensky
536568164e Merge branch 'unreal' into 'master'
as discussed, a few unsanctioned cards

See merge request core-developers/forge!3413
2020-11-18 05:27:47 +00:00
Michael Kamensky
6e32baf641 Merge branch 'trench' into 'master'
CMR: Trench Behemoth

See merge request core-developers/forge!3398
2020-11-18 05:27:22 +00:00
Rob Schnautz
70ef98364a as discussed, a few unsanctioned cards 2020-11-17 23:50:56 +00:00
Northmoc
59144873b9 move EachCMCAmongDefined up as well 2020-11-17 15:01:16 -05:00
Northmoc
ab8b3e7a09 add EachCMCAmongDefined multiple keyword builder to StaticAbilityContinuous 2020-11-17 15:01:15 -05:00
Northmoc
dcf6537e32 rebbec_architect_of_ascension.txt 2020-11-17 15:01:15 -05:00
Northmoc
a9c1542d24 move Commander color ID keyword builder to correct spot 2020-11-17 15:01:15 -05:00
Northmoc
ed7955306a streamline other Commander color identity references 2020-11-17 15:01:14 -05:00
Northmoc
34a21d309b add keyword "Protection from CommanderColorID" and "Protection from NotCommanderColorID" support to StaticAbilityContinuous.java 2020-11-17 15:01:14 -05:00
Northmoc
940e95781c add ColorSets "getCommanderColorID" and "getNotCommanderColorID" to Player.java 2020-11-17 15:01:14 -05:00
Northmoc
412cadf63a commanders_plate.txt 2020-11-17 15:01:13 -05:00
Northmoc
2458ca8fdb explosion_of_riches.txt with ImmediateTrigger 2020-11-17 14:34:24 -05:00
Tim Mocny
26b100d62f Merge branch 'ofix' into 'master'
Alharu Oracle fix

See merge request core-developers/forge!3411
2020-11-17 17:07:45 +00:00
Northmoc
859dcf8360 Alharu Oracle fix 2020-11-17 12:04:55 -05:00
Hans Mackowiak
650a0f0101 Merge branch 'attackIfHaste' into 'master'
CombatUtil: turn 'can attack as if Haste' into Static Ability check

See merge request core-developers/forge!3410
2020-11-17 06:48:47 +00:00
Hans Mackowiak
f4df565e55 CombatUtil: turn 'can attack as if Haste' into Static Ability check 2020-11-16 21:16:44 +01:00
Michael Kamensky
caa709f731 Merge branch 'typos' into 'master'
Various small typos and fixes

See merge request core-developers/forge!3408
2020-11-16 18:43:17 +00:00
Michael Kamensky
7842407e34 Merge branch 'kitesail' into 'master'
CMR: kitesail_skirmisher.txt and support

See merge request core-developers/forge!3405
2020-11-16 18:42:56 +00:00
Northmoc
386a525522 hamza_guardian_of_arashin.txt fix 2nd EffectZone 2020-11-16 10:26:52 -05:00
Northmoc
6076f16c69 AI hint while we're at it 2020-11-16 10:26:51 -05:00
Northmoc
1df47ad83f Typos and legion_warboss.txt KW timing 2020-11-16 10:26:51 -05:00
Northmoc
52a84153e7 trench_behemoth.txt final 2020-11-16 10:09:07 -05:00
Tim Mocny
27ef464a20 Merge branch 'fixes' into 'master'
2 small CMR fixes

See merge request core-developers/forge!3407
2020-11-16 12:43:51 +00:00
Northmoc
fc08e161d7 zara_renegade_recruiter.txt "Flying" 2020-11-16 07:41:24 -05:00
Northmoc
f1bc95bf74 AI token hint 2020-11-16 07:27:25 -05:00
Northmoc
afd5877ccd krark_the_thumbless.txt "may choose new targets for copy" 2020-11-16 07:25:04 -05:00
Hans Mackowiak
bd09649bf2 fix Trinisphere 2020-11-16 10:50:53 +01:00
Hans Mackowiak
ce4ad8d439 Liesa Shroud of Dusk: fix CommanderTax replacement 2020-11-16 10:38:13 +01:00
Michael Kamensky
993768cf06 Merge branch 'changeZoneDelayedTriggerFix' into 'master'
ChangeZone: fix using DelayedTriggerRememberedLKI

See merge request core-developers/forge!3404
2020-11-16 06:21:04 +00:00
Hans Mackowiak
e02e7a8b5d ChangeZone: fix using DelayedTriggerRememberedLKI 2020-11-16 06:21:04 +00:00
Northmoc
5501134a9e kitesail_skirmisher.txt and support 2020-11-15 20:48:51 -05:00
Tim Mocny
0312c14756 Merge branch 'patch-12' into 'master'
Update Commander Legends.txt token typo

See merge request core-developers/forge!3402
2020-11-15 20:30:16 +00:00
John
c41787e7b5 Update Commander Legends.txt token typo 2020-11-15 20:03:50 +00:00
Michael Kamensky
021e0de86d Merge branch 'master' into 'master'
Nicol Bolas, the Ravager + minor patches

See merge request core-developers/forge!3397
2020-11-15 07:28:58 +00:00
Michael Kamensky
dfe64d7b3a Merge branch 'cmr14' into 'master'
CMR - 14 Nov

See merge request core-developers/forge!3399
2020-11-15 07:28:36 +00:00
Michael Kamensky
68b21d1fac Merge branch 'clean' into 'master'
Glacial Grasp - make stack description more ambigious (think control change)

See merge request core-developers/forge!3400
2020-11-15 07:27:48 +00:00
Northmoc
cfca21742b liesa_shroud_of_dusk.txt 2020-11-14 18:48:46 -05:00
Northmoc
29bd910487 tweak stack description against control change 2020-11-14 15:05:39 -05:00
Northmoc
6d5582eaee blazing_sunsteel.txt 2020-11-14 15:05:17 -05:00
Northmoc
6313c38cb0 wyleth_soul_of_steel.txt 2020-11-14 15:05:16 -05:00
Hythonia
ff4a0c4679 Update woe_strider.txt 2020-11-14 19:02:52 +00:00
Hythonia
11c2d887fd Update scrapheap_scrounger.txt 2020-11-14 19:00:31 +00:00
Hythonia
0d44c07645 Update black_oak_of_odunos.txt 2020-11-14 18:59:11 +00:00
Hythonia
7e41a171ad Update blightning.txt 2020-11-14 18:55:35 +00:00
Michael Kamensky
a4cd0315ac Merge branch 'KLR' into 'master'
Kaladesh Remastered support

See merge request core-developers/forge!3396
2020-11-14 15:06:43 +00:00
Michael Kamensky
095fa591b8 Merge branch 'cleanup' into 'master'
Some cleanup

See merge request core-developers/forge!3395
2020-11-14 15:06:09 +00:00