Commit Graph

43884 Commits

Author SHA1 Message Date
swordshine
6d193c315e Merge branch 'vs-null' into 'master'
Add null check for Volrath's Shapeshifter

See merge request core-developers/forge!2358
2020-01-01 03:22:26 +00:00
Adam Pantel
c81d9f6bc2 Add null check for Volrath's Shapeshifter 2019-12-31 17:05:29 -05:00
CCTV-1
e13e5d0b16 'reduce the number of words' 2019-12-31 21:37:05 +08:00
CCTV-1
ceb892d610 use localization card name in translation text 2019-12-31 21:16:06 +08:00
swordshine
2690a4d548 Merge branch 'master' into 'master'
update translation text

See merge request core-developers/forge!2351
2019-12-31 06:00:21 +00:00
swordshine
59a8e550d6 Merge branch 'my-branch' into 'master'
3rd try is the charm

See merge request core-developers/forge!2350
2019-12-31 05:59:38 +00:00
CCTV-1
4793425c58 translate ZoneType 2019-12-30 19:08:57 +08:00
CCTV-1
e47ee567bf update translation 2019-12-30 10:35:38 +08:00
CCTV-1
c9f33415e1 translate enum ZoneType 2019-12-30 10:35:16 +08:00
Sol
d1a0c9f1ff Merge branch 'updatedeldstandard' into 'master'
Updated pioneer deckgen data with lots more up-to-date meta data

See merge request core-developers/forge!2353
2019-12-30 01:25:02 +00:00
austinio7116
40b43b00c2 Updated pioneer deckgen data with lots more up-to-date meta data
(cherry picked from commit f490497)

(cherry picked from commit 729dfea)
2019-12-30 01:25:02 +00:00
CCTV-1
cea6d3a9df update simplified chinese translation 2019-12-30 08:48:07 +08:00
CCTV-1
ecda5377a3 Merge remote-tracking branch 'upstream/master' 2019-12-30 08:47:37 +08:00
Northmoc
fb9c7290b2 Tymaret Calls the Dead 2019-12-29 14:05:13 -05:00
Northmoc
5b185d2fe3 fixing Gallia 2019-12-29 12:17:23 -05:00
Northmoc
c4712e705c Gallia the satyr bear :) 2019-12-29 08:31:30 -05:00
Northmoc
d4656b619f Merge branch 'master' of https://git.cardforge.org/core-developers/forge into my-branch 2019-12-29 08:06:37 -05:00
Northmoc
e8c5a58d85 Allure of the Unknown 2019-12-29 08:06:17 -05:00
Dagin Svezek
143cfa04de Update de-DE.properties from forum 2019-12-29 09:45:42 +00:00
austinio7116
ef752c5db6 Pioneer bannings up to Dec 2 2019 2019-12-28 19:23:30 +00:00
CCTV-1
f4ba889c84 update translation 2019-12-28 20:07:03 +08:00
CCTV-1
f20e61520b update translation text to use have placeholder string 2019-12-28 20:06:51 +08:00
CCTV-1
88f082e261 Merge remote-tracking branch 'upstream/master' 2019-12-28 11:18:26 +08:00
Northmoc
6304fa4091 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into my-branch 2019-12-27 18:59:39 -05:00
Northmoc
4b01074d0f Edition update 2019-12-27 09:02:38 -05:00
austinio7116
65c8e47e26 Updated standard deckgen data with lots more up-to-date meta data
(cherry picked from commit f490497)
2019-12-27 14:00:57 +00:00
Northmoc
80c6e30691 The Binding of the Titans 2019-12-27 08:59:54 -05:00
CCTV-1
8cfc922d97 update translation 2019-12-27 15:22:52 +08:00
CCTV-1
92e6c303ad update translation text to use have placeholder string 2019-12-27 15:22:01 +08:00
Northmoc
762dc60600 TBD - card typo fix and card list update 2019-12-26 10:07:18 -05:00
Northmoc
373b81072a Merge branch 'my-branch' of https://git.cardforge.org/Northmoc/forge into my-branch 2019-12-26 09:00:39 -05:00
Northmoc
9bf2d57715 Fix for issue #1219 2019-12-26 13:58:18 +00:00
Northmoc
ef71a7befc Contributor :) 2019-12-26 13:58:18 +00:00
Northmoc
dc34c4e985 Last THB leaks/spoilers 2019-12-26 13:58:18 +00:00
Northmoc
9a495e516a Few more THB 2019-12-26 13:58:18 +00:00
Northmoc
6fcd744132 The Akroan War 2019-12-26 13:58:18 +00:00
Northmoc
70bc280cf1 4 more THB cards 12/20 2019-12-26 13:58:18 +00:00
Northmoc
470fe4b877 Chainweb aracnir - escaping with counters 2019-12-26 13:58:18 +00:00
Northmoc
86f472d29f Chainweb aracnir - escaping with counters 2019-12-26 13:58:18 +00:00
Northmoc
b54ce90df1 S THB cards and some edits 2019-12-26 13:58:18 +00:00
Northmoc
db270d0c7c 3 THB Theme Booster rares 2019-12-26 13:58:18 +00:00
Northmoc
9d5837bb87 3 THB Theme Booster rares 2019-12-26 13:58:18 +00:00
Northmoc
12848af745 3 THB Omens 2019-12-26 13:58:18 +00:00
Northmoc
2d28139ca0 7 THB N creatures (mostly vanilla) 2019-12-26 13:58:18 +00:00
Northmoc
272663dc4a Fixing apostrophes in THB list 2019-12-26 13:58:18 +00:00
Northmoc
d4a47260cb Another round of THB 2019-12-26 13:58:18 +00:00
Northmoc
7023521fb2 Another round of THB 2019-12-26 13:58:18 +00:00
Northmoc
97fe8dc35b Fixing "you may search your library and/or your graveyard" cards so your library isn't auto-searched (and shuffled) 2019-12-26 13:58:18 +00:00
CCTV-1
fb0c0bd807 fix typo 2019-12-26 08:54:20 -05:00
CCTV-1
2285541b6d fix missing translate 2019-12-26 08:54:19 -05:00