Commit Graph

45330 Commits

Author SHA1 Message Date
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
Sol
eee2c0763d Merge branch 'teferitt' into 'master'
teferis_time_twist.txt add Cleanup

See merge request core-developers/forge!3102
2020-09-07 01:42:33 +00:00
Sol
988ff8e2fb Merge branch 'trusty' into 'master'
trusty_retriever.txt fix second mode

See merge request core-developers/forge!3103
2020-09-07 01:41:08 +00:00
Sol
f94abc426a Merge branch 'typo' into 'master'
dawn_to_dusk.txt fix TgtPrompt

See merge request core-developers/forge!3104
2020-09-07 01:40:27 +00:00
Sol
2299ac4788 Merge branch 'patch-12' into 'master'
Update Secret Lair Drop Series.txt (Yargle Day)

See merge request core-developers/forge!3105
2020-09-07 01:38:27 +00:00
Sol
333a38433c Merge branch 'ZNR4' into 'master'
ZNR 4 Sep

See merge request core-developers/forge!3110
2020-09-07 01:36:59 +00:00
Tim Mocny
8abe6b1796 ZNR 4 Sep 2020-09-07 01:36:59 +00:00
Sol
f32e636e27 Merge branch 'tokentypo' into 'master'
Token haste fix

See merge request core-developers/forge!3094
2020-09-07 01:36:07 +00:00
Sol
75582e5505 Merge branch 'ZNRnissa' into 'master'
nissa_of_shadowed_boughs.txt

See merge request core-developers/forge!3106
2020-09-07 01:34:12 +00:00
Tim Mocny
28f6e5d831 nissa_of_shadowed_boughs.txt 2020-09-07 01:34:12 +00:00
Sol
35dcfc486b Merge branch 'ZNR3' into 'master'
ZNR 3 Sep

See merge request core-developers/forge!3109
2020-09-07 01:33:34 +00:00
Tim Mocny
c65b001a4d ZNR 3 Sep 2020-09-07 01:33:33 +00:00
Sol
a1a3c780e4 Merge branch 'shopimages' into 'master'
Quest Mode Spell Shop

See merge request core-developers/forge!3096
2020-09-07 01:31:47 +00:00
Sol
e449eb8fba Merge branch 'patch-6' into 'master'
Update de-DE.properties

See merge request core-developers/forge!3100
2020-09-07 01:22:55 +00:00
Sol
fd174bc6c8 Merge branch 'ZNR2' into 'master'
ZNR 2 Sep

See merge request core-developers/forge!3108
2020-09-07 01:21:00 +00:00
Tim Mocny
c226a928bc ZNR 2 Sep 2020-09-07 01:20:59 +00:00