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
49,974 Commits 32 Branches 187 Tags
a5f4375ff27f2894ff94dd19a6c35cbef390b51a
Commit Graph

16315 Commits

Author SHA1 Message Date
Michael Kamensky
3d9ae57005 Merge branch 'Williams-master-patch-07567' into 'master' 
Stoic Farmer fix

See merge request core-developers/forge!4012
 2021-02-26 04:07:26 +00:00
Adam Pantel
137e31b724 Unset: border color matters 2021-02-25 17:45:11 -05:00
Churrufli
1014871f46 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2021-02-25 23:34:21 +01:00
Churrufli
97367ed7e6 Net Deck Archive Pioneer (Desktop implementation) 2021-02-25 23:32:57 +01:00
tool4EvEr
c59cd875b8 Fix crash for triggers with no description 2021-02-25 22:12:23 +01:00
John
d82b1f4f61 Update stoic_farmer.txt 2021-02-25 20:58:45 +00:00
Michael Kamensky
361ca5413d Merge branch 'updateBonds' into 'master' 
Bonds of Mortality: Update ability

See merge request core-developers/forge!4009
 2021-02-25 17:37:01 +00:00
tool4EvEr
15373a3a28 Update Bonds ability 2021-02-25 18:25:56 +01:00
Andreas Bendel
303804d0d3 Update de-DE.properties 
translated lblAdventure
 2021-02-25 17:15:07 +00:00
Hans Mackowiak
8ccbffce48 CardProperty: make sharesCreatureTypeWith use DefinedCard 2021-02-25 17:09:35 +01:00
Michael Kamensky
848635d8e0 Merge branch 'ingame_translation' into 'master' 
Better in-game localization/translation of oracle texts

See merge request core-developers/forge!4007
 2021-02-25 13:34:35 +00:00
Lyu Zong-Hong
aa1da0c652 Implement better in-game localization/translation 2021-02-25 21:34:52 +09:00
Michael Kamensky
d9499b9888 - Rename event files. 
- Add Syr Alin, the Lion's Claw event.
 2021-02-25 11:21:52 +00:00
tool4EvEr
f59b8b782f Fix Bonds of Mortality 2021-02-24 21:48:47 +01:00
Michael Kamensky
96938b20b1 Merge branch 'churrufli-master-patch-65945' into 'master' 
Update net-decks-archive-standard.txt

See merge request core-developers/forge!4000
 2021-02-24 14:17:03 +00:00
Michael Kamensky
ddd3270a91 Merge branch 'churrufli-master-patch-02568' into 'master' 
Update net-decks-archive-modern.txt

See merge request core-developers/forge!4001
 2021-02-24 14:16:18 +00:00
Michael Kamensky
74c9a97b4b Merge branch 'Williams-master-patch-40977' into 'master' 
Delete duplicate edition (Ugin's Fate)

See merge request core-developers/forge!4002
 2021-02-24 14:16:02 +00:00
Churrufli
d16beb8d32 New Net Deck Category: Deck Modern Archive 2021-02-24 12:07:41 +01:00
John
4a071914c7 Delete Ugins Fate.txt 2021-02-24 09:44:27 +00:00
Churrufli
c48c7b2c82 Update net-decks-archive-modern.txt 2021-02-24 09:07:52 +00:00
Churrufli
fc0fb1e558 Update net-decks-archive-standard.txt 2021-02-24 09:05:14 +00:00
Michael Kamensky
d42581001e Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!3998
 2021-02-24 04:08:40 +00:00
CCTV-1
5ecc9d3146 update simplified chinese translation 2021-02-24 09:10:48 +08:00
Andreas Bendel
3e38ac834a Update de-DE.properties 
dispose textures lines
 2021-02-23 20:26:51 +00:00
Michael Kamensky
a285fc9678 Merge branch 'Williams-master-patch-92046' into 'master' 
KHM Fixes

See merge request core-developers/forge!3993
 2021-02-23 19:26:47 +00:00
John
ef0bb26db3 Update Kaldheim.txt 2021-02-23 18:14:34 +00:00
John
83bfc5e86d Update reflections_of_littjara.txt 2021-02-23 17:37:09 +00:00
John
4d3649b3b0 Update search_for_glory.txt 2021-02-23 16:40:27 +00:00
Michael Kamensky
9ff36b8f89 Merge branch 'master' into 'master' 
Fix a token name in PHEL

See merge request core-developers/forge!3992
 2021-02-23 15:57:28 +00:00
Michael Kamensky
83bdd3fe72 - Fix a token name 2021-02-23 18:56:56 +03:00
John
af7c90a257 Update haunting_voyage.txt 2021-02-23 15:34:42 +00:00
Michael Kamensky
a4a3c416f0 Merge branch 'wrath-of-sod' into 'master' 
Wrath of Sod

See merge request core-developers/forge!3983
 2021-02-23 15:27:07 +00:00
Michael Kamensky
66a01ea8d5 Merge branch 'Williams-master-patch-30259' into 'master' 
Fix some edition files

See merge request core-developers/forge!3987
 2021-02-23 14:04:27 +00:00
Anthony Calosa
5d835192bd fix filename 2021-02-23 13:57:16 +00:00
Anthony Calosa
8aebf1ae3f Replace colon with modifier letter colon (unicode) so it works on windows system. 2021-02-23 13:48:31 +00:00
John
f05e42ceff Update Friday Night Magic 2005.txt 2021-02-23 13:26:52 +00:00
John
f5f38423d9 Update Friday Night Magic 2013.txt 2021-02-23 13:25:01 +00:00
John
1a32b0a09f Update Friday Night Magic 2015.txt 2021-02-23 13:23:50 +00:00
John
8ec094f1df Update Judge Gift Cards 2014.txt 2021-02-23 13:21:36 +00:00
John
3383a10e35 Update Judge Gift Cards 2017.txt 2021-02-23 13:20:25 +00:00
John
d023fb775f Update Magic Player Rewards 2011.txt 2021-02-23 13:17:31 +00:00
John
23e1b88345 Update Dragons of Tarkir Promos.txt 2021-02-23 13:14:23 +00:00
John
ab4562ee44 Update Eldritch Moon Promos.txt 2021-02-23 13:12:35 +00:00
John
8a7eae16fd Update Gateway 2008.txt 2021-02-23 13:08:38 +00:00
John
29b1d7e185 Update Hobby Japan Promos.txt 2021-02-23 13:06:49 +00:00
John
e27e77bf27 Update Invasion Promos.txt 2021-02-23 13:05:09 +00:00
John
d388aa5225 Update Magic Origins Promos.txt 2021-02-23 13:03:04 +00:00
John
cc022699c7 Update Resale Promos.txt 2021-02-23 13:00:46 +00:00
John
6cfa8c6fac Update Online Promos.txt 2021-02-23 12:58:52 +00:00
John
956c171e48 Update San Diego Comic-Con 2014.txt 2021-02-23 12:55:56 +00:00