Commit Graph

44804 Commits

Author SHA1 Message Date
swordshine
54e8c6f0ec Merge branch 'patch' into 'master'
Add Ormos, Archive Keeper

See merge request core-developers/forge!2927
2020-06-29 01:00:15 +00:00
swordshine
da6188e61c Update es-ES 2020-06-29 08:54:14 +08:00
Michael Kamensky
52fef4b724 Merge branch 'heartPiecerTrigger' into 'master'
ImmediateTrigger: use this trigger for heart-piercer manticore and get rid of CauseParam

See merge request core-developers/forge!2928
2020-06-28 16:20:09 +00:00
Hans Mackowiak
f29cd22926 ImmediateTrigger: use this trigger for heart-piercer manticore and get rid of CauseParam 2020-06-28 17:53:47 +02:00
swordshine
ab6a322f98 Fix a line in AiCostDecision 2020-06-28 22:35:32 +08:00
swordshine
e44125ec1c Update zh-CN 2020-06-28 21:53:51 +08:00
swordshine
558fbd3946 Add Ormos, Archive Keeper 2020-06-28 20:40:56 +08:00
swordshine
47f527b3ff Merge branch 'patch' into 'master'
Add Towering Titan

See merge request core-developers/forge!2924
2020-06-28 07:07:08 +00:00
swordshine
b06add33d2 Update the script 2020-06-28 14:44:17 +08:00
swordshine
24d2c8dc2f Add Towering Titan 2020-06-28 14:06:42 +08:00
swordshine
2fb6849ae2 Merge branch 'patch' into 'master'
Add Inniaz, the Gale Force

See merge request core-developers/forge!2921
2020-06-28 01:44:50 +00:00
swordshine
f5de946830 Merge branch 'mill2' into 'master'
Remove Mill effect from non-mill cards

See merge request core-developers/forge!2908
2020-06-28 01:44:43 +00:00
Tim Mocny
39deffdc56 Remove Mill effect from non-mill cards 2020-06-28 01:44:43 +00:00
swordshine
85062cba83 Merge branch 'JMP.27' into 'master'
JMP - 27 June

See merge request core-developers/forge!2922
2020-06-28 01:36:00 +00:00
Tim Mocny
17392a29ab JMP - 27 June 2020-06-28 01:35:59 +00:00
swordshine
aa21883049 Add Inniaz, the Gale Force 2020-06-27 22:28:20 +08:00
Michael Kamensky
ca7691adee Merge branch 'sanctumOfAll' into 'master'
M21: add Sanctum of All

Closes #1471

See merge request core-developers/forge!2920
2020-06-27 13:18:25 +00:00
Hans Mackowiak
51fdf21d1e M21: add Sanctum of All 2020-06-27 14:53:01 +02:00
swordshine
015bb428e4 Merge branch 'master' into 'master'
fix:missing some translation

See merge request core-developers/forge!2919
2020-06-27 11:03:23 +00:00
CCTV-1
645b6d89d2 fix:missing some translation. 2020-06-27 18:36:57 +08:00
Michael Kamensky
e60986e04e Merge branch 'SRPref' into 'master'
Screen reader flag with Initial Mana Cost handling

See merge request core-developers/forge!2916
2020-06-27 05:22:18 +00:00
swordshine
e8eb7abf48 Merge branch 'JMP.26' into 'master'
JMP - 26 June

See merge request core-developers/forge!2917
2020-06-27 03:25:16 +00:00
swordshine
425472cd54 Merge branch 'card_fix' into 'master'
fix "Sublime Epiphany"

See merge request core-developers/forge!2918
2020-06-27 03:24:37 +00:00
CCTV-1
48f109b7f6 fix:"Sublime Epiphany" can't select draw card player. 2020-06-27 09:56:55 +08:00
Northmoc
420db21d83 immolating_gyre.txt 2020-06-26 15:27:52 -04:00
Zachary Kline
54436ac2e3 Initial screen reader optimization. 2020-06-26 11:54:36 -07:00
Michael Kamensky
bb0d6c4606 Merge branch 'patch' into 'master'
Add Eon Frolicker

Closes #1362

See merge request core-developers/forge!2914
2020-06-26 17:11:57 +00:00
Michael Kamensky
dc058fccc1 Merge branch 'typo' into 'master'
pestilent_haze.txt fix

See merge request core-developers/forge!2915
2020-06-26 17:11:29 +00:00
Northmoc
8af5c1302d pestilent_haze.txt fix 2020-06-26 12:11:53 -04:00
swordshine
29a7c98185 Add Eon Frolicker 2020-06-26 22:18:54 +08:00
swordshine
bb4f4272ca Merge branch 'patch' into 'master'
More cards

Closes #1473

See merge request core-developers/forge!2912
2020-06-26 12:57:39 +00:00
swordshine
01183c454b Update ReplacementMill 2020-06-26 16:46:14 +08:00
swordshine
e3863b0712 Merge branch 'patch-7' into 'master'
Update es-ES.properties

See merge request core-developers/forge!2913
2020-06-26 06:50:52 +00:00
Churrufli
0cff9ebdf0 Update es-ES.properties 2020-06-26 06:43:24 +00:00
swordshine
5fc1f92309 Update Charmed Pendant to be compatible with ChangeText effects 2020-06-26 14:39:51 +08:00
swordshine
7b0247aba5 Merge branch 'thriving_land' into 'master'
JMP: add Thriving lands

See merge request core-developers/forge!2911
2020-06-26 05:50:33 +00:00
swordshine
f9f2b65e45 Add Sanctuary Blade 2020-06-26 13:42:14 +08:00
Hans Mackowiak
e4fb9d8a9b JMP: add Thriving lands 2020-06-26 07:02:20 +02:00
swordshine
f8dab4a4b2 Merge branch 'patch' into 'master'
Update CostMill

See merge request core-developers/forge!2910
2020-06-26 04:36:53 +00:00
swordshine
088062a93e Update Ai PaymentDecision 2020-06-26 12:14:27 +08:00
swordshine
6049a681e8 Update CostMill 2020-06-26 12:04:15 +08:00
swordshine
c622291c4e Merge branch 'patch' into 'master'
Update some scripts

See merge request core-developers/forge!2909
2020-06-26 03:38:28 +00:00
swordshine
450c7c5b71 Update some scripts 2020-06-26 11:33:38 +08:00
swordshine
b5ebf2185f Merge branch 'mill' into 'master'
Mill oracle updates

Closes #1469

See merge request core-developers/forge!2907
2020-06-26 03:30:28 +00:00
Tim Mocny
fa240f6dc2 Mill oracle updates 2020-06-26 03:30:27 +00:00
swordshine
b23b4a0888 Merge branch 'JMP.24' into 'master'
JMP - 24 June

See merge request core-developers/forge!2906
2020-06-26 03:24:46 +00:00
Tim Mocny
2fc2d623a8 JMP - 24 June 2020-06-26 03:24:44 +00:00
swordshine
58c7d69d27 Merge branch 'patch' into 'master'
More JMP cards (will update the CostMill after the oracle changes are finished)

See merge request core-developers/forge!2905
2020-06-26 03:22:13 +00:00
swordshine
730a7adf2a Update the scripts 2020-06-25 13:55:17 +08:00
swordshine
39d24724c6 Move cards to the JMP folder 2020-06-24 22:40:37 +08:00