external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,615 Commits 32 Branches 187 Tags
c247d607a65b412cfda09f2712a15b2e6cd1635c
Commit Graph

54615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bug Hunter
9efcdc25ba Update forge-gui/res/cardsfolder/e/enduring_angel_angelic_enforcer.txt 2021-11-17 10:17:08 +00:00
Bug Hunter
c78f09f9a3 Merge branch 'NPE' into 'master' 
Add NPE Guards when checking for adding to combat

See merge request core-developers/forge!5846
 2021-11-17 10:08:10 +00:00
TRT
5bce17ab3c Add NPE Guards 2021-11-17 11:05:39 +01:00
Job Spijker
d9bcca43cc Fixed activation cost for Wedding Invitation 2021-11-17 07:07:15 +00:00
Anthony Calosa
4e18ddd0df Merge remote-tracking branch 'core/master' 2021-11-17 07:33:49 +08:00
Northmoc
68f0f5e440 goblin_welder.txt revis 2021-11-16 15:16:51 -05:00
Michael Kamensky
2aeff0a8fb Merge branch 'arsonist' into 'master' 
VOC: Midnight Arsonist + Support

See merge request core-developers/forge!5840
 2021-11-16 18:19:00 +00:00
Michael Kamensky
7726b9a0e3 Merge branch 'austeregrim-master-patch-35402' into 'master' 
Update readme, with discord invite link

See merge request core-developers/forge!5843
 2021-11-16 18:18:37 +00:00
Austere Grim
67342fd44c Update readme, with discord invite link 2021-11-16 18:16:18 +00:00
Michael Kamensky
861e187751 Merge branch 'TRT-master-patch-91682' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/reclusive_taxidermist.txt

See merge request core-developers/forge!5842
 2021-11-16 12:10:25 +00:00
Bug Hunter
a9e1b596bd Update forge-gui/res/cardsfolder/upcoming/reclusive_taxidermist.txt 2021-11-16 09:39:54 +00:00
Michael Kamensky
b30ad498be Merge branch 'Svaldan-master-patch-34492' into 'master' 
VOC cards – Svaldan master patch 34492

See merge request core-developers/forge!5837
 2021-11-16 07:48:02 +00:00
Job Spijker
03e49e92e6 Fixed DeckHas and newline 2021-11-16 06:46:34 +00:00
Job Spijker
dbec0b983b Fixed DeckHas 2021-11-16 06:45:40 +00:00
Job Spijker
4b27d719d7 Fixed DeckHas and newline 2021-11-16 06:44:50 +00:00
Anthony Calosa
73a8e38d4b Merge remote-tracking branch 'core/master' 2021-11-16 13:22:28 +08:00
Michael Kamensky
14707ce7ca Merge branch 'archfiend' into 'master' 
VOC: Shadowgrange Archfiend + Support

See merge request core-developers/forge!5838
 2021-11-16 03:21:26 +00:00
Michael Kamensky
f80a2e8137 Merge branch 'voc_15' into 'master' 
VOC: 15 Nov

See merge request core-developers/forge!5839
 2021-11-16 03:20:29 +00:00
Northmoc
c54b6c9d83 disorder_in_the_court.txt 2021-11-15 22:15:42 -05:00
Michael Kamensky
ed97ba7ee8 Merge branch 'aifix' into 'master' 
Fix AI checking for Ward Cost when trying to add trigger to stack

See merge request core-developers/forge!5836
 2021-11-16 03:15:18 +00:00
Northmoc
8e04757fb8 sinister_waltz.txt 2021-11-15 22:14:25 -05:00
Northmoc
722f2483f8 sudden_disappearance.txt typo 2021-11-15 22:08:42 -05:00
Sol
cf296e9020 Merge branch 'fix' into 'master' 
haakon_stromgald_scourge_avatar.txt better ValidCard

See merge request core-developers/forge!5841
 2021-11-16 02:51:51 +00:00
Northmoc
c102d2a316 haakon_stromgald_scourge_avatar.txt better ValidCard 2021-11-15 21:35:34 -05:00
Northmoc
b1b2ff2299 support "withoutManaAbility" as CardProperty 2021-11-15 21:31:06 -05:00
Northmoc
32f9d20ffd midnight_arsonist.txt 2021-11-15 21:30:19 -05:00
Northmoc
9031737133 imposing_grandeur.txt 2021-11-15 21:26:59 -05:00
Northmoc
849b63155e tweak building Madness string in Card Detail to allow for non-mana components 2021-11-15 19:54:10 -05:00
Northmoc
73452b5b8c support finding GreatestPower among Remembered/RememberedLKI/etc 2021-11-15 19:53:25 -05:00
Northmoc
5f10933e95 more generic/current Madness reminder text 2021-11-15 19:51:16 -05:00
Hans Mackowiak
46f840c837 Merge branch 'fixes' into 'master' 
Fix Thunderous Orator

See merge request core-developers/forge!5835
 2021-11-16 00:51:09 +00:00
Northmoc
d6ca0ae21a shadowgrange_archfiend.txt 2021-11-15 19:51:03 -05:00
Northmoc
047792b725 predators_hour.txt 2021-11-15 19:22:50 -05:00
Job Spijker
9ea66eea9c VOC: Scion of Opulence 2021-11-15 21:52:31 +00:00
Job Spijker
ad45e9160e VOC: Olivia's Wrath 2021-11-15 21:52:13 +00:00
Job Spijker
d3b9c92614 VOC: Laurine, the Diversion 2021-11-15 21:51:56 +00:00
Job Spijker
df63dfe02c VOC: Kamber, the Plunderer 2021-11-15 21:51:36 +00:00
Job Spijker
e058792d9e VOC: Ethereal Investigator 2021-11-15 21:50:28 +00:00
Northmoc
8ff2a9e03a sudden_salvation.txt 2021-11-15 14:17:57 -05:00
Northmoc
1654e376ea breath_of_the_sleepless.txt 2021-11-15 14:15:46 -05:00
tool4EvEr
35e5e6d7ba Fix AI checking for Ward Cost when trying to add trigger to stack 2021-11-15 19:44:20 +01:00
tool4EvEr
9e1cbf5d51 Fix Thunderous Orator 2021-11-15 19:17:30 +01:00
Michael Kamensky
504bc5646d Merge branch 'vow' into 'master' 
add VOW/VOC to formats

See merge request core-developers/forge!5834
 2021-11-15 17:01:36 +00:00
Northmoc
e141ceb3c3 add VOW/VOC to formats 2021-11-15 11:48:01 -05:00
Michael Kamensky
b519ae65fe Merge branch 'master' into 'master' 
Fix CostReveal with a comma (e.g. Snarl lands)

See merge request core-developers/forge!5833
 2021-11-15 16:01:53 +00:00
Michael Kamensky
47e16f4977 - Fix CostReveal with a comma (e.g. Snarl lands) 2021-11-15 19:01:01 +03:00
Michael Kamensky
e8a41cfbe6 Merge branch 'voc_14' into 'master' 
VOC: 14 Nov

See merge request core-developers/forge!5830
 2021-11-15 15:45:08 +00:00
Michael Kamensky
d1f6de40e4 Merge branch 'epiph' into 'master' 
VOC: Occult Epiphany and support

See merge request core-developers/forge!5818
 2021-11-15 15:44:58 +00:00
Northmoc
ae5750da86 spectral_arcanist.txt expand to ValidSA 2021-11-15 10:34:34 -05:00
Anthony Calosa
50ed4abace Merge remote-tracking branch 'core/master' 2021-11-15 17:43:44 +08:00