Commit Graph

40858 Commits

Author SHA1 Message Date
swordshine
0cdf2232b7 Merge branch 'jaya-venerated-firemage-fix' into 'master'
Limit Jaya, Venerated Firemage to once-per-turn

See merge request core-developers/forge!1580
2019-04-24 00:41:25 +00:00
Brock Fanning
7269882c52 Limit Jaya to once-per-turn 2019-04-23 14:38:07 -04:00
swordshine
744a6a42e8 Merge branch 'challengerdecks' into 'master'
2019 Challenger Decks

See merge request core-developers/forge!1579
2019-04-23 08:29:19 +00:00
austinio7116
d395897ebb 2019 Challenger Decks 2019-04-23 07:41:39 +01:00
swordshine
e6a14fa5fc Merge branch 'war-achievements' into 'master'
WAR planeswalker achievements.

See merge request core-developers/forge!1578
2019-04-23 06:26:40 +00:00
Michael Kamensky
3cfe595667 WAR planeswalker achievements. 2019-04-23 06:26:40 +00:00
Sol
9979298e6d Merge branch 'master' into 'master'
Edit Forge README to include link to IntelliJ setup instructions

See merge request core-developers/forge!1577
2019-04-22 16:41:48 +00:00
John Shedletsky
373dad5472 Add IntelliJ setup instructions fix syntax 2019-04-22 09:09:42 -07:00
John Shedletsky
4c016cbbd1 Add IntelliJ setup instructions 2019-04-22 09:03:20 -07:00
swordshine
1e338ec91e Merge branch 'master' into 'master'
Moving hard-coded text to en-US.properties file

See merge request core-developers/forge!1537
2019-04-22 04:32:33 +00:00
swordshine
1352627eb9 Merge branch 'mpseditions' into 'master'
Added tokens to Mythic Editions

See merge request core-developers/forge!1576
2019-04-22 00:19:38 +00:00
austinio7116
7430ee1a69 Added tokens to Mythic Editions 2019-04-21 23:05:17 +01:00
austinio7116
13a950a263 Merge branch 'undefined' into 'master'
WAR cards

See merge request core-developers/forge!1575
2019-04-21 21:59:15 +00:00
keineahnungking
7faacc29b2 Gideon's Company 2019-04-21 19:36:43 +00:00
keineahnungking
1755bc2a1b Flux Channeler 2019-04-21 16:07:55 +00:00
swordshine
25770eb84d Merge branch 'patch' into 'master'
Fix more cards

See merge request core-developers/forge!1573
2019-04-21 12:48:26 +00:00
swordshine
d58a8069ce Fix more cards 2019-04-21 20:47:40 +08:00
swordshine
09b81ebb13 Merge branch 'wareditions2' into 'master'
Wareditions2

See merge request core-developers/forge!1571
2019-04-21 12:21:01 +00:00
austinio7116
6b309fd8bf Merge branch 'undefined' into 'master'
WAR cards

See merge request core-developers/forge!1572
2019-04-21 12:09:37 +00:00
austinio7116
19f536097e Fixed domris ambush 2019-04-21 13:07:32 +01:00
austinio7116
e331701cdc Fixed soule diviner 2019-04-21 13:05:20 +01:00
keineahnungking
6c4d81417b Eternal Taskmaster 2019-04-21 11:59:04 +00:00
keineahnungking
940ac268be Emergence Zone 2019-04-21 11:30:45 +00:00
austinio7116
211b51e516 A couple of minor WAR corrections - Amass count on herald, correct sac cost on spark reaper 2019-04-21 12:26:36 +01:00
Jonathan Lüpfert
cd30651673 Domri, Anarch of Bolas 2019-04-21 11:01:56 +00:00
Jonathan Lüpfert
9a8f6c128f Desperate Lunge 2019-04-21 09:31:40 +00:00
Jonathan Lüpfert
e95695f3c0 Aid the Fallen 2019-04-21 09:17:01 +00:00
austinio7116
ec53b55490 Initial draft rankings 2019-04-21 09:07:27 +01:00
austinio7116
a248d74a97 Initial draft rankings 2019-04-21 09:04:57 +01:00
austinio7116
bf947df65c Fix soul diviner to work with token creatures 2019-04-21 07:52:53 +01:00
swordshine
b34f6e89b5 Merge branch 'wareditions2' into 'master'
Improved WAR editions file for boosters

See merge request core-developers/forge!1566
2019-04-21 06:22:31 +00:00
swordshine
2ac5ed403b Merge branch 'patch' into 'master'
Fix Liliana, Dreadhorde General

See merge request core-developers/forge!1569
2019-04-21 06:20:42 +00:00
swordshine
2e6e031555 Fix Liliana, Dreadhorde General 2019-04-21 14:20:24 +08:00
swordshine
bc5f011540 Merge branch 'lili-ult' into 'master'
Fix liliana_dreadhorde_general ult affecting both players

See merge request core-developers/forge!1567
2019-04-21 06:13:33 +00:00
apantel
cbeff792e9 Fix liliana_dreadhorde_general ult 2019-04-21 02:05:48 -04:00
austinio7116
db5781c56a Merge branch 'undefined' into 'master'
More WAR Cards

See merge request core-developers/forge!1564
2019-04-21 05:40:57 +00:00
austinio7116
e16535e0e4 corrected nissa emblem name 2019-04-21 06:37:17 +01:00
swordshine
da874fe7e2 Merge branch 'vedalk-fix' into 'master'
Vedalken Humiliator script

Closes #945

See merge request core-developers/forge!1565
2019-04-21 05:36:15 +00:00
Adam Pantel
802d3d78cd Vedalken Humiliator script 2019-04-20 22:21:11 -04:00
Jonathan Lüpfert
70438bd6d8 Storm the Citadel 2019-04-20 20:03:16 +00:00
Jonathan Lüpfert
890b2f0da9 Prison Realm 2019-04-20 16:56:49 +00:00
Jonathan Lüpfert
9c1e36e456 Return to Nature 2019-04-20 11:11:12 +00:00
Jonathan Lüpfert
cde3f824e8 Planewide Celebration Token 2019-04-20 10:00:17 +00:00
Jonathan Lüpfert
adb4579d99 Planewide Celebration 2019-04-20 09:58:33 +00:00
Jonathan Lüpfert
bcb8d0ef12 Toll of Invasion 2019-04-20 09:57:05 +00:00
swordshine
6f1cd8f080 Merge branch 'undefined' into 'master'
More WAR cards

See merge request core-developers/forge!1562
2019-04-20 08:28:10 +00:00
Jonathan Lüpfert
830ecafe13 Update oath_of_kaya.txt 2019-04-20 07:23:32 +00:00
swordshine
03ebbc4da3 Merge branch 'wareditionsfile' into 'master'
Wareditionsfile

See merge request core-developers/forge!1563
2019-04-20 06:15:48 +00:00
austinio7116
e980af0b39 corrected nissa emblem name 2019-04-20 06:58:12 +01:00
austinio7116
48699f4f4d added extra amass tokens 2019-04-20 06:56:48 +01:00