Commit Graph

45815 Commits

Author SHA1 Message Date
Tim Mocny
6e0d347ca9 ZNR editions file 2020-09-13 16:56:05 +00:00
Michael Kamensky
91f7025410 Merge branch 'ZNR12' into 'master'
ZNR 12 Sep

See merge request core-developers/forge!3127
2020-09-13 15:15:13 +00:00
Tim Mocny
12f59f2bc7 ZNR 12 Sep 2020-09-13 15:15:12 +00:00
CCTV-1
68e3737919 remove not need type by DeckHits 2020-09-13 17:56:20 +08:00
Michael Kamensky
8c38ef7568 Merge branch 'patch-8' into 'master'
Update worlds.txt

See merge request core-developers/forge!3125
2020-09-13 04:15:33 +00:00
Michael Kamensky
1ccccf299f Merge branch 'ZNR11' into 'master'
ZNR 11 Sep

See merge request core-developers/forge!3124
2020-09-13 04:15:12 +00:00
Tim Mocny
6654004bac ZNR 11 Sep 2020-09-13 04:15:11 +00:00
CCTV-1
9f79d327f3 add newline at the file end 2020-09-13 11:47:21 +08:00
CCTV-1
3246e884af add SVar:BuffedBy:Land 2020-09-13 08:43:43 +08:00
CCTV-1
4a24726e44 add DeckHints 2020-09-13 08:43:03 +08:00
CCTV-1
732bf93333 add missed space 2020-09-13 08:42:34 +08:00
CCTV-1
ad31c9a6f3 add reminder text to TriggerDescription 2020-09-13 08:38:00 +08:00
CCTV-1
8c9d5819df add SVar:BuffedBy:Land 2020-09-13 08:37:39 +08:00
CCTV-1
d087b5ec69 add DeckHas 2020-09-13 08:34:53 +08:00
CCTV-1
8c83ec5c46 update DeckHints 2020-09-13 08:34:19 +08:00
CCTV-1
9843536547 update SpellDescription 2020-09-13 08:32:57 +08:00
CCTV-1
10072a3595 fix TriggerDescription 2020-09-13 08:31:31 +08:00
CCTV-1
d2ada43027 cat token 2020-09-12 19:25:26 +08:00
CCTV-1
f9b7db92a7 some znr card 2020-09-12 15:03:15 +08:00
Gabriel Franco
c2e8c16867 Update worlds.txt 2020-09-12 05:11:30 +00:00
Michael Kamensky
f1bc98a6cf Merge branch 'ZNR10' into 'master'
ZNR 10 Sep

See merge request core-developers/forge!3122
2020-09-12 04:51:36 +00:00
Tim Mocny
f1e4d107af ZNR 10 Sep 2020-09-12 04:51:36 +00:00
Michael Kamensky
a632a2ff56 Merge branch 'undefined' into 'master'
Magazine Insert Promos

See merge request core-developers/forge!3077
2020-09-11 06:24:51 +00:00
Michael Kamensky
43dd42ed6a Merge branch 'ZNR8' into 'master'
ZNR 8 Sep

See merge request core-developers/forge!3117
2020-09-11 06:24:20 +00:00
Tim Mocny
7331b392b5 ZNR 8 Sep 2020-09-11 06:24:20 +00:00
Michael Kamensky
4f160d95bc Merge branch 'ZNR9' into 'master'
ZNR 9 Sep

See merge request core-developers/forge!3118
2020-09-11 06:20:31 +00:00
Tim Mocny
78087e6a63 ZNR 9 Sep 2020-09-11 06:20:30 +00:00
Sol
b13e1e2b43 Merge branch 'hound' into 'master'
Update PlayerProperties "hasFewer"

Closes #1569

See merge request core-developers/forge!3120
2020-09-10 13:53:24 +00:00
Tim Mocny
25f844f571 Update PlayerProperties "hasFewer" 2020-09-10 13:53:24 +00:00
Michael Kamensky
c9634e3797 Merge branch 'patch-6' into 'master'
Update de-DE.properties

See merge request core-developers/forge!3119
2020-09-10 04:48:02 +00:00
Andreas Bendel
1450f8a3d6 Update de-DE.properties
One new line "select all"
2020-09-09 20:33:21 +00:00
Sol
e85a323632 Merge branch 'partyers' into 'master'
ZNR partyers (cards that care about party)

See merge request core-developers/forge!3114
2020-09-09 01:16:57 +00:00
Tim Mocny
9e71ede5e6 ZNR partyers (cards that care about party) 2020-09-09 01:16:57 +00:00
Sol
14764975d7 Merge branch 'typo' into 'master'
forgescribe copying missing dash

See merge request core-developers/forge!3116
2020-09-09 01:16:27 +00:00
Northmoc
92ba2c9385 forgescribe copying missing dash 2020-09-08 08:51:09 -04:00
swordshine
aab0dea4c0 Merge branch 'ZN5' into 'master'
ZNR 5 Sep

See merge request core-developers/forge!3111
2020-09-08 02:25:09 +00:00
Tim Mocny
dcd63ca847 ZNR 5 Sep 2020-09-08 02:25:08 +00:00
Sol
3b966bfee3 Merge branch 'time_to_party' into 'master'
Adding initial handling for Party

See merge request core-developers/forge!3112
2020-09-08 00:48:10 +00:00
swordshine
c56d7b88e7 Merge branch 'master' into 'master'
update simplified chinese translation

See merge request core-developers/forge!3113
2020-09-08 00:21:46 +00:00
swordshine
07f4fad4db Merge branch 'ZNR7' into 'master'
ZNR 7 Sep

See merge request core-developers/forge!3115
2020-09-08 00:21:31 +00:00
Tim Mocny
725ec728a3 ZNR 7 Sep 2020-09-08 00:21:31 +00:00
CCTV-1
04f27f2fa7 update simplified chinese translation 2020-09-07 18:25:04 +08:00
Michael Kamensky
83c770df40 Merge branch 'eldsecret' into 'master'
Borderless 'walkers and showcase frames OK for draft boosters

See merge request core-developers/forge!3095
2020-09-07 04:49:42 +00:00
Tim Mocny
d5be9d80e7 Borderless 'walkers and showcase frames OK for draft boosters 2020-09-07 04:49:42 +00:00
Michael Kamensky
1bf1d65640 Merge branch 'quest-ui-improvements' into 'master'
Quest Mode spell shop UI fixes and improvements

See merge request core-developers/forge!3097
2020-09-07 04:47:43 +00:00
friarsol
c58e4d30b3 Better way to handle AllCreatureTypes 2020-09-06 22:08:59 -04:00
Sol
c250cdfda8 Merge branch 'tokenimg_txt' into 'master'
Purge typos from token-images.txt

See merge request core-developers/forge!3098
2020-09-07 01:57:15 +00:00
Sol
d544fd0ddf Merge branch 'iml-gitignore' into 'master'
GitIgnore - Filter *.iml independent of path

See merge request core-developers/forge!2990
2020-09-07 01:51:30 +00:00
Sol
6fad881f69 Merge branch 'hornstack' into 'master'
horn_of_deafening.txt StackDescription$ SpellDescription

See merge request core-developers/forge!3099
2020-09-07 01:51:10 +00:00
Sol
d143b4a451 Merge branch 'finalerev' into 'master'
finale_of_revelation.txt only your graveyard if X≥10

See merge request core-developers/forge!3101
2020-09-07 01:47:49 +00:00