external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,548 Commits 31 Branches 187 Tags
73b1cb15c39e57a8cb235127eeec30a4634c53d2
Commit Graph

792 Commits

Author SHA1 Message Date
Anthony Calosa
e4a0ce9165 [Mobile] Preferred Art Options 2021-03-22 21:46:39 +08:00
Andreas Bendel
20d95e7b55 Update de-DE.properties 
lblRollbackPhase translated
 2021-03-20 18:05:28 +00:00
Anthony Calosa
9ce1ce14d3 Merge remote-tracking branch 'core/master' into rollback_Phase_dev 2021-03-20 02:42:14 +08:00
CCTV-1
4bb7b2f5fc update simplified chinese translation 2021-03-19 10:35:41 +08:00
Anthony Calosa
f71e31c3a8 Merge remote-tracking branch 'core/master' into rollback_Phase_dev 
# Conflicts:
#	forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
#	forge-gui-mobile/src/forge/screens/match/MatchController.java
#	forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java
#	forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java
 2021-03-18 17:19:08 +08:00
Andreas Bendel
f6a3dd38bb Update de-DE.properties 
translated lblExcludePromosFromRewardPool
 2021-03-15 20:38:39 +00:00
Michael Kamensky
1cd7e4e234 - An option to exclude promos from quest reward pool 2021-03-14 09:53:10 +03:00
Anthony Calosa
68ecf41511 [Mobile] add Experimental Rollback Phase 2021-03-14 11:57:20 +08:00
Lyu Zong-Hong
3803f80938 Update Japanese Translations 2021-03-13 12:21:34 +09:00
Churrufli
b2634686e6 Net Deck Archive Block (Desktop & Android) 2021-03-11 13:06:46 +01:00
klaxnek
17e13d1b47 Update es-ES.properties 2021-03-09 08:55:42 +00:00
CCTV-1
c517d8712d fix missing simplified chinese translations 2021-03-08 11:47:28 +08:00
Michael Kamensky
398d4220dc Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!4117
 2021-03-06 09:56:20 +00:00
Lyu Zong-Hong
ab148cd120 Update Japanese localization 2021-03-06 18:24:28 +09:00
CCTV-1
f1cff21f57 update simplified chinese translation 2021-03-06 13:28:26 +08:00
Andreas Bendel
51eab3fd3e Update de-DE.properties 
reworked a few lines
 2021-03-05 20:30:33 +00:00
Lyu Zong-Hong
9ae07284d8 Add CJK font setting and dowloader for mobile port 2021-03-05 20:25:07 +09:00
Churrufli
d2f6cf90a8 Update es-ES.properties 2021-03-04 16:36:29 +00:00
Andreas Bendel
ffb04d6462 Update de-DE.properties 
translated DisableCardImages and EnableNonLegalCards
 2021-03-03 21:46:43 +00:00
Anthony Calosa
17944c0e41 Add Disable Card Images Option 2021-03-04 02:15:16 +08:00
Anthony Calosa
36e55ae72f Add option to enable/disable Non-Legal Cards 
Playtest and Un-sets Cards
 2021-03-03 22:29:44 +08:00
Lyu Zong-Hong
45f0bb987e Update Japanese localization 2021-03-03 11:45:18 +09:00
Churrufli
f02a3c8786 Net Deck Archive Vintage (Desktop implementation) 2021-03-02 09:24:10 +01:00
CCTV-1
b8aab09789 update simplified chinese translation 2021-03-02 11:02:35 +08:00
Andreas Bendel
81870b5b9b Update de-DE.properties 
MatchScrollIndicator lines
 2021-03-01 19:50:33 +00:00
Churrufli
a37403d63d Net Deck Archive Legacy (Desktop implementation) 2021-03-01 15:26:00 +01:00
CCTV-1
af20285014 update simplified chinese translation 2021-03-01 18:51:43 +08:00
Churrufli
8d3238cefa Net Deck Archive Legacy (Desktop implementation) 2021-03-01 09:34:17 +01:00
Anthony Calosa
0ed07d91cb [Mobile] Add Scroll Indicator on Matchscreen 2021-03-01 13:50:41 +08:00
klaxnek
eef0d6eac2 Removed done TODO from es-ES.properties 2021-02-27 16:08:10 +01:00
klaxnek
d287e81d5e Update es-ES.properties and possesive translation 2021-02-27 16:05:37 +01:00
Andreas Bendel
0c747060bd Update de-DE.properties 
added lblNetArchivePioneerDecks
 2021-02-26 18:36:50 +00:00
Churrufli
1014871f46 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2021-02-25 23:34:21 +01:00
Churrufli
97367ed7e6 Net Deck Archive Pioneer (Desktop implementation) 2021-02-25 23:32:57 +01:00
Andreas Bendel
303804d0d3 Update de-DE.properties 
translated lblAdventure
 2021-02-25 17:15:07 +00:00
Lyu Zong-Hong
aa1da0c652 Implement better in-game localization/translation 2021-02-25 21:34:52 +09:00
Michael Kamensky
d42581001e Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!3998
 2021-02-24 04:08:40 +00:00
CCTV-1
5ecc9d3146 update simplified chinese translation 2021-02-24 09:10:48 +08:00
Andreas Bendel
3e38ac834a Update de-DE.properties 
dispose textures lines
 2021-02-23 20:26:51 +00:00
Lyu Zong-Hong
1567fa2f55 Small update to use getPossessedObject() if feasible 2021-02-23 11:46:23 +09:00
Anthony Calosa
9da70cf5dd [Mobile] dispose texture as an option 2021-02-23 06:48:18 +08:00
Andreas Bendel
3d95b19056 Update de-DE.properties 
phase translation
i let lblYou alone, there is more work to do
 2021-02-22 17:24:59 +00:00
Michael Kamensky
e33047f988 Merge branch 'localization_lang' into 'master' 
Update Lang.java to support other languages.

See merge request core-developers/forge!3971
 2021-02-22 12:12:26 +00:00
Churrufli
b37df976b9 New Net Deck Category: Deck Modern Archive 2021-02-22 12:53:18 +01:00
Lyu Zong-Hong
e1f68bd06c Update Lang.java so it can support other languages. 
Also translated phase/step names
 2021-02-22 19:55:05 +09:00
klaxnek
46d73f77d5 Update Kaldheim (KHM) translations fix 
Previous MR didn't contain Kaldheim translations
 2021-02-20 23:41:48 +01:00
Andreas Bendel
98eae65661 Update de-DE.properties 
Lines: net archive decks + border mask
 2021-02-20 19:03:39 +00:00
klaxnek
bbabe037db Update es-ES.properties 2021-02-20 13:49:11 +00:00
Lyu Zong-Hong
9b0a9468c4 Fix Japanese quest translation 2021-02-20 18:37:58 +09:00
Lyu Zong-Hong
021085f4f6 Update Japanese translation 2021-02-20 17:49:20 +09:00