external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,453 Commits 33 Branches 187 Tags
0637c69bfe901babf30a015d11386699407b602b
Commit Graph

11706 Commits

Author SHA1 Message Date
swordshine
0637c69bfe Add Irencrag Feat 2019-09-15 10:59:42 +08:00
swordshine
ce4fe0239f Merge branch 'patch' into 'master' 
More ELD cards

See merge request core-developers/forge!2124
 2019-09-15 02:24:46 +00:00
swordshine
5b176b93d0 Merge branch 'master' into 'master' 
Various Improvement (Android)

See merge request core-developers/forge!2110
 2019-09-15 02:24:26 +00:00
swordshine
ad428e2285 Fix a subability SVar 2019-09-15 10:07:46 +08:00
swordshine
efac184ffb add more forgescribed cards 2019-09-14 23:29:40 +08:00
swordshine
44ae0c5039 Add forgescribed cards 2019-09-14 22:53:31 +08:00
Agetian
ff5dbf2c96 - Added puzzle PS_M209. 2019-09-14 06:50:47 +03:00
Anthony Calosa
ace050a8c0 Merge remote-tracking branch 'remotes/core/master' 2019-09-13 21:12:30 +08:00
swordshine
808d1fbd47 Merge branch 'patch' into 'master' 
ELD cards

See merge request core-developers/forge!2116
 2019-09-13 11:18:46 +00:00
CCTV-1
229688f26f update translation 2019-09-13 18:37:58 +08:00
Anthony Calosa
a107d41fed Merge branch 'master' into 'master' 
# Conflicts:
#   forge-gui-mobile/src/forge/screens/match/MatchScreen.java
 2019-09-13 10:35:22 +00:00
Peter
16da63aa9c Mobile - Translation: Deck Chooser, Deck Editor and Match Screen. 
Fix compare String with equals()
 2019-09-13 11:19:35 +02:00
swordshine
b56e2ec3c3 Fix the name of Syr Elenora, the Discerning 2019-09-13 11:18:15 +08:00
swordshine
c3a5491a6b Update Garenbrig Paladin 2019-09-12 22:35:04 +08:00
Anthony Calosa
eda7d435e4 Merge remote-tracking branch 'remotes/core/master' 2019-09-12 20:38:53 +08:00
Anthony Calosa
8e282b16c5 Update Player Name 2019-09-12 20:30:42 +08:00
swordshine
46dc8b73ea Add two Adamant cards 2019-09-12 16:50:03 +08:00
swordshine
6d7d3d0306 more fixes 2019-09-12 16:08:28 +08:00
swordshine
9c21f195f9 Fix Sorcerous Spyglass 2019-09-12 16:04:55 +08:00
swordshine
207eaf482d Merge branch 'patch' into 'master' 
ELD cards

See merge request core-developers/forge!2113
 2019-09-12 06:52:22 +00:00
swordshine
b8b3f7ab82 Add two cards 2019-09-12 13:57:14 +08:00
swordshine
9baf47330d Add Doom Foretold 2019-09-12 12:43:33 +08:00
CCTV-1
89fca048ad fix:missing Swamp translation 2019-09-12 11:08:47 +08:00
CCTV-1
ac2efd0977 update simplified chinese card translation 2019-09-12 10:59:18 +08:00
CCTV-1
602327366b add basic land translation path 2019-09-12 10:58:23 +08:00
swordshine
3f9001267e Add Outlaws' Merriment 2019-09-12 10:39:08 +08:00
CCTV-1
544b653a90 Merge remote-tracking branch 'upstream/master' 2019-09-12 10:31:47 +08:00
swordshine
fdd0814786 Merge branch 'master' into 'master' 
add Simplified Chinese cards translation support

See merge request core-developers/forge!2112
 2019-09-12 02:30:26 +00:00
CCTV-1
b4f54dd150 update translation 2019-09-12 10:29:10 +08:00
swordshine
d7e0dd3e54 Add forgescribed cards 2019-09-12 10:01:52 +08:00
swordshine
35b887de14 Update Lochmere Serpent 2019-09-12 09:17:49 +08:00
CCTV-1
b5f95ccf77 update de-De es-ES card name translation 2019-09-12 09:10:38 +08:00
CCTV-1
5bf55abd49 add Simplified Chinese cards translation support 2019-09-12 09:08:43 +08:00
swordshine
434027c14f Merge branch 'ui-card-translation' into 'master' 
UI Card Translation (desktop and mobile)

See merge request core-developers/forge!1987
 2019-09-11 13:27:55 +00:00
CCTV-1
85da019bf8 update translation 2019-09-11 16:43:55 +08:00
swordshine
629fa3344b Merge branch 'mobile-translations02' into 'master' 
Mobile: Translate Settings Page

See merge request core-developers/forge!2058
 2019-09-11 07:06:58 +00:00
swordshine
3c97a43898 Merge branch 'patch' into 'master' 
ELD cards

See merge request core-developers/forge!2107
 2019-09-11 06:11:37 +00:00
swordshine
867222ffc2 Merge branch 'master' into 'master' 
Forge-Desktop LanguageComboBox content automatic generated

See merge request core-developers/forge!2108
 2019-09-11 06:11:32 +00:00
swordshine
51117558ac Merge branch 'update_run_trigger_callers_part_1' into 'master' 
Update run trigger callers part 1

See merge request core-developers/forge!2103
 2019-09-11 06:11:18 +00:00
swordshine
80f15cadfb Add more forgescribed cards 2019-09-11 13:13:03 +08:00
swordshine
89daf161a5 Add more forgescribed cards 2019-09-11 12:10:51 +08:00
swordshine
b10f0b9366 Add Enchanted Carriage 2019-09-11 09:51:41 +08:00
swordshine
e509f82599 Add forgescribed ELD cards 2019-09-11 09:09:26 +08:00
CCTV-1
a4bed16d2d update translation 2019-09-11 09:07:04 +08:00
Anthony Calosa
5f78608321 Some codes needed to revert 2019-09-09 13:30:53 +08:00
Ryan1729
311bbea70f remove more null literals where overloads that pass null exist 2019-09-08 21:34:46 -06:00
Anthony Calosa
1321bcd125 Revert URL Decode to support older phone 2019-09-08 10:45:13 +08:00
swordshine
e9794036ad Merge branch 'master' into 'master' 
Added puzzle PS_M208 - Possibility Storm - Magic Core Set 2020 08

See merge request core-developers/forge!2098
 2019-09-08 00:47:16 +00:00
Agetian
d2e7fa62d1 - Added puzzle PS_M208. 2019-09-07 22:39:02 +03:00
Hanmac
4663c5b06f cards: update card scripts for can block additional 2019-09-07 20:50:27 +02:00