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

43661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CCTV-1
eff1be31da fix:in desktop,use chinese,if translation text use placeholder strings, getMessage return a garbled string(a string,the content have two encoding) 2020-01-20 09:26:52 +08:00
CCTV-1
9ee07411d0 Merge remote-tracking branch 'upstream/master' 2020-01-20 09:18:20 +08:00
CCTV-1
be99725251 fix missing translation 2020-01-19 18:58:41 +08:00
Michael Kamensky
25e9b942b1 Merge branch 'master' into 'master' 
Improve ProtectAi for cards that sacrifice themselves as a part of cost payment.

See merge request core-developers/forge!2453
 2020-01-19 07:26:13 +00:00
Agetian
ac041a79f6 - Improve ProtectAi for cards that sacrifice themselves as a part of cost payment. 2020-01-19 10:18:01 +03:00
Michael Kamensky
c59d99b8ae Merge branch 'master' into 'master' 
Preparing Forge for Android publish 1.6.32.001 [incremental].

See merge request core-developers/forge!2452
 2020-01-19 05:22:28 +00:00
Agetian
3885e02d60 - Preparing Forge for Android publish 1.6.32.001 [incremental]. 2020-01-19 08:11:34 +03:00
CCTV-1
8b432cffd9 update translation 2020-01-19 10:04:25 +08:00
CCTV-1
51e5ce0e17 translate advanced search 2020-01-19 10:04:14 +08:00
CCTV-1
f2f984aff6 Merge remote-tracking branch 'upstream/master' 2020-01-19 10:03:19 +08:00
Blacksmith
a0d8a8a241 Clear out release files in preparation for next release 2020-01-19 00:59:24 +00:00
Blacksmith
b8101d0387 [maven-release-plugin] prepare for next development iteration 2020-01-19 00:54:23 +00:00
Blacksmith
55d02d5adb [maven-release-plugin] prepare release forge-1.6.32 forge-1.6.32 2020-01-19 00:54:18 +00:00
Blacksmith
cf91b69d90 Update README.txt for release 2020-01-19 00:51:26 +00:00
Michael Kamensky
c2fdd86c29 Merge branch 'master' into 'master' 
THB basic AI hints, quest precons, achievements, minor fixes + ELD quest precons

See merge request core-developers/forge!2451
 2020-01-18 08:10:12 +00:00
Agetian
81af887694 - Enable THB on the Theros plane in Planar Conquest. 2020-01-18 10:47:52 +03:00
Agetian
85ef3aaa23 - Only 3 known booster pack images for ELD 2020-01-18 10:46:00 +03:00
Agetian
c8610da04b - Added quest precons for ELD and THB. 
- Fixed a quest precon: Simic Guild Kit.
 2020-01-18 10:27:47 +03:00
Agetian
490e204060 - Stylistic correction for an achievement. 2020-01-18 10:27:13 +03:00
Agetian
b2044944ff - THB achievements by Marek14. 2020-01-18 10:26:47 +03:00
Agetian
cbf7cc0b4c - Basic AI hints for THB. Minor card corrections. 2020-01-18 10:26:17 +03:00
CCTV-1
b9dbc14a4d Merge remote-tracking branch 'upstream/master' 2020-01-18 14:06:31 +08:00
CCTV-1
d1364066db update translation 2020-01-18 14:06:02 +08:00
CCTV-1
72d16f0636 translate some text 2020-01-18 14:05:40 +08:00
swordshine
3aa43b8246 Merge branch 'fix-translation' into 'master' 
Fix missing translation

See merge request core-developers/forge!2449
 2020-01-18 04:59:04 +00:00
Sol
ad288f5303 Merge branch 'thb17janb' into 'master' 
THB fixes

See merge request core-developers/forge!2448
 2020-01-18 04:21:49 +00:00
Tim Mocny
fcc96cf303 THB fixes 2020-01-18 04:21:48 +00:00
friarsol
ca1504b839 Fix missing translation 2020-01-17 23:20:39 -05:00
Sol
e265cb84cc Merge branch 'thb-formats' into 'master' 
Add THB to rotating formats

See merge request core-developers/forge!2447
 2020-01-18 03:01:27 +00:00
friarsol
6452189938 Add THB to rotating formats 2020-01-17 21:43:17 -05:00
Sol
3d7bd388e1 Merge branch 'patch-3' into 'master' 
Update arena_trickster.txt

See merge request core-developers/forge!2446
 2020-01-17 20:56:17 +00:00
Sol
21cfcac0c9 Merge branch 'thb17jan' into 'master' 
THB 1/17

See merge request core-developers/forge!2445
 2020-01-17 19:34:29 +00:00
Tim Mocny
5eae6acae0 THB 1/17 2020-01-17 19:34:28 +00:00
Sol
1c0cb3a885 Update arena_trickster.txt 2020-01-17 19:33:52 +00:00
Hans Mackowiak
b43fbcfabc Merge branch 'patch-3' into 'master' 
Update dreamshaper_shaman.txt

See merge request core-developers/forge!2444
 2020-01-17 14:27:07 +00:00
Sol
76146d3c6b Update dreamshaper_shaman.txt 2020-01-17 14:08:36 +00:00
Sol
641a443c82 Merge branch 'migrate-tbd' into 'master' 
Migrating Theros Beyond Death

See merge request core-developers/forge!2443
 2020-01-17 13:37:39 +00:00
tehdiplomat
e1027ce7ef Migrating Theros Beyond Death 2020-01-17 08:31:28 -05:00
Sol
46422a163b Merge branch 'patch-2' into 'master' 
Update ANNOUNCEMENTS.txt

See merge request core-developers/forge!2442
 2020-01-17 13:20:30 +00:00
Sol
556d8bfd48 Update ANNOUNCEMENTS.txt 2020-01-17 13:15:15 +00:00
swordshine
5b8e709271 Merge branch 'mana-duplication' into 'master' 
Maybe fix Mana Reflection mana duplication

See merge request core-developers/forge!2430
 2020-01-17 13:09:25 +00:00
Michael Kamensky
6fce5cc5a4 Merge branch 'patch011520' into 'master' 
More Oracle updates, Essence of the Wild fix (issue #1234) and Once and Future QOL

Closes #1234

See merge request core-developers/forge!2439
 2020-01-17 04:19:39 +00:00
Tim Mocny
b504b60112 More Oracle updates, Essence of the Wild fix (issue #1234) and Once and Future QOL 2020-01-17 04:19:39 +00:00
Michael Kamensky
c8b4e574b8 Merge branch 'thbdraft' into 'master' 
Draft Rankings for THB and other settings to allow drafting

See merge request core-developers/forge!2441
 2020-01-17 04:19:29 +00:00
austinio7116
32f117c7ec Added draft block, printsheet and booster details 2020-01-16 21:59:42 +00:00
maustin
95d3642d2e Merge branch 'coremaster' into thbdraft 2020-01-16 21:51:55 +00:00
austinio7116
c2ed631327 Merge branch 'thb15' into 'master' 
THB 1/15 tweaks and such

See merge request core-developers/forge!2440
 2020-01-16 21:49:58 +00:00
Tim Mocny
1f90f4e470 THB 1/15 tweaks and such 2020-01-16 21:49:58 +00:00
austinio7116
d397db9cfb Added draft rankings 2020-01-16 21:42:42 +00:00
swordshine
b5616362b0 Merge branch 'patch-6' into 'master' 
Update es-ES.properties

See merge request core-developers/forge!2438
 2020-01-16 01:14:41 +00:00