external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,661 Commits 32 Branches 187 Tags
fe2c3c90d62aab8f44478e9968182c97a13fbd77
Commit Graph

12335 Commits

Author SHA1 Message Date
swordshine
28f0232736 Merge branch 'temp' into 'master' 
Mismatched localization labels

See merge request core-developers/forge!2370
 2020-01-04 01:18:29 +00:00
swordshine
4c29fd8faf Merge branch 'patch-8' into 'master' 
Update the_royal_scions.txt

See merge request core-developers/forge!2368
 2020-01-04 01:17:32 +00:00
Tim Mocny
203de48dd4 Update synthetic_destiny.txt 2020-01-04 01:17:03 +00:00
Tim Mocny
9fd8969ea5 THB 12/31 2020-01-04 01:15:58 +00:00
Adam Pantel
d70e699c81 Mismatched localization labels 2020-01-03 16:06:01 -05:00
Tim Mocny
39bf8f5313 Update the_royal_scions.txt 2020-01-03 14:58:57 +00:00
swordshine
68eb8e2510 Merge branch 'master' into 'master' 
use localization card name in translation text

See merge request core-developers/forge!2357
 2020-01-03 13:32:01 +00:00
klaxnek
14a697269b Update es-ES.properties 2020-01-03 11:35:56 +00:00
swordshine
7de8cdee90 Merge branch 'german-translation' into 'master' 
Update de-DE.properties from forum

See merge request core-developers/forge!2355
 2020-01-03 06:50:43 +00:00
swordshine
20333491f7 Merge branch 'patch-2' into 'master' 
it-IT.properties from forum

See merge request core-developers/forge!2363
 2020-01-03 06:50:34 +00:00
swordshine
d529c55277 Merge branch 'patch-3' into 'master' 
cardnames-it-IT.txt from forum

See merge request core-developers/forge!2364
 2020-01-03 06:50:26 +00:00
CCTV-1
9e3bb1ca72 use localization card name 2020-01-03 13:43:17 +08:00
CCTV-1
817aadb995 Merge remote-tracking branch 'upstream/master' 2020-01-03 13:32:15 +08:00
Tim Mocny
492cab9c06 Update visage_of_bolas.txt (typo in line 5) 2020-01-03 04:40:50 +00:00
Michael Kamensky
64dd84b560 Merge branch 'lbl-error' into 'master' 
Fix lblPlayerActivatedCardChooseMode reference

See merge request core-developers/forge!2362
 2020-01-03 04:40:30 +00:00
Hans Mackowiak
b2fcc6e743 Refactor Escape and AlternativeCost 2020-01-03 04:40:09 +00:00
Churrufli
1584fcbb82 cardnames-it-IT.txt 2020-01-02 17:30:29 +00:00
Churrufli
2860111154 it-IT.properties 2020-01-02 17:21:24 +00:00
Dagin Svezek
cfdbb98cf9 Merge branch 'master' into 'german-translation' 
# Conflicts:
#   forge-gui/res/languages/de-DE.properties
 2020-01-02 12:23:37 +00:00
Dagin Svezek
87ec3a528b Update de-DE.properties from forum 2020-01-02 12:15:17 +00:00
Adam Pantel
cd498e408c Fix lblPlayerActivatedCardChooseMode reference 2020-01-01 21:31:06 -05:00
CCTV-1
ceb892d610 use localization card name in translation text 2019-12-31 21:16:06 +08:00
swordshine
2690a4d548 Merge branch 'master' into 'master' 
update translation text

See merge request core-developers/forge!2351
 2019-12-31 06:00:21 +00:00
swordshine
59a8e550d6 Merge branch 'my-branch' into 'master' 
3rd try is the charm

See merge request core-developers/forge!2350
 2019-12-31 05:59:38 +00:00
CCTV-1
e47ee567bf update translation 2019-12-30 10:35:38 +08:00
CCTV-1
c9f33415e1 translate enum ZoneType 2019-12-30 10:35:16 +08:00
austinio7116
40b43b00c2 Updated pioneer deckgen data with lots more up-to-date meta data 
(cherry picked from commit f490497)

(cherry picked from commit 729dfea)
 2019-12-30 01:25:02 +00:00
CCTV-1
cea6d3a9df update simplified chinese translation 2019-12-30 08:48:07 +08:00
CCTV-1
ecda5377a3 Merge remote-tracking branch 'upstream/master' 2019-12-30 08:47:37 +08:00
Northmoc
fb9c7290b2 Tymaret Calls the Dead 2019-12-29 14:05:13 -05:00
Northmoc
5b185d2fe3 fixing Gallia 2019-12-29 12:17:23 -05:00
Northmoc
c4712e705c Gallia the satyr bear :) 2019-12-29 08:31:30 -05:00
Northmoc
d4656b619f Merge branch 'master' of https://git.cardforge.org/core-developers/forge into my-branch 2019-12-29 08:06:37 -05:00
Northmoc
e8c5a58d85 Allure of the Unknown 2019-12-29 08:06:17 -05:00
Dagin Svezek
143cfa04de Update de-DE.properties from forum 2019-12-29 09:45:42 +00:00
austinio7116
ef752c5db6 Pioneer bannings up to Dec 2 2019 2019-12-28 19:23:30 +00:00
CCTV-1
f4ba889c84 update translation 2019-12-28 20:07:03 +08:00
CCTV-1
f20e61520b update translation text to use have placeholder string 2019-12-28 20:06:51 +08:00
CCTV-1
88f082e261 Merge remote-tracking branch 'upstream/master' 2019-12-28 11:18:26 +08:00
Northmoc
6304fa4091 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into my-branch 2019-12-27 18:59:39 -05:00
Northmoc
4b01074d0f Edition update 2019-12-27 09:02:38 -05:00
austinio7116
65c8e47e26 Updated standard deckgen data with lots more up-to-date meta data 
(cherry picked from commit f490497)
 2019-12-27 14:00:57 +00:00
Northmoc
80c6e30691 The Binding of the Titans 2019-12-27 08:59:54 -05:00
CCTV-1
8cfc922d97 update translation 2019-12-27 15:22:52 +08:00
Northmoc
762dc60600 TBD - card typo fix and card list update 2019-12-26 10:07:18 -05:00
CCTV-1
2285541b6d fix missing translate 2019-12-26 08:54:19 -05:00
CCTV-1
e965b899c0 update translation 2019-12-26 08:54:19 -05:00
CCTV-1
437587766b translate pay mana message 2019-12-26 08:54:19 -05:00
CCTV-1
a1fe5c5db1 update interactive message translate 2019-12-26 08:54:19 -05:00
CCTV-1
c44d91281e translate ability/effects all interactive message(in Android because Chinese word wrap doesn't work,do not translate StackDescription for now) 2019-12-26 08:54:19 -05:00