Commit Graph

43884 Commits

Author SHA1 Message Date
swordshine
c35afecce7 Merge branch 'patch' into 'master'
Update scripts by judotrente

See merge request core-developers/forge!2313
2019-12-02 04:26:41 +00:00
swordshine
2d9e8cc2af Update scripts by judotrente 2019-12-02 09:36:50 +08:00
swordshine
a9c4842b96 Merge branch 'spanishcards04' into 'master'
Translated to spanish previously untranslated first 2.000 cards of about 5.000

See merge request core-developers/forge!2312
2019-12-02 01:35:48 +00:00
Peter
c8b21a12ed Translated to spanish previously untranslated first 2.000 cards of about 5.000. Fixed some accutes in previous translation. 2019-12-01 20:08:12 +01:00
swordshine
d0a75c0943 Merge branch 'spanishcards03' into 'master'
Translated to spanish previously untranslated first 1.000 cards of about 5.000.

See merge request core-developers/forge!2310
2019-12-01 04:38:30 +00:00
swordshine
c75d3b2d04 Merge branch 'updatedspanish01' into 'master'
Updated spanish translations

See merge request core-developers/forge!2311
2019-12-01 04:38:19 +00:00
Peter
50d8c03f8b Commited wrong file 2019-11-30 14:45:08 +01:00
Peter
dde3e08e6a Updated spanish translations 2019-11-30 14:39:46 +01:00
Peter
2dd3385849 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into spanishcards03 2019-11-30 14:23:51 +01:00
Peter
bd6cc759c7 Translated to spanish previously untranslated first 1.000 cards. Improved some translations and some of them translated thanks to DeepL.com. Translations based and fixed from www.rebellion.es 2019-11-30 14:23:22 +01:00
Michael Kamensky
39f695f120 Merge branch 'master' into 'master'
Added puzzle PS_ELD6 - Possibility Storm - Throne of Eldraine 06

See merge request core-developers/forge!2309
2019-11-29 19:44:20 +00:00
Agetian
61839df123 - Added puzzle PS_ELD6. 2019-11-29 21:22:08 +03:00
Michael Kamensky
e6b3ec048a Merge branch 'newBranch' into 'master'
Add Unstable Set to ExtendedArt

See merge request core-developers/forge!2308
2019-11-29 13:40:51 +00:00
Anthony Calosa
4fb5e7d305 Add Unstable Set to ExtendedArt 2019-11-29 13:40:25 +08:00
swordshine
8d4a80089e Merge branch 'patch' into 'master'
Game Night 2019 edition file

See merge request core-developers/forge!2307
2019-11-28 09:50:34 +00:00
swordshine
539e321c53 Removed an unused token 2019-11-28 16:53:40 +08:00
swordshine
737700719a Add Game Night 2019 edition file 2019-11-28 16:50:52 +08:00
swordshine
b2bc26142a Update Thoughtbound Phantasm's description 2019-11-28 16:50:52 +08:00
swordshine
9a125bf4f5 Merge branch 'master' into 'master'
Game Night 2019 Mythics

See merge request core-developers/forge!2306
2019-11-28 08:33:01 +00:00
Tim Mocny
b53135d83a Game Night 2019 Mythics 2019-11-28 08:33:00 +00:00
Tim Mocny
86262f3810 Upload New File 2019-11-28 04:51:27 +00:00
Tim Mocny
9237de38df Upload New File 2019-11-28 04:50:48 +00:00
Tim Mocny
18d5d7da27 Delete fiendish_duo.txt 2019-11-28 04:50:14 +00:00
Tim Mocny
cba653d891 Upload New File 2019-11-28 04:47:34 +00:00
Tim Mocny
9ea265625e Update highcliff_felidar.txt 2019-11-28 04:46:58 +00:00
Tim Mocny
d4aa0ecae4 Upload New File 2019-11-28 04:46:02 +00:00
Tim Mocny
bb5ee52133 Upload New File 2019-11-28 04:44:54 +00:00
Tim Mocny
33d5d45d3c Upload New File 2019-11-28 04:42:51 +00:00
swordshine
87bad70939 Merge branch 'master' into 'master'
translate some controller button

See merge request core-developers/forge!2305
2019-11-27 14:25:51 +00:00
CCTV-1
047bc9c5cd remove duplicate keys 2019-11-27 13:36:07 +08:00
CCTV-1
f098e333d2 translate some controller button 2019-11-27 13:32:05 +08:00
swordshine
785835632d Merge branch 'byebyeoko' into 'master'
Updated standard deckgen data - no more ELKs

See merge request core-developers/forge!2304
2019-11-27 01:43:56 +00:00
austinio7116
360b72fd91 Updated standard deckgen data - no more ELKs
(cherry picked from commit 42eafee)
2019-11-26 20:36:59 +00:00
Michael Kamensky
19082049e7 Merge branch 'master' into 'master'
Better AI logic spec for Heraldic Banner

Closes #1207

See merge request core-developers/forge!2302
2019-11-25 16:26:57 +00:00
Agetian
eacc29672f - Better AI logic spec for Heraldic Banner 2019-11-25 19:19:15 +03:00
Agetian
c7b6ac1670 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-11-25 12:40:04 +03:00
swordshine
0aa54cea23 Merge branch 'master' into 'master'
update simplified chinese translation

See merge request core-developers/forge!2300
2019-11-25 05:57:04 +00:00
Michael Kamensky
9fe50f6c66 Merge branch 'newBranch' into 'master'
Fix path seperator, Fix newdeck editor

See merge request core-developers/forge!2301
2019-11-25 05:27:44 +00:00
Anthony Calosa
2bb84cf79f Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-11-25 13:04:29 +08:00
Anthony Calosa
8d0ade1eab Fix path seperator
(android now works for filtering download if you have existing fullborder cards)

Fix newdeck editor not loading if a user deleted unwanted edition file
(TODO: Don't include setless cards on deck editor...)
2019-11-25 13:01:19 +08:00
CCTV-1
242c7c3b21 update simplified chinese translation 2019-11-25 12:36:07 +08:00
CCTV-1
ff272b89fd added missing translation label 2019-11-25 12:35:13 +08:00
Michael Kamensky
4e83e73dca Merge branch 'master' into 'master'
Update CHANGES.txt

See merge request core-developers/forge!2299
2019-11-24 05:01:49 +00:00
Michael Kamensky
7d1ffa4e90 Update CHANGES.txt 2019-11-24 05:01:49 +00:00
Agetian
aab83d882a - Updating CHANGES.txt, part 2. 2019-11-24 07:56:59 +03:00
Agetian
4f69b673bf Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-11-24 07:54:14 +03:00
Michael Kamensky
7d17e58e1f Merge branch 'newBranch' into 'master'
Update additional check

See merge request core-developers/forge!2298
2019-11-24 04:53:54 +00:00
Agetian
3d6677bbd5 - Update CHANGES.txt. 2019-11-24 07:52:42 +03:00
Anthony Calosa
30d57a5745 Update 2019-11-24 12:35:12 +08:00
Michael Kamensky
2fb2b64d33 Merge branch 'newBranch' into 'master'
Update LQ Downloader

See merge request core-developers/forge!2297
2019-11-24 04:35:01 +00:00