Commit Graph

622 Commits

Author SHA1 Message Date
Dagin Svezek
3ef9a2fbee Replace de-DE.properties 2019-08-06 16:55:01 +00:00
Peter
11aa2e37da Replaced with new translation files (fixed wrong regex applied) 2019-08-01 17:51:56 +02:00
Peter
dd607c82b4 Fixed oracleformat function.
Now the resulting translation files are sorted
2019-07-31 18:19:16 +02:00
Peter
e4f41903d4 Changed delimiter from # to | (reminder texts fixed).
Python script now downloads the big json file from scryfall.
Updated spanish and deutsch translations
2019-07-31 17:57:47 +02:00
Peter
98cb151929 Merge branch 'master' into ui-card-translation 2019-07-30 12:19:51 +02:00
Michael Kamensky
d9899636c7 Merge branch 'nicerLondonMulliganMessage' into 'master'
Show the number of cards you need to put back when London mulliganning

See merge request core-developers/forge!1990
2019-07-30 03:27:17 +00:00
kms70847
60c2119f16 Show the number of cards you need to put back when London mulliganning 2019-07-29 22:01:34 -04:00
Peter
6e3cadac99 Added es-ES and de-DE translation files (generated via python script) 2019-07-28 11:00:47 +02:00
Peter
1d8e7a0cb3 Add Download HQ Card Pictures from Scryfall 2019-07-26 18:39:38 +02:00
churrufli
181aa0f2ab Moving hard-coded text to res files 2019-06-24 06:54:33 +02:00
Agetian
416eb02da4 - Fix en-US localization for lblCard 2019-06-19 21:58:52 +03:00
churrufli
e029ee713d Moving hard-coded text to res files 2019-06-19 00:05:20 +02:00
Michael Kamensky
4dde3610fa Merge branch 'master' into 'master'
de-DE internationalization work

See merge request core-developers/forge!1832
2019-06-11 18:10:21 +00:00
churrufli
704fa9ad5c de-DE internationalization work 2019-06-11 18:50:10 +02:00
Michael Kamensky
0bbdddada1 Merge branch 'master' into 'master'
internationalization works

See merge request core-developers/forge!1820
2019-06-11 05:36:06 +00:00
Michael Kamensky
08e2ba54ea UI for choosing the Mulligan type 2019-06-11 04:02:16 +00:00
Michael Kamensky
dad052fa07 Merge branch 'london-mulligan-feature-flag' into 'master'
Fix LondonMulligan not actually working

See merge request core-developers/forge!1825
2019-06-11 04:02:05 +00:00
Chris H
aa5851329d Fix LondonMulligan not actually working 2019-06-10 22:55:50 -04:00
churrufli
5a98eafacb internationalization works 2019-06-09 23:08:45 +02:00
churrufli
1059666444 Moving hard-coded text to en-US.properties file 2019-06-08 07:55:27 +02:00
churrufli
f44c6ac1a5 Moving hard-coded text to en-US.properties file 2019-06-07 20:56:15 +02:00
churrufli
6783f4e700 Moving hard-coded text to en-US.properties file 2019-06-07 20:50:04 +02:00
churrufli
6ddbadd339 Moving hard-coded text to en-US.properties file 2019-06-07 20:36:59 +02:00
churrufli
a63d02ff00 Moving hard-coded text to en-US.properties file 2019-06-07 20:34:14 +02:00
churrufli
4589f783b6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	forge-gui/res/languages/es-es.properties
2019-06-07 20:26:40 +02:00
churrufli
55721fb5d3 Moving hard-coded text to en-US.properties file 2019-06-07 20:26:02 +02:00
Churrufli
aafad639a6 Update es-es.properties 2019-06-07 20:25:45 +02:00
Churrufli
233e6d7794 Update en-US.properties 2019-06-07 20:25:38 +02:00
Churrufli
83df3e507f Update de-DE.properties 2019-06-07 20:25:38 +02:00
churrufli
bd4eace538 Moving hard-coded text to en-US.properties file 2019-06-07 20:25:38 +02:00
churrufli
1afc657ce6 updating res files 2019-06-07 20:25:15 +02:00
Churrufli
0f46f8c5e5 Update es-es.properties 2019-06-07 20:24:51 +02:00
Churrufli
1c1bbcebcb Update en-US.properties 2019-06-07 20:24:51 +02:00
Churrufli
f92edc3c3d Update de-DE.properties 2019-06-07 20:24:51 +02:00
churrufli
cefffc5d90 Moving hard-coded text to en-US.properties file 2019-06-07 20:24:51 +02:00
churrufli
821e345861 updating res files 2019-06-07 20:24:51 +02:00
Churrufli
318a6eea8f Update es-es.properties 2019-06-03 22:01:18 +00:00
Churrufli
b886cbadd2 Update en-US.properties 2019-06-03 18:30:57 +00:00
Churrufli
f3286e6474 Update de-DE.properties 2019-06-03 18:25:28 +00:00
churrufli
83817e21b6 Moving hard-coded text to en-US.properties file 2019-06-03 20:15:13 +02:00
churrufli
f74a4a8461 updating res files 2019-06-02 19:40:10 +02:00
Chris H
cd20443255 Add a feature to be able to Sideboard for the AI 2019-05-30 22:55:31 -04:00
Sol
6371e708b0 Merge branch 'master' into 'mulligans'
# Conflicts:
#   forge-game/src/main/java/forge/game/GameAction.java
2019-05-28 00:39:05 +00:00
Chris H
220e75a81b Extract mulligans from GameAction
- Add a few different types of Mulliganing that should be expandable
- To finish the work, we need the AI to better handle London mulligans
- And have the UI make this option selectable
2019-05-27 15:58:20 -04:00
Churrufli
191488089e Update en-US.properties 2019-05-23 13:23:33 +00:00
churrufli
70655c0f26 Moving hard-coded text to en-US.properties file 2019-05-09 00:03:38 +02:00
churrufli
d041a1d315 updating res files 2019-05-08 23:21:03 +02:00
churrufli
e9b266e1d2 updating res files 2019-05-08 23:21:03 +02:00
churrufli
ae4bb531f0 updating res files 2019-05-08 23:21:03 +02:00
churrufli
08ae29c502 updating res files 2019-05-08 23:21:03 +02:00