external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,943 Commits 32 Branches 187 Tags
22fd1ac2746b46ea04c5b0347f21876a02a0fa97
Commit Graph

46943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans Mackowiak
22fd1ac274 Merge branch 'fixAllCounters' into 'master' 
Fix SubCounter<All abilities not working

See merge request core-developers/forge!3652
 2021-01-27 08:08:51 +00:00
Bug Hunter
b918a019d4 Fix SubCounter<All abilities not working 2021-01-27 08:08:51 +00:00
Hans Mackowiak
4c2b7f362e Merge branch 'snowCast' into 'master' 
AbilityUtils: CastTotalSnowManaSpent for snow spent

See merge request core-developers/forge!3655
 2021-01-27 08:07:11 +00:00
Hans Mackowiak
37f905699c AbilityUtils: CastTotalSnowManaSpent for snow spent 2021-01-27 08:07:11 +00:00
Michael Kamensky
cc37bbbcdf Merge branch 'patch-10' into 'master' 
Update Pauper.txt banned list

See merge request core-developers/forge!3651
 2021-01-27 07:20:07 +00:00
Michael Kamensky
cfe82c93a6 Merge branch 'fixArch' into 'master' 
Fix Archfiend’s Vessel

See merge request core-developers/forge!3647
 2021-01-27 07:19:59 +00:00
Michael Kamensky
ff62f258aa Merge branch 'MaySpendStack' into 'master' 
May spend Mana only work on Stack

Closes #1697

See merge request core-developers/forge!3653
 2021-01-27 07:19:39 +00:00
Tim Mocny
61ad92b697 Merge branch 'IKO_edition_fix' into 'master' 
IKO godzilla cards fix

See merge request core-developers/forge!3641
 2021-01-26 23:35:30 +00:00
Tim Mocny
b7bf419338 Merge branch 'fixFinale' into 'master' 
Fix Finale of Promise not exiling

See merge request core-developers/forge!3648
 2021-01-26 23:13:39 +00:00
Hans Mackowiak
1ba01c38be May spend Mana only work on Stack 2021-01-26 17:02:39 +01:00
Churrufli
c9db1d6b5a Update Pauper.txt banned list 2021-01-26 07:50:53 +00:00
Michael Kamensky
c3a4c977a1 Merge branch 'fixFizzle' into 'master' 
Fix Ephemerate not protecting from targeted spells

See merge request core-developers/forge!3628
 2021-01-26 06:56:10 +00:00
Michael Kamensky
fda5564328 Merge branch 'undefined' into 'master' 
KHM 25/1

See merge request core-developers/forge!3645
 2021-01-26 04:18:42 +00:00
Michael Kamensky
d8a9ed5605 Merge branch 'update_oubliette' into 'master' 
Update Oubliette and fix Time and Tide

See merge request core-developers/forge!3646
 2021-01-26 04:18:32 +00:00
Alumi
fb317ff9e7 Update Oubliette and fix Time and Tide 2021-01-26 04:18:32 +00:00
Anthony Calosa
d44e2ac1d2 Merge branch 'master' into 'master' 
[Mobile] use order GUI for discarding

See merge request core-developers/forge!3650
 2021-01-26 02:11:23 +00:00
Anthony Calosa
6a49c26b58 [Mobile] use order GUI for discarding 2021-01-26 09:32:48 +08:00
tool4EvEr
e7492096f9 Fix Finale of Promise not exiling 2021-01-25 20:44:07 +01:00
tool4EvEr
e33644ecf3 Fix token created when removed before trigger resolves 2021-01-25 20:22:56 +01:00
John
e1ad218692 Fearless Pup 2021-01-25 18:05:44 +00:00
John
94991288cc Update fearless_liberator.txt 2021-01-25 16:24:22 +00:00
John
57afa0079d Fearless Liberator 2021-01-25 16:22:27 +00:00
John
01e778998b Update duskwielder.txt 2021-01-25 16:17:46 +00:00
John
f16a3fe3d3 Duskwielder 2021-01-25 16:11:06 +00:00
John
43b1828545 Draugr Recruiter 2021-01-25 16:07:34 +00:00
John
4dac508d71 Usher of the Fallen 2021-01-25 15:50:14 +00:00
John
34531595ea Update starnheim_courser.txt 2021-01-25 15:38:36 +00:00
John
37baa992a4 Update niko_aris.txt 2021-01-25 15:37:26 +00:00
Michael Kamensky
f46ac4e8b3 Merge branch 'TRT-master-patch-84688' into 'master' 
Update private research

Closes #1699

See merge request core-developers/forge!3644
 2021-01-25 15:16:50 +00:00
Michael Kamensky
619b3a0120 Merge branch 'fixGUI' into 'master' 
Fix desktop GUI deck color selections

See merge request core-developers/forge!3642
 2021-01-25 15:11:22 +00:00
John
23173601ca Story Seeker 2021-01-25 13:23:13 +00:00
John
0fef9ce061 Starnheim Courser 2021-01-25 13:22:28 +00:00
John
ac1113e668 Delete starnheim_courser.txt 2021-01-25 13:21:44 +00:00
John
d02c356ea7 Upload New File 2021-01-25 13:21:15 +00:00
John
2b197bb357 Update narfi_betrayer_king.txt 2021-01-25 10:54:43 +00:00
John
2a932f7198 Upload New File 2021-01-25 10:48:58 +00:00
John
222bb351fb Upload New File 2021-01-25 10:48:45 +00:00
John
b96fba7b8a Upload New File 2021-01-25 10:11:28 +00:00
John
f88fc2adb0 Upload New File 2021-01-25 10:10:48 +00:00
John
7d85026ae2 KHM 2021-01-25 10:09:42 +00:00
Bug Hunter
e86bdbd319 Update forge-gui/res/cardsfolder/p/private_research.txt 2021-01-25 09:55:07 +00:00
Hans Mackowiak
43c69056f9 fix teferi_mage_of_zhalfir 2021-01-25 09:48:08 +01:00
Michael Kamensky
1240fcc153 Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!3638
 2021-01-25 04:48:58 +00:00
Michael Kamensky
f3718e1995 Merge branch 'undefined' into 'master' 
KHM 24/01

See merge request core-developers/forge!3637
 2021-01-25 04:48:00 +00:00
Michael Kamensky
0441a2bc5d Merge branch 'illusionary_terrain' into 'master' 
Illusionary Terrain

See merge request core-developers/forge!3636
 2021-01-25 04:47:57 +00:00
Michael Kamensky
cb1cb48187 Merge branch 'KHM_edition' into 'master' 
KHM & KHC edition files

See merge request core-developers/forge!3639
 2021-01-25 04:46:47 +00:00
tool4EvEr
b40177ae72 Fix GUI deck color selections 2021-01-24 19:59:21 +01:00
paul_snoops
fc5b8a5e1d IKO godzilla cards fix 2021-01-24 18:24:56 +00:00
paul_snoops
73c297ef6d KHM edition file... incomplete 
KHC
Firja's Judgment renamed to Firja's Retribution
 2021-01-24 17:49:53 +00:00
paul_snoops
e29ed5c699 KHM edition file... incomplete 
KHC
Firja's Judgment renamed to Firja's Retribution
 2021-01-24 14:43:54 +00:00