Commit Graph

44186 Commits

Author SHA1 Message Date
CCTV-1
fa30bbe67c Merge remote-tracking branch 'upstream/master' 2020-01-31 09:10:46 +08:00
CCTV-1
e39b70a5d8 update translation 2020-01-31 09:10:29 +08:00
CCTV-1
45f33106f2 display escape exile card progress 2020-01-31 09:10:01 +08:00
Michael Kamensky
415f911e46 Merge branch 'stupidideas' into 'master'
Soul Echo!

See merge request core-developers/forge!2475
2020-01-30 13:19:27 +00:00
Tim Mocny
7b4b869992 Soul Echo! 2020-01-30 13:19:26 +00:00
Michael Kamensky
3d57759d73 Merge branch 'patch-3' into 'master'
Update net-decks.txt adding Current MTGA Decks

See merge request core-developers/forge!2473
2020-01-30 13:15:26 +00:00
Michael Kamensky
ad0bec318f Merge branch '29Jan2020forumfixes' into 'master'
Various fixes reported on forum

See merge request core-developers/forge!2476
2020-01-30 13:12:24 +00:00
Tim Mocny
9571b2695f Various fixes reported on forum 2020-01-30 13:12:24 +00:00
Michael Kamensky
f09bcc4a66 Merge branch 'master' into 'master'
Fix Garruk, Cursed Huntsman achievement definition.

Closes #1262

See merge request core-developers/forge!2477
2020-01-30 13:09:39 +00:00
Agetian
fc424b1bdd - Fix Garruk, Cursed Huntsman achievement definition. 2020-01-30 14:19:13 +03:00
CCTV-1
8a9b7c562c fix lblReturnForLondon translation 2020-01-30 11:00:45 +08:00
CCTV-1
4d9c730f6f make zh-CN reminder text work(update generate script) 2020-01-29 20:16:14 +08:00
CCTV-1
9a1223c228 fix INVALID PROPERTY: 'Report' 2020-01-29 09:58:21 +08:00
CCTV-1
d7787dc974 update translation 2020-01-29 08:12:55 +08:00
CCTV-1
a3f30d899b fix missing prompt translation 2020-01-29 08:12:38 +08:00
Churrufli
ca48e75a9d Update net-decks.txt adding Current MTGA Decks 2020-01-28 22:16:33 +00:00
CCTV-1
e5051d2635 Merge remote-tracking branch 'upstream/master' 2020-01-28 22:34:10 +08:00
Michael Kamensky
c5a6145ed7 Merge branch 'patch-7' into 'master'
Mobile: AI Personality Translation

See merge request core-developers/forge!2454
2020-01-28 13:23:50 +00:00
Michael Kamensky
b2398ec8e0 Merge branch 'thbtranslation' into 'master'
Updated card translations (Theros: Beyond Death)

See merge request core-developers/forge!2471
2020-01-28 13:22:52 +00:00
Michael Kamensky
1b739ab6e5 Merge branch 'fix-thb-edition' into 'master'
Updating edition file until we have extra art ready to download

See merge request core-developers/forge!2465
2020-01-28 13:22:27 +00:00
Michael Kamensky
2e20a88b3b Merge branch '27jan2020' into 'master'
viviens_grizzly.txt fix

See merge request core-developers/forge!2470
2020-01-28 13:21:53 +00:00
Tim Mocny
9d6798e698 viviens_grizzly.txt fix 2020-01-28 13:21:53 +00:00
klaxnek
f3078059b2 Updated card translations (Theros: Beyond Death). Added Italian to script. 2020-01-28 10:05:23 +01:00
CCTV-1
fe2c3c90d6 Merge remote-tracking branch 'upstream/master' 2020-01-28 08:47:21 +08:00
Michael Kamensky
b994bce116 Merge branch 'master' into 'master'
Added puzzle PS_THB0b - Possibility Storm - Theros Beyond Death 00b (Preseason Puzzle 2)

See merge request core-developers/forge!2466
2020-01-26 16:45:38 +00:00
Agetian
f86d6fc2a8 - Added puzzle PS_THB0b. 2020-01-26 13:55:07 +03:00
CCTV-1
747fa3eb3c update translation 2020-01-26 09:17:09 +08:00
CCTV-1
f723f3347a fix INVALID PROPERTY: 'lblAbleToCastAnytingNiceBeing.' 2020-01-26 09:16:56 +08:00
friarsol
8d1367461d Updating edition file until we have extra art ready to download 2020-01-25 19:44:20 -05:00
CCTV-1
3fd3b2d642 update translation 2020-01-25 20:58:08 +08:00
CCTV-1
0f853983c9 translate some Achievements 2020-01-25 20:57:10 +08:00
CCTV-1
1d20aeddda update translation 2020-01-25 13:57:54 +08:00
CCTV-1
ba10aa935a display localization card name/type 2020-01-25 13:57:34 +08:00
CCTV-1
56c63bc6d1 translate some text 2020-01-25 13:54:32 +08:00
CCTV-1
ef70434277 update translation 2020-01-25 10:51:00 +08:00
CCTV-1
313112a488 translate some text 2020-01-25 10:50:39 +08:00
CCTV-1
9030939938 Merge remote-tracking branch 'upstream/master' 2020-01-25 09:20:03 +08:00
Michael Kamensky
c87fdb820b Merge branch 'issue1253' into 'master'
Number of colors matters cards

Closes #1253

See merge request core-developers/forge!2464
2020-01-24 15:21:09 +00:00
Tim Mocny
fd260af645 Number of colors matters cards 2020-01-24 15:21:08 +00:00
CCTV-1
f7904aac2b Merge remote-tracking branch 'upstream/master' 2020-01-24 09:43:40 +08:00
CCTV-1
c338988650 update translation 2020-01-24 09:42:12 +08:00
CCTV-1
07c4e1b57b fix translation lable typo,incorrect use of symbolLookup. 2020-01-24 09:41:38 +08:00
Michael Kamensky
a5b58aa3ae Merge branch 'patch-3' into 'master'
Update nightcreep, added missing RemoveIntrinsicAbilities

See merge request core-developers/forge!2463
2020-01-23 09:13:11 +00:00
Hans Mackowiak
31fc6e3650 Update nightcreep, added missing RemoveIntrinsicAbilities 2020-01-23 09:13:11 +00:00
CCTV-1
75dc2674d6 update translation 2020-01-23 12:54:10 +08:00
CCTV-1
f212cf1dc8 translate SleeveSelector 2020-01-23 12:53:10 +08:00
CCTV-1
0a3f1bf43c Merge remote-tracking branch 'upstream/master' 2020-01-23 12:52:10 +08:00
Michael Kamensky
1039657a82 Merge branch '22Jan2020' into 'master'
thassa_deep_dwelling.txt fix

Closes #1246

See merge request core-developers/forge!2461
2020-01-23 04:37:59 +00:00
Tim Mocny
43299a5298 thassa_deep_dwelling.txt fix 2020-01-23 04:37:59 +00:00
CCTV-1
5f8f82fc93 update Simplified Chinese characters list 2020-01-23 11:51:50 +08:00