Commit Graph

11825 Commits

Author SHA1 Message Date
Anthony Calosa
4b031c6928 Fix Cinder Cloud and Noxious Gearhulk Interaction with Cards with CDA
(Noxious Gearhulk -> Malignus, as reported on forums)
2019-09-16 13:31:54 +00:00
swordshine
c8cb56c416 Update a script 2019-09-16 20:20:07 +08:00
swordshine
70f640b414 Add two cards 2019-09-16 20:10:08 +08:00
swordshine
e0f2802eda Add Sundering Stroke 2019-09-16 18:49:46 +08:00
swordshine
716faf4706 Add Clockwork Servant 2019-09-16 18:35:31 +08:00
swordshine
12b05147e7 Update two Adamant cards 2019-09-16 18:27:10 +08:00
swordshine
0e5884d757 Add Henge Walker 2019-09-16 16:35:06 +08:00
swordshine
c42f003755 Add Folio of Fancies 2019-09-16 16:12:32 +08:00
swordshine
f1cbaa9d95 Fix SVar name 2019-09-16 08:29:00 +08:00
swordshine
243726d307 Refactor "For each color among permanents you control, add one mana of that color" 2019-09-15 21:37:24 +08:00
swordshine
bfaf054e88 Add Wildborn Preserver 2019-09-15 20:10:27 +08:00
swordshine
83c6473a7c Add Vantress Gargoyle 2019-09-15 19:23:55 +08:00
swordshine
86f344450d Fix Midnight Clock 2019-09-15 19:04:18 +08:00
swordshine
c079467b9a Add two cards 2019-09-15 13:36:43 +08:00
swordshine
9446af4808 Add two cards 2019-09-15 13:19:55 +08:00
swordshine
0637c69bfe Add Irencrag Feat 2019-09-15 10:59:42 +08:00
swordshine
ce4fe0239f Merge branch 'patch' into 'master'
More ELD cards

See merge request core-developers/forge!2124
2019-09-15 02:24:46 +00:00
swordshine
5b176b93d0 Merge branch 'master' into 'master'
Various Improvement (Android)

See merge request core-developers/forge!2110
2019-09-15 02:24:26 +00:00
swordshine
ad428e2285 Fix a subability SVar 2019-09-15 10:07:46 +08:00
Ryan1729
42d0695804 push down toStringMap further, which required using AbilityKey inside TriggerWaiting and several other places. 2019-09-14 19:44:27 -06:00
swordshine
efac184ffb add more forgescribed cards 2019-09-14 23:29:40 +08:00
swordshine
44ae0c5039 Add forgescribed cards 2019-09-14 22:53:31 +08:00
Agetian
ff5dbf2c96 - Added puzzle PS_M209. 2019-09-14 06:50:47 +03:00
Anthony Calosa
ace050a8c0 Merge remote-tracking branch 'remotes/core/master' 2019-09-13 21:12:30 +08:00
swordshine
808d1fbd47 Merge branch 'patch' into 'master'
ELD cards

See merge request core-developers/forge!2116
2019-09-13 11:18:46 +00:00
CCTV-1
229688f26f update translation 2019-09-13 18:37:58 +08:00
Anthony Calosa
a107d41fed Merge branch 'master' into 'master'
# Conflicts:
#   forge-gui-mobile/src/forge/screens/match/MatchScreen.java
2019-09-13 10:35:22 +00:00
Peter
16da63aa9c Mobile - Translation: Deck Chooser, Deck Editor and Match Screen.
Fix compare String with equals()
2019-09-13 11:19:35 +02:00
swordshine
b56e2ec3c3 Fix the name of Syr Elenora, the Discerning 2019-09-13 11:18:15 +08:00
swordshine
c3a5491a6b Update Garenbrig Paladin 2019-09-12 22:35:04 +08:00
Anthony Calosa
eda7d435e4 Merge remote-tracking branch 'remotes/core/master' 2019-09-12 20:38:53 +08:00
Anthony Calosa
8e282b16c5 Update Player Name 2019-09-12 20:30:42 +08:00
swordshine
46dc8b73ea Add two Adamant cards 2019-09-12 16:50:03 +08:00
swordshine
6d7d3d0306 more fixes 2019-09-12 16:08:28 +08:00
swordshine
9c21f195f9 Fix Sorcerous Spyglass 2019-09-12 16:04:55 +08:00
swordshine
207eaf482d Merge branch 'patch' into 'master'
ELD cards

See merge request core-developers/forge!2113
2019-09-12 06:52:22 +00:00
swordshine
b8b3f7ab82 Add two cards 2019-09-12 13:57:14 +08:00
swordshine
9baf47330d Add Doom Foretold 2019-09-12 12:43:33 +08:00
CCTV-1
89fca048ad fix:missing Swamp translation 2019-09-12 11:08:47 +08:00
CCTV-1
ac2efd0977 update simplified chinese card translation 2019-09-12 10:59:18 +08:00
CCTV-1
602327366b add basic land translation path 2019-09-12 10:58:23 +08:00
swordshine
3f9001267e Add Outlaws' Merriment 2019-09-12 10:39:08 +08:00
CCTV-1
544b653a90 Merge remote-tracking branch 'upstream/master' 2019-09-12 10:31:47 +08:00
swordshine
fdd0814786 Merge branch 'master' into 'master'
add Simplified Chinese cards translation support

See merge request core-developers/forge!2112
2019-09-12 02:30:26 +00:00
CCTV-1
b4f54dd150 update translation 2019-09-12 10:29:10 +08:00
swordshine
d7e0dd3e54 Add forgescribed cards 2019-09-12 10:01:52 +08:00
swordshine
35b887de14 Update Lochmere Serpent 2019-09-12 09:17:49 +08:00
CCTV-1
b5f95ccf77 update de-De es-ES card name translation 2019-09-12 09:10:38 +08:00
CCTV-1
5bf55abd49 add Simplified Chinese cards translation support 2019-09-12 09:08:43 +08:00
swordshine
434027c14f Merge branch 'ui-card-translation' into 'master'
UI Card Translation (desktop and mobile)

See merge request core-developers/forge!1987
2019-09-11 13:27:55 +00:00