external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 09:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,403 Commits 32 Branches 187 Tags
fea2f30a1c464d93bfab3f10d898ad2e88f58bcc
Commit Graph

49403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John
d18a6c3479 Update theoretical_duplication.txt 2021-04-07 22:40:59 +00:00
John
ab931cdcb4 Update curiosity_crafter.txt 2021-04-07 22:40:03 +00:00
John
7252b0e69a Add new file 2021-04-07 22:39:04 +00:00
John
ab0ed23c83 Add new file 2021-04-07 22:38:21 +00:00
John
18c002094f Add new file 2021-04-07 22:37:04 +00:00
John
d5f73cb633 Add new file 2021-04-07 22:36:15 +00:00
John
c738da065e Add new file 2021-04-07 22:35:30 +00:00
John
a9296d67f7 Add new file 2021-04-07 22:34:40 +00:00
John
78cb417cfc Add new file 2021-04-07 22:34:00 +00:00
John
4bec5f6792 Add new file 2021-04-07 22:33:14 +00:00
John
3da03f66e0 Add new file 2021-04-07 22:31:33 +00:00
Northmoc
e379c676d0 muse_vortex.txt 2021-04-07 16:58:29 -04:00
Bug Hunter
6565494781 Merge branch 'TRT-master-patch-82622' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/abundant_harvest.txt

See merge request core-developers/forge!4425
 2021-04-07 20:45:09 +00:00
Bug Hunter
aafcd25403 Update forge-gui/res/cardsfolder/upcoming/abundant_harvest.txt 2021-04-07 20:44:20 +00:00
Northmoc
72c4c0007f oversimplify.txt fix Descs 2021-04-07 15:55:36 -04:00
Northmoc
fd1ce7a750 geometric_nexus.txt 2021-04-07 15:53:26 -04:00
Northmoc
fbbdec5e4e oversimplify.txt 2021-04-07 15:33:51 -04:00
Northmoc
443b613513 deekah_fractal_theorist.txt remove default params 2021-04-07 15:05:05 -04:00
Michael Kamensky
2fa44fc0f4 Merge branch 'Williams-master-patch-07577' into 'master' 
C21 Discord Contributions 06/04

See merge request core-developers/forge!4410
 2021-04-07 18:02:04 +00:00
Northmoc
5ed21c3ce3 deekah_fractal_theorist.txt 2021-04-07 13:16:16 -04:00
Northmoc
f1d52fb530 ruxa_patient_professor.txt (Suthro) 2021-04-07 12:59:37 -04:00
Northmoc
d418ad8369 fractal_harness.txt 2021-04-07 12:46:48 -04:00
Bug Hunter
7b58d8e77e Merge branch 'TRT-master-patch-33908' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/fractal_summoning.txt

See merge request core-developers/forge!4423
 2021-04-07 16:31:09 +00:00
Bug Hunter
38971c2946 Update forge-gui/res/cardsfolder/upcoming/fractal_summoning.txt 2021-04-07 16:30:10 +00:00
Northmoc
6cef7fd6b6 creative_technique.txt 2021-04-07 11:14:38 -04:00
Northmoc
92ffb0b1e5 rionya_fire_dancer.txt 2021-04-07 10:44:21 -04:00
Northmoc
75f03f1fd1 support for SumCMCGraveyard (Inferno Project) 2021-04-07 10:30:01 -04:00
Northmoc
0306817ac8 inferno_project.txt 2021-04-07 10:29:14 -04:00
Tim Mocny
03b5dc046d Merge branch 'cmc' into 'master' 
fix cmc necrotic_fumes.txt

See merge request core-developers/forge!4421
 2021-04-07 13:32:42 +00:00
Northmoc
bb5cb8a773 necrotic_fumes.txt 2021-04-07 09:31:40 -04:00
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