Commit Graph

12335 Commits

Author SHA1 Message Date
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
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
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
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
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
austinio7116
360b72fd91 Updated standard deckgen data - no more ELKs
(cherry picked from commit 42eafee)
2019-11-26 20:36:59 +00:00
Agetian
eacc29672f - Better AI logic spec for Heraldic Banner 2019-11-25 19:19:15 +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
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
7d1ffa4e90 Update CHANGES.txt 2019-11-24 05:01:49 +00:00
Anthony Calosa
30d57a5745 Update 2019-11-24 12:35:12 +08:00
Anthony Calosa
1dc8fed6e8 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-11-24 12:11:12 +08:00
Anthony Calosa
44c6605804 Update LQ downloader
(dont download full image equivalent to an existing fullborder images)
2019-11-24 12:05:45 +08:00
Alessandro Coli
b99dea604d Labels for changes to stack effect notification panel 2019-11-23 12:07:36 +01:00
Alessandro Coli
f3ff419462 Changes for the stack effect notifications - request by Michael Kamensky
@Agetian in merge  request
https://git.cardforge.org/core-developers/forge/merge_requests/2294
2019-11-23 12:05:08 +01:00
Alessandro Coli
d79c2469ec Merge remote-tracking branch 'upstream/master' 2019-11-23 09:44:59 +01:00
Hans Mackowiak
831edab34b Syr Konrad, the Grim: The Leave the Graveyard Trigger is only for your Graveyard 2019-11-23 01:25:30 +00:00
Alessandro Coli
5b64b41f21 Merge remote-tracking branch 'upstream/master' 2019-11-22 13:40:18 +01:00
Alessandro Coli
78a5827976 Fixed some code indentations 2019-11-22 08:17:45 +01:00
Ryan1729
bebc58d91d Merge branch 'master' of git.cardforge.org:core-developers/forge into remove_some_build_warnings
# Conflicts:
#	forge-gui-mobile/src/forge/assets/FSkin.java
2019-11-21 10:24:52 -07:00
Alessandro Coli
2c70b8b7e0 End of the stack modal panel implementation, rollback about the Wild
Quests implementation
2019-11-21 16:49:50 +01:00
Alessandro Coli
07d7b7cb58 Merge remote-tracking branch 'upstream/master' 2019-11-21 16:35:45 +01:00
swordshine
0b436479be Merge branch 'spanishcards02' into 'master'
Spanish Cards Translations. Fixed some translations. Translated to Ardent Soldier

See merge request core-developers/forge!2293
2019-11-20 05:11:08 +00:00
Ryan1729
f0076117df respond to code review 2019-11-19 19:38:51 -07:00
klaxnek
f8b4a843c5 Spanish CardS Translations. Fixed some translations. Translated to Ardent Soldier 2019-11-19 22:39:00 +01:00
Agetian
5a24092dc0 - Update the B&R list (Nov 18, 2019) 2019-11-19 16:18:56 +03:00
Agetian
f0fb6539ef - Added puzzle PS_ELD5. 2019-11-19 11:59:59 +03:00
swordshine
a85a761bee Merge branch 'spanishcards01' into 'master'
Spanish cards translation: from Abandon Hope to Altar of Bone.

See merge request core-developers/forge!2290
2019-11-19 01:11:05 +00:00
klaxnek
9516929495 Restore newline at end of file 2019-11-19 01:57:08 +01:00
klaxnek
5350a4c476 Spanish cards translation: from Abandon Hope to Altar of Bone.
Updated spanish card translations from Scryfall.
2019-11-19 01:54:10 +01:00