external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,974 Commits 33 Branches 187 Tags
a5f4375ff27f2894ff94dd19a6c35cbef390b51a
Commit Graph

469 Commits

Author SHA1 Message Date
CCTV-1
c067ab7cc9 translate new setting 2021-05-04 09:38:03 +08:00
Bug Hunter
c13e379908 Add preference how to display alternate card states in deck views 2021-05-02 14:25:35 +00:00
CCTV-1
9786d9f927 update cmc translation,add missing translation. 2021-04-24 10:39:37 +08:00
CCTV-1
73e5254e2b add missing string 2021-04-24 10:38:51 +08:00
Lyu Zong-Hong
6295ebdb09 Update Mana Value in Japanese Localization 2021-04-23 13:35:44 +09:00
Lyu Zong-Hong
2d7e88a8c2 Update in-game text and also English and Japanese localization 2021-04-23 11:01:34 +09:00
Andreas Bendel
8b7a183e63 Update de-DE.properties 
CMC is now Mana Value
 2021-04-22 15:20:52 +00:00
Lyu Zong-Hong
fdb0db2d41 Update Japanese Card Translation 2021-04-20 19:54:12 +09:00
Churrufli
d3d29e03be Update cards translations 2021-04-18 00:07:34 +02:00
Andreas Bendel
8174b883a0 Update de-DE.properties 
added line and translation lblRandomHistoricArchetypeDecks
translated lblInvalidTargetSpecification
 2021-04-15 19:38:32 +00:00
CCTV-1
a03bb7a353 translate new string. 2021-04-15 16:49:58 +08:00
Michael Kamensky
22ffcf5660 Merge branch 'historicLDA' into 'master' 
Historic Archetype Random Deck Generation

See merge request core-developers/forge!4488
 2021-04-15 06:30:19 +00:00
austinio7116
529fc42b72 Merge branch 'coremaster' into historicLDA 
# Conflicts:
#	forge-gui/res/formats/Sanctioned/Historic.txt
 2021-04-14 19:09:01 +01:00
Alumi
1e0c3e7621 Check if chosen targets meets MustTarget requirements in setupTargets() too. (For spell that has multiple targeting SAs) 2021-04-14 18:06:55 +00:00
Lyu Zong-Hong
e5d4979f3e Update Japanese Localization 2021-04-13 10:13:51 +09:00
austinio7116
93ff8cfe1b Added Historic Random Deck Generation 2021-04-12 14:36:57 +01:00
Andreas Bendel
585eb23b3c Update de-DE.properties 
translated lblLearnALesson
 2021-04-09 15:35:14 +00:00
CCTV-1
b856ad0374 translate learnLesson message. 2021-04-08 20:07:56 +08:00
Northmoc
2e31e1840a improve awkward prompt 2021-04-03 13:11:45 -04:00
CCTV-1
17c6e46e8d update simplified chinese translation 2021-04-02 11:40:30 +08:00
Andreas Bendel
11893e244e Update de-DE.properties 
some Choose-strings
 2021-03-27 11:29:17 +00:00
Northmoc
fe6a5a700a add optional Charm prompt 2021-03-26 12:43:34 -04:00
Michael Kamensky
fa72d3d0de Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!4269
 2021-03-26 10:57:20 +00:00
CCTV-1
d15d27defb update simplified chinese translation 2021-03-26 18:40:04 +08:00
Lyu Zong-Hong
ce4f12179c Add Camouflage 2021-03-26 13:05:04 +09:00
Andreas Bendel
c90cd7f525 Update de-DE.properties 
five new strings :)
 2021-03-22 20:36:04 +00:00
Lyu Zong-Hong
214a35ba5e Add Raging River 2021-03-23 02:18:01 +09:00
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