Commit Graph

49974 Commits

Author SHA1 Message Date
Sol
719bd257a6 Merge branch 'retriever_phoenix_fix' into 'master'
Retriever Phoenix fix for the following error

See merge request core-developers/forge!4420
2021-04-07 12:08:59 +00:00
paul_snoops
e21257ab71 Retriever Phoenix fix for the following error
Caused by: java.lang.RuntimeException: AbilityFactory : getAbility -- Retriever Phoenix has no SVar: TrigLearn
2021-04-07 12:39:41 +01:00
Bug Hunter
fc933ba9d5 Merge branch 'TRT-master-patch-18852' into 'master'
Update forge-gui/res/cardsfolder/upcoming/basic_conjuration.txt

See merge request core-developers/forge!4419
2021-04-07 09:32:28 +00:00
Bug Hunter
9f9215cb3f Update forge-gui/res/cardsfolder/upcoming/basic_conjuration.txt 2021-04-07 09:31:36 +00:00
Anthony Calosa
8308c21d39 Merge branch 'kevlahnota-master-patch-67446' into 'master'
Update StaticData.java

See merge request core-developers/forge!4418
2021-04-07 08:00:16 +00:00
Anthony Calosa
1f6ef5f045 Update StaticData.java 2021-04-07 07:59:39 +00:00
Anthony Calosa
7673918178 Merge branch 'master' into 'master'
Update support for Custom Cards

See merge request core-developers/forge!4417
2021-04-07 07:53:23 +00:00
Anthony Calosa
92b0aad937 Update support for Custom Cards 2021-04-07 15:50:24 +08:00
Michael Kamensky
233e126cd3 Merge branch 'Williams-master-patch-47951' into 'master'
Update Judge Gift Cards 2021.txt

See merge request core-developers/forge!4416
2021-04-07 07:33:50 +00:00
John
e9506787d5 Update Judge Gift Cards 2021.txt 2021-04-07 06:51:51 +00:00
John
e061289a26 Update elementalists_palette.txt 2021-04-07 06:47:38 +00:00
Michael Kamensky
7f87164235 Merge branch 'learnEffect' into 'master'
Learn effect

See merge request core-developers/forge!4374
2021-04-07 05:11:55 +00:00
Hans Mackowiak
0627d37f69 - Basic AI for AF Learn
- Some minor tweaks and fixes for AF Learn
2021-04-07 05:11:55 +00:00
Michael Kamensky
68dc49cb88 Merge branch 'secretly' into 'master'
Emissary of Grudges, Stalking Leonin

See merge request core-developers/forge!4413
2021-04-07 05:11:28 +00:00
Michael Kamensky
24cf97ca84 Merge branch 'cultic' into 'master'
Add Cultic Cube

See merge request core-developers/forge!4411
2021-04-07 05:08:13 +00:00
Michael Kamensky
9859cbdca6 Merge branch 'ConditionDefinedSpells' into 'master'
SpellAbilityCondition: extends ConditionDefined to work with SpellAbilities

See merge request core-developers/forge!4412
2021-04-07 05:07:58 +00:00
Michael Kamensky
b819f303bb Merge branch 'new-cards' into 'master'
C21 Cards

See merge request core-developers/forge!4414
2021-04-07 05:07:18 +00:00
Michael Kamensky
5ad4a25c33 Merge branch 'card-fixes' into 'master'
Some card fixes

See merge request core-developers/forge!4415
2021-04-07 05:07:01 +00:00
Adam Pantel
265e5bb122 Golden Ratio fix 2021-04-06 23:35:18 -04:00
Adam Pantel
7964f862c6 Fixes from discord 2021-04-06 22:49:16 -04:00
Adam Pantel
622176d3de Surge to Victory 2021-04-06 22:43:51 -04:00
Adam Pantel
7e793a48e7 Duration fix on Rowan 2021-04-06 22:18:58 -04:00
Adam Pantel
5bdc4615e8 Reinterpret 2021-04-06 19:31:39 -04:00
Adam Pantel
ef04a4376a Emissary of Grudges, Stalking Leonin 2021-04-06 19:29:37 -04:00
John
3c57007765 Update rousing_refrain.txt 2021-04-06 22:08:21 +00:00
John
9965f2e79c Update inspiring_refrain.txt 2021-04-06 22:06:13 +00:00
John
f131997d6a Update sly_instigator.txt 2021-04-06 22:05:02 +00:00
John
08b9e3c46a Update inspiring_refrain.txt 2021-04-06 22:04:08 +00:00
John
8afbaefa6d Update inspiring_refrain.txt 2021-04-06 22:00:21 +00:00
John
88a8336ae7 Update rousing_refrain.txt 2021-04-06 21:59:41 +00:00
John
0c6dface18 Update rousing_refrain.txt 2021-04-06 21:59:01 +00:00
John
9bb2dd3887 Update inspiring_refrain.txt 2021-04-06 21:49:48 +00:00
John
1f3943fe9a Update octavia_living_thesis.txt 2021-04-06 21:48:59 +00:00
John
9502034d58 Update inspiring_refrain.txt 2021-04-06 21:48:37 +00:00
Hans Mackowiak
c6b0b2021c SpellAbilityCondition: extends ConditionDefined to work with SpellAbilities 2021-04-06 22:13:48 +02:00
John
0d889ec773 Add new file 2021-04-06 19:55:33 +00:00
John
3d8f848936 Add new file 2021-04-06 19:54:52 +00:00
Adam Pantel
6cbd108bca Add Cultic Cube 2021-04-06 15:03:26 -04:00
John
03c950f82e Add new file 2021-04-06 17:58:35 +00:00
John
552b061357 Add new file 2021-04-06 17:47:44 +00:00
John
ca98432e20 Add new file 2021-04-06 17:21:44 +00:00
John
6ada1f04da Add new file 2021-04-06 17:20:43 +00:00
John
edf1738e3c Add new file 2021-04-06 17:18:45 +00:00
Michael Kamensky
5b77205b77 Merge branch 'ranking' into 'master'
Add default cube rankings from cubecobra

See merge request core-developers/forge!4409
2021-04-06 17:09:07 +00:00
Michael Kamensky
67128c2fd5 Merge branch 'new-cards' into 'master'
C21 Cards

See merge request core-developers/forge!4406
2021-04-06 17:08:49 +00:00
Michael Kamensky
490ec7ef3e Merge branch 'Williams-master-patch-25580' into 'master'
C21 Suthro 5/4

See merge request core-developers/forge!4401
2021-04-06 17:08:27 +00:00
Michael Kamensky
0ab7ff919b Merge branch 'new-cards-2' into 'master'
Demonstrate keyword and Excavation Technique

See merge request core-developers/forge!4397
2021-04-06 17:08:12 +00:00
Adam Pantel
489ccd9003 Add default cube rankings from cubecobra 2021-04-06 12:28:29 -04:00
Sol
9971eef9b8 Merge branch 'Williams-master-patch-65571' into 'master'
Update STX edition file

See merge request core-developers/forge!4407
2021-04-06 14:43:38 +00:00
John
88e8bed395 Update Standard.txt 2021-04-06 14:29:27 +00:00