Commit Graph

45330 Commits

Author SHA1 Message Date
swordshine
01183c454b Update ReplacementMill 2020-06-26 16:46:14 +08:00
swordshine
e3863b0712 Merge branch 'patch-7' into 'master'
Update es-ES.properties

See merge request core-developers/forge!2913
2020-06-26 06:50:52 +00:00
Churrufli
0cff9ebdf0 Update es-ES.properties 2020-06-26 06:43:24 +00:00
swordshine
5fc1f92309 Update Charmed Pendant to be compatible with ChangeText effects 2020-06-26 14:39:51 +08:00
swordshine
7b0247aba5 Merge branch 'thriving_land' into 'master'
JMP: add Thriving lands

See merge request core-developers/forge!2911
2020-06-26 05:50:33 +00:00
swordshine
f9f2b65e45 Add Sanctuary Blade 2020-06-26 13:42:14 +08:00
Hans Mackowiak
e4fb9d8a9b JMP: add Thriving lands 2020-06-26 07:02:20 +02:00
swordshine
f8dab4a4b2 Merge branch 'patch' into 'master'
Update CostMill

See merge request core-developers/forge!2910
2020-06-26 04:36:53 +00:00
swordshine
088062a93e Update Ai PaymentDecision 2020-06-26 12:14:27 +08:00
swordshine
6049a681e8 Update CostMill 2020-06-26 12:04:15 +08:00
swordshine
c622291c4e Merge branch 'patch' into 'master'
Update some scripts

See merge request core-developers/forge!2909
2020-06-26 03:38:28 +00:00
swordshine
450c7c5b71 Update some scripts 2020-06-26 11:33:38 +08:00
swordshine
b5ebf2185f Merge branch 'mill' into 'master'
Mill oracle updates

Closes #1469

See merge request core-developers/forge!2907
2020-06-26 03:30:28 +00:00
Tim Mocny
fa240f6dc2 Mill oracle updates 2020-06-26 03:30:27 +00:00
swordshine
b23b4a0888 Merge branch 'JMP.24' into 'master'
JMP - 24 June

See merge request core-developers/forge!2906
2020-06-26 03:24:46 +00:00
Tim Mocny
2fc2d623a8 JMP - 24 June 2020-06-26 03:24:44 +00:00
swordshine
58c7d69d27 Merge branch 'patch' into 'master'
More JMP cards (will update the CostMill after the oracle changes are finished)

See merge request core-developers/forge!2905
2020-06-26 03:22:13 +00:00
swordshine
730a7adf2a Update the scripts 2020-06-25 13:55:17 +08:00
swordshine
39d24724c6 Move cards to the JMP folder 2020-06-24 22:40:37 +08:00
swordshine
1053b3fdea JMP: Add Bruvac the Grandiloquent 2020-06-24 22:09:00 +08:00
swordshine
cbc3f6a568 JMP: Add Emiel the Blessed 2020-06-24 22:09:00 +08:00
swordshine
d007e86779 JMP: Add Zurzoth, Chaos Rider 2020-06-24 22:09:00 +08:00
Michael Kamensky
0503177c77 Merge branch 'master' into 'master'
Fix padding in quest draft tournaments screen on mobile.

See merge request core-developers/forge!2904
2020-06-24 13:21:23 +00:00
Michael Kamensky
ffc2187fea Merge branch 'patch' into 'master'
M21: Add Chandra's Incinerator

See merge request core-developers/forge!2903
2020-06-24 13:17:48 +00:00
Agetian
69d8aeb875 - Fix padding in quest draft tournaments screen on mobile. 2020-06-24 16:13:21 +03:00
swordshine
2e15415666 M21: Add Chandra's Incinerator 2020-06-24 16:07:13 +08:00
swordshine
17333c2ae9 Merge branch 'patch' into 'master'
More M21 cards

See merge request core-developers/forge!2902
2020-06-24 08:05:32 +00:00
swordshine
b9064dad3f Add Nine Lives 2020-06-24 15:16:41 +08:00
swordshine
b1c87c7f83 Two more M21 cards 2020-06-24 14:59:01 +08:00
swordshine
e8dba06444 More M21 cards 2020-06-24 14:52:29 +08:00
Michael Kamensky
46283cebd3 Merge branch 'M21.23' into 'master'
M21 - 23 June

See merge request core-developers/forge!2901
2020-06-24 04:31:53 +00:00
Tim Mocny
86573dedf1 M21 - 23 June 2020-06-24 04:31:52 +00:00
Michael Kamensky
f57ece280f Merge branch 'patch' into 'master'
Add Teferi, Timeless Voyager

Closes #1466

See merge request core-developers/forge!2900
2020-06-23 14:44:24 +00:00
swordshine
f4f0950f72 Merge branch 'M21.22' into 'master'
M21 - 22 June

See merge request core-developers/forge!2899
2020-06-23 13:55:45 +00:00
Tim Mocny
d507de72ff M21 - 22 June 2020-06-23 13:55:45 +00:00
swordshine
9b1c8e0980 Update the "UntilTheEndOfYourNextTurn" for Teferi, Timeless Voyager 2020-06-23 20:57:54 +08:00
swordshine
1e46df363f Merge branch 'M21.21a' into 'master'
M21 - 21 June (more)

See merge request core-developers/forge!2897
2020-06-23 01:56:53 +00:00
Tim Mocny
eface99d95 M21 - 21 June (more) 2020-06-23 01:56:52 +00:00
Michael Kamensky
9dc42e68fb Merge branch 'master' into 'master'
Fix a crash when accessing tournaments in a new quest

See merge request core-developers/forge!2898
2020-06-22 09:13:27 +00:00
Agetian
1a6b51bae2 - Fix a crash when accessing tournaments in a new quest 2020-06-22 12:02:29 +03:00
swordshine
39c6de95fd Merge branch 'M21.20' into 'master'
M21 - 20 June

See merge request core-developers/forge!2891
2020-06-22 01:42:33 +00:00
Tim Mocny
d3275d78fb M21 - 20 June 2020-06-22 01:42:33 +00:00
swordshine
29afbd67a9 Merge branch 'typo' into 'master'
dream_leash.txt text update

See merge request core-developers/forge!2896
2020-06-22 01:05:02 +00:00
Northmoc
d4aefdeca1 dream_leash.txt text update 2020-06-21 14:27:06 -04:00
Michael Kamensky
0df56097af Merge branch 'M21.21' into 'master'
M21 - 21 June

See merge request core-developers/forge!2895
2020-06-21 14:09:22 +00:00
Tim Mocny
3bbadca04f M21 - 21 June 2020-06-21 14:09:21 +00:00
Michael Kamensky
9034b28747 Merge branch 'new_cards' into 'master'
some m21 cards

See merge request core-developers/forge!2893
2020-06-21 14:04:21 +00:00
Michael Kamensky
332116509d Merge branch 'patch' into 'master'
Jumpstart: Add Tinybones, Trinket Thief

See merge request core-developers/forge!2894
2020-06-21 11:23:56 +00:00
CCTV-1
37c846330f response code review 2020-06-21 12:20:14 +08:00
swordshine
93dfb28b70 Jumpstart: Add Tinybones, Trinket Thief 2020-06-21 11:51:33 +08:00