Commit Graph

44755 Commits

Author SHA1 Message Date
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
Michael Kamensky
20e41c4fda Merge branch 'M21support' into 'master'
M21 support

See merge request core-developers/forge!2892
2020-06-21 03:30:09 +00:00
Tim Mocny
5d61cd795a M21 support 2020-06-21 03:30:09 +00:00
CCTV-1
4513976f20 some m21 cards 2020-06-21 09:17:41 +08:00
Michael Kamensky
ba0b5f813b Merge branch 'patch' into 'master'
Add Basri Ket

See merge request core-developers/forge!2890
2020-06-20 18:33:46 +00:00
swordshine
1e3531efc6 Add AI hints 2020-06-20 23:03:24 +08:00
swordshine
0e9287ba2f Merge branch 'M21.19' into 'master'
M21 - 19 June

See merge request core-developers/forge!2887
2020-06-20 14:35:25 +00:00
Tim Mocny
f65ec5455f M21 - 19 June 2020-06-20 14:35:24 +00:00
swordshine
26e0bdb545 Merge branch 'typo' into 'master'
biomass_mutation.txt typo

See merge request core-developers/forge!2888
2020-06-20 14:33:16 +00:00
swordshine
dc300a9929 Update Basri Ket's second ability (the script is implemented by Tim Mocny) 2020-06-20 22:30:23 +08:00
swordshine
d171577127 Merge branch 'patch' into 'master'
Add Carrion Grub

See merge request core-developers/forge!2889
2020-06-20 14:26:28 +00:00
swordshine
c9e0d7722c Add Carrion Grub 2020-06-20 21:52:09 +08:00
Northmoc
a95321de4e biomass_mutation.txt typo 2020-06-20 08:21:02 -04:00
Michael Kamensky
2ec4479994 Merge branch 'new_cards' into 'master'
some m21 cards

See merge request core-developers/forge!2886
2020-06-19 14:32:34 +00:00
CCTV-1
414b8b0bae response codereview 2020-06-19 19:16:04 +08:00
CCTV-1
b4686e5643 some m21 cards 2020-06-19 11:13:42 +08:00
Michael Kamensky
28f6edaccb Merge branch 'new_cards' into 'master'
some m21 cards

See merge request core-developers/forge!2884
2020-06-18 12:39:03 +00:00
CCTV-1
2359a4b435 fix typo 2020-06-18 16:03:43 +08:00
CCTV-1
5b0bdff50c response codereview 2020-06-18 11:32:47 +08:00