Commit Graph

48264 Commits

Author SHA1 Message Date
Hans Mackowiak
96532309ce CardProperty: hasXCost, it should check ManaCost 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
a908c84da7 Merge branch 'eldraine-plane' into 'master'
Eldraine plane for Planar Conquest

See merge request core-developers/forge!3898
2021-02-25 11:21:52 +00:00
Michael Kamensky
d9499b9888 - Rename event files.
- Add Syr Alin, the Lion's Claw event.
2021-02-25 11:21:52 +00:00
Michael Kamensky
0a0b147a21 Merge branch 'netdecksarchive' into 'master'
Net Deck Archive Modern (Android implementation)

See merge request core-developers/forge!4005
2021-02-25 11:21:09 +00:00
Churrufli
ad466e9c00 Net Deck Archive Modern (Android implementation) 2021-02-25 11:00:02 +01:00
Hans Mackowiak
ba70477ad7 SpellAbility: remove getTriggeringAbility, it is always root 2021-02-25 10:50:19 +01:00
Hans Mackowiak
e428e66623 WrappedAbility: fixed StackDescription 2021-02-25 10:17:20 +01:00
Hans Mackowiak
b99de32027 SpellAbility: fix isTrigger 2021-02-25 09:54:39 +01:00
Michael Kamensky
b5c8d2f29f Merge branch 'fixbonds' into 'master'
Fix Bonds of Mortality

Closes #1737

See merge request core-developers/forge!4004
2021-02-25 06:24:18 +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
Michael Kamensky
baad904041 Merge branch 'master' into 'master'
Net Deck Archive Standard (Android implementation)

See merge request core-developers/forge!4003
2021-02-24 14:15:53 +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
16402aed09 Merge branch 'facedownfix' into 'master'
Improve ForetoldByEffect StackDescription

See merge request core-developers/forge!3996
2021-02-24 04:10:08 +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
Michael Kamensky
a2698af53f Merge branch 'twosat-master-patch-78722' into 'master'
Update de-DE.properties

See merge request core-developers/forge!3997
2021-02-24 04:08:38 +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
tool4EvEr
32908d9bb6 Improve ForetoldByEffect StackDescription 2021-02-23 21:09:49 +01:00
Michael Kamensky
91d27373fe Merge branch 'cascadefix' into 'master'
Cascade: update keyword with new text

See merge request core-developers/forge!3994
2021-02-23 19:28:02 +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
Michael Kamensky
57405ae8c9 Merge branch 'Williams-master-patch-42663' into 'master'
Kaldheim Edition File update

See merge request core-developers/forge!3995
2021-02-23 19:26:26 +00:00
John
ef0bb26db3 Update Kaldheim.txt 2021-02-23 18:14:34 +00:00
Hans Mackowiak
49ea0dac6c Merge branch 'fixMarchesa' into 'master'
Fix Creature dying due to removed counter cost triggering with old LKI

See merge request core-developers/forge!3979
2021-02-23 17:39:08 +00:00
Bug Hunter
a9e3fd867e Fix Creature dying due to removed counter cost triggering with old LKI 2021-02-23 17:39:08 +00:00
John
83bfc5e86d Update reflections_of_littjara.txt 2021-02-23 17:37:09 +00:00
tool4EvEr
d0a23e96c5 Update cascade 2021-02-23 18:35:35 +01: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
Michael Kamensky
d92cd1a71c Merge branch 'Williams-master-patch-62625' into 'master'
Update haunting_voyage.txt

See merge request core-developers/forge!3991
2021-02-23 15:56:25 +00: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
c3efe0b6f5 Merge branch 'kevlahnota-master-patch-76317' into 'master'
fix filename

See merge request core-developers/forge!3990
2021-02-23 13:57:17 +00:00
Anthony Calosa
5d835192bd fix filename 2021-02-23 13:57:16 +00:00
Anthony Calosa
8a91585053 Merge branch 'kevlahnota-master-patch-48495' into 'master'
Replace Ravnica: City of Guilds Promos.txt

See merge request core-developers/forge!3989
2021-02-23 13:51:51 +00:00
Anthony Calosa
91bea96dd4 Replace Ravnica: City of Guilds Promos.txt 2021-02-23 13:51:12 +00:00
Anthony Calosa
56f0d50b42 Merge branch 'kevlahnota-master-patch-07504' into 'master'
Replace colon with modifier letter colon (unicode) so it works on windows system.

See merge request core-developers/forge!3988
2021-02-23 13:49:38 +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