external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,146 Commits 33 Branches 187 Tags
7b6a3b70e9119f0612ef2d4bf516e2d03e148bcc
Commit Graph

45146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Kamensky
a7c5dd2681 Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!2876
 2020-06-18 03:14:14 +00:00
Michael Kamensky
4d9bbef480 Merge branch 'M21.16' into 'master' 
M21 - 16 June

See merge request core-developers/forge!2883
 2020-06-18 03:13:48 +00:00
Tim Mocny
20b599d52a M21 - 16 June 2020-06-18 03:13:48 +00:00
Michael Kamensky
e9bcdcc133 Merge branch 'fix_menace_counters' into 'master' 
Fix menace counters

See merge request core-developers/forge!2885
 2020-06-18 03:12:01 +00:00
Sol
90dc1a6898 Update frillscare_mentor.txt 2020-06-18 02:40:47 +00:00
Sol
3a56cd60b8 Update blood_curdle.txt 2020-06-18 02:40:20 +00:00
CCTV-1
51ec7b049b light_of_promise.txt 2020-06-18 08:59:37 +08:00
CCTV-1
1061b2e605 some m21 cards 2020-06-17 21:09:20 +08:00
swordshine
a71f8e2932 Merge branch 'M21.15' into 'master' 
M21 - 15 June

See merge request core-developers/forge!2882
 2020-06-17 01:33:24 +00:00
Tim Mocny
90e9f738b0 M21 - 15 June 2020-06-17 01:33:23 +00:00
swordshine
68a33b1322 Merge branch 'typos' into 'master' 
Typos :: TgtPromp$ -> TgtPrompt$

See merge request core-developers/forge!2881
 2020-06-16 04:50:01 +00:00
Northmoc
d74f4aa671 TgtPromp$ -> TgtPrompt$ 2020-06-15 16:10:24 -04:00
Michael Kamensky
498acbd496 Merge branch 'new_cards' into 'master' 
some m21 cards

See merge request core-developers/forge!2880
 2020-06-15 12:49:09 +00:00
CCTV-1
56cb550850 response codereview 2020-06-15 18:24:00 +08:00
CCTV-1
f28b9c8d03 code cleanup 2020-06-15 16:15:07 +08:00
CCTV-1
9a00c7d02a response codereview 2020-06-15 15:59:49 +08:00