Commit Graph

42170 Commits

Author SHA1 Message Date
Agetian
8d2fb8da4b - Fix Precursor Golem. 2019-07-01 17:21:26 +03:00
Michael Kamensky
2993136455 Merge branch 'master' into 'master'
Assorted card fixes

Closes #1074, #1075, and #1076

See merge request core-developers/forge!1930
2019-07-01 13:46:50 +00:00
Agetian
4b4adad411 - Assorted card fixes 2019-07-01 16:46:07 +03:00
swordshine
810e2bcd38 Merge branch 'patch' into 'master'
Fix an AI cheat when using ExceptSelf logic

See merge request core-developers/forge!1928
2019-06-30 14:58:18 +00:00
swordshine
a2332addae Fix an AI cheat when using ExceptSelf logic 2019-06-30 22:56:12 +08:00
Michael Kamensky
94b22b2e9c Merge branch 'master' into 'master'
Fix Herald of the Sun

Closes #1072

See merge request core-developers/forge!1927
2019-06-30 04:48:16 +00:00
Agetian
608c1f37a5 - Fix Herald of the Sun 2019-06-30 07:46:34 +03:00
Michael Kamensky
e51ad44f41 Merge branch 'netdecks' into 'master'
More of Churrufli's metagame netdecks

See merge request core-developers/forge!1926
2019-06-29 07:40:17 +00:00
austinio7116
51281e8e44 More of Churrufli's metagame netdecks 2019-06-29 07:04:21 +01:00
swordshine
e84ce13481 Merge branch 'patch' into 'master'
Fix a typo

See merge request core-developers/forge!1925
2019-06-29 05:48:38 +00:00
swordshine
c849fdaa17 Fix a typo 2019-06-29 13:48:13 +08:00
swordshine
e11016cf04 Merge branch 'patch' into 'master'
More M20 Fix

See merge request core-developers/forge!1924
2019-06-29 04:12:41 +00:00
swordshine
761b75f15a Fix Rienne 2019-06-29 11:57:13 +08:00
swordshine
7db1b2a02c Merge branch 'patch' into 'master'
Fix Wakeroot Elemental

See merge request core-developers/forge!1923
2019-06-28 16:22:31 +00:00
swordshine
80ac6eba1c Fix Wakeroot Elemental 2019-06-29 00:21:43 +08:00
swordshine
dc06e00278 Merge branch 'patch' into 'master'
Add Pattern Matcher

See merge request core-developers/forge!1918
2019-06-28 09:57:55 +00:00
swordshine
6f6ad458e9 Add Pattern Matcher 2019-06-28 11:50:42 +08:00
swordshine
198309da75 Merge branch 'master' into 'master'
Give r_7_1_elemental_trample_haste trample

See merge request core-developers/forge!1922
2019-06-28 00:02:08 +00:00
Isaac Butterfield
2c53e74e2b Give r_7_1_elemental_trample_haste trample 2019-06-27 18:24:13 +00:00
Michael Kamensky
e6a4f5422b Merge branch 'm20fixes' into 'master'
Corrected name of treasure token in editions file

See merge request core-developers/forge!1919
2019-06-27 16:26:54 +00:00
Michael Kamensky
ed93d94697 Merge branch 'master' into 'master'
Added M20 planeswalker achievements by Marek14

See merge request core-developers/forge!1921
2019-06-27 16:26:28 +00:00
Agetian
8115e09a18 - Added M20 planeswalker achievements by Marek14 2019-06-27 19:25:39 +03:00
Michael Kamensky
e1dc8d3b59 Merge branch 'master' into 'master'
Disable the ability for the AI that it can't pay the cost for (on a RemAIDeck card)

Closes #1070

See merge request core-developers/forge!1920
2019-06-27 16:16:08 +00:00
Agetian
77e3d9dbc6 - Disable the ability for the AI that it can't pay the cost for (on a RemAIDeck card) 2019-06-27 19:15:21 +03:00
austinio7116
abc0e5d4e0 Corrected name of treasure token in editions file 2019-06-27 17:11:43 +01:00
austinio7116
b09e8074fa Corrected name of treasure token in editions file 2019-06-27 17:06:56 +01:00
swordshine
cdb77daf6b Add ailogic for Lotus Field 2019-06-27 23:29:30 +08:00
swordshine
29b56797c3 Merge branch 'patch' into 'master'
Add two cards

See merge request core-developers/forge!1917
2019-06-27 15:01:44 +00:00
swordshine
b9559c1b06 Add two cards 2019-06-27 23:00:22 +08:00
swordshine
e9968a88e6 Merge branch 'm20fixes' into 'master'
Fixed omnath's duplicate Svars

See merge request core-developers/forge!1916
2019-06-27 05:38:28 +00:00
austinio7116
6694d58cd8 Switched omnath to use conditionpresent 2019-06-27 06:32:50 +01:00
austinio7116
75fb9a6e9e Switched omnath to use ispresent 2019-06-27 06:30:04 +01:00
austinio7116
2c999008d5 Fixed omnath's duplicate Svars 2019-06-27 06:28:00 +01:00
swordshine
f4d6d2931c Merge branch 'm20' into 'master'
M20

See merge request core-developers/forge!1905
2019-06-27 05:17:49 +00:00
Michael Kamensky
d39eb5b26a Merge branch 'm20rankings' into 'master'
Preparing for M20 constructed and draft formats - rankings scraped from draftsim

See merge request core-developers/forge!1915
2019-06-27 03:24:54 +00:00
Michael Kamensky
c719e03b94 Merge branch 'updatedshopimages' into 'master'
Updated product images for recent sets - already present in FTP

See merge request core-developers/forge!1914
2019-06-27 03:24:06 +00:00
swordshine
b40ef41ad2 Fix two cards 2019-06-27 08:30:15 +08:00
austinio7116
6a54481d97 Preparing for M20 constructed and draft formats - rankings scraped from draftsim
(cherry picked from commit c452ac2)
2019-06-26 23:35:25 +01:00
austinio7116
05a736bcbe Switched to correct naming convention 2019-06-26 23:04:09 +01:00
austinio7116
aa7a9c09af Updated product images for recent sets - already present in FTP 2019-06-26 17:16:29 +01:00
swordshine
5f82039e84 Add two cards 2019-06-26 23:59:31 +08:00
Rob Schnautz
c163da47e6 delete reprint 2019-06-26 15:27:33 +00:00
swordshine
1367a4465f Merge branch 'master' into 'master'
Fix Nightpack Ambusher

See merge request core-developers/forge!1913
2019-06-26 14:46:09 +00:00
swordshine
f5a05cdfb9 Fix Nightpack Ambusher 2019-06-26 22:45:21 +08:00
Rob Schnautz
1470a9c583 Update Magic 2020.txt 2019-06-26 14:38:24 +00:00
swordshine
c16f0b9c64 Update a card 2019-06-26 19:27:14 +08:00
swordshine
0b705e062b Update forgescribed cards 2019-06-26 19:20:27 +08:00
swordshine
a70b9415d0 Merge branch 'patch-2' into 'master'
Risen Reef: add ForgetChanged so the Land isn't added to Hand if it enters the Battlefield

See merge request core-developers/forge!1912
2019-06-26 07:51:57 +00:00
Hans Mackowiak
ade716a9cf Risen Reef: add ForgetChanged so the Land isn't added to Hand if it enters the Battlefield 2019-06-26 07:51:57 +00:00
swordshine
03fc16cb56 Add forgescribed cards by Austinio7116 2019-06-26 12:13:08 +08:00