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

47517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans Mackowiak
ab3cd5f80f Cycling: add Flag if card is discarded for cost with cycling 2021-02-06 08:48:50 +01:00
Anthony Calosa
d163d75ebd Merge branch 'master' into 'master' 
[Android] fix init for displaying error message

See merge request core-developers/forge!3769
 2021-02-06 07:38:06 +00:00
Anthony Calosa
4d394778a0 [Android] fix init for displaying error message 2021-02-06 15:34:24 +08:00
Hans Mackowiak
fa2f7c43ae MagicStack: fix Bestow resolve on fizzle 2021-02-06 07:45:50 +01:00
Michael Kamensky
0697b4df33 Merge branch 'khc5' into 'master' 
KHC - 5 Feb

See merge request core-developers/forge!3763
 2021-02-06 04:18:35 +00:00
Michael Kamensky
80d855d996 Merge branch 'klaxnek-master-patch-72751' into 'master' 
Update es-ES.properties

See merge request core-developers/forge!3766
 2021-02-06 04:17:30 +00:00
Michael Kamensky
4ef3a1a3e9 Merge branch 'fixOathbreaker' into 'master' 
Fix Oathbreaker commander replacement

See merge request core-developers/forge!3767
 2021-02-06 04:17:22 +00:00
Michael Kamensky
82ae14722b Merge branch 'tales' into 'master' 
KHC: Tales of the Ancestors and support

See merge request core-developers/forge!3768
 2021-02-06 04:17:02 +00:00
Northmoc
c305a9f141 stoic_farmer.txt 2021-02-05 21:02:32 -05:00
Northmoc
845bd3480b cosmic_intervention.txt 2021-02-05 21:02:31 -05:00
Northmoc
a1981f5752 add "Count$InRememberedHand" 2021-02-05 21:00:56 -05:00
Northmoc
143f2cc4bd allow comparison to variable 2021-02-05 21:00:56 -05:00
Northmoc
2be871985a tales_of_the_ancestors.txt 2021-02-05 21:00:55 -05:00
tool4EvEr
b10970e6e4 Fix Oathbreaker commander replacement 2021-02-05 21:36:17 +01:00
paul_snoops
caaf394bc6 Merge remote-tracking branch 'origin/random_fixes' into random_fixes 2021-02-05 19:07:21 +00:00
paul_snoops
ac1e0eb351 Various fixes 2021-02-05 19:07:03 +00:00
klaxnek
1214fcae34 Update es-ES.properties 2021-02-05 18:41:20 +00:00
paul_snoops
7175ec2a93 Various fixes 2021-02-05 18:34:05 +00:00
Michael Kamensky
1337aaa229 Merge branch 'kaldheim' into 'master' 
Kaldheim

See merge request core-developers/forge!3764
 2021-02-05 18:27:35 +00:00
Sol
8d91d23357 Update boosterboxes.txt 2021-02-05 18:27:01 +00:00
Sol
a7ccc97b33 Update Standard.txt 2021-02-05 18:25:43 +00:00
Michael Kamensky
6d9027bf47 Merge branch 'translate_newstring' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!3760
 2021-02-05 16:58:52 +00:00
Hans Mackowiak
11fa67a396 Merge branch 'codespell' into 'master' 
KHM: Codespell Cleric and support

See merge request core-developers/forge!3716
 2021-02-05 16:24:24 +00:00
Tim Mocny
1eec7475fe KHM: Codespell Cleric and support 2021-02-05 16:24:24 +00:00
Michael Kamensky
0b6d0914a0 Merge branch 'master' into 'master' 
mobile:dynamic generate character set for each language.

See merge request core-developers/forge!3731
 2021-02-05 15:23:17 +00:00
Michael Kamensky
b1dc7f3011 Merge branch 'betrayal' into 'master' 
add King Narfi's Betrayal

See merge request core-developers/forge!3761
 2021-02-05 15:23:00 +00:00
Hans Mackowiak
5a970d449f Merge branch 'reckless_crew' into 'master' 
add Reckless Crew

See merge request core-developers/forge!3762
 2021-02-05 14:54:35 +00:00
Hans Mackowiak
093c8647ae add Reckless Crew 2021-02-05 15:53:22 +01:00
Michael Kamensky
ff3bd8e7ed Merge branch 'undefined' into 'master' 
KHC 3 cards

See merge request core-developers/forge!3759
 2021-02-05 14:51:51 +00:00
John
a571f4747b Update elderfang_venom.txt 2021-02-05 14:47:09 +00:00
John
3a2a5d740b Spectral Deluge 2021-02-05 14:18:57 +00:00
Hans Mackowiak
35946678de add King Narfi's Betrayal 2021-02-05 14:58:29 +01:00
John
479bb7e361 Update sage_of_the_beyond.txt 2021-02-05 13:44:50 +00:00
John
86b34f9f3a Sage of the Beyond 2021-02-05 13:43:40 +00:00
CCTV-1
e2622f0c26 translate new strings. 2021-02-05 21:23:58 +08:00
Hans Mackowiak
7478c6121b Foretell cast only by owner 2021-02-05 14:06:26 +01:00
Hans Mackowiak
772d1ea6fd Merge branch 'Williams-master-patch-55492' into 'master' 
KHM fixes 5 Feb

See merge request core-developers/forge!3758
 2021-02-05 12:55:38 +00:00
John
a57662da3d KHM fixes 5 Feb 2021-02-05 12:55:38 +00:00
John
ecb048be03 Elderfang Venom 2021-02-05 12:35:58 +00:00
CCTV-1
dcecd85632 handle 3,4 byte utf8 character. 2021-02-05 20:24:19 +08:00
Anthony Calosa
055a8d7dbe Merge branch 'master' into 'master' 
[Mobile] update button text

See merge request core-developers/forge!3757
 2021-02-05 11:17:04 +00:00
Anthony Calosa
67c38316de [Mobile] update button text 2021-02-05 19:15:21 +08:00
Anthony Calosa
7e9824df57 Merge branch 'master' into 'master' 
[Mobile] update volume selection

See merge request core-developers/forge!3756
 2021-02-05 10:57:40 +00:00
Anthony Calosa
041af9b738 [Mobile] update volume selection 2021-02-05 18:51:45 +08:00
Hans Mackowiak
af00e56242 Merge branch 'mystic_reflection' into 'master' 
Mystical Reflection

See merge request core-developers/forge!3754
 2021-02-05 10:16:39 +00:00
Anthony Calosa
19cd892a0a Merge branch 'master' into 'master' 
[Android] update init message

See merge request core-developers/forge!3755
 2021-02-05 07:42:57 +00:00
Anthony Calosa
cff21e9ac7 [Android] update init message 2021-02-05 15:40:56 +08:00
Hans Mackowiak
b54edb269c TokenEffectBase: fill table with none zone 2021-02-05 08:36:07 +01:00
Michael Kamensky
113df1d7cf Merge branch 'master' into 'master' 
Added KHM achievements by Marek14.

See merge request core-developers/forge!3753
 2021-02-05 04:51:22 +00:00
Michael Kamensky
5814c37fc2 - Added KHM achievements by Marek14. 2021-02-05 07:50:06 +03:00