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

43661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CCTV-1
fe2c3c90d6 Merge remote-tracking branch 'upstream/master' 2020-01-28 08:47:21 +08:00
Michael Kamensky
b994bce116 Merge branch 'master' into 'master' 
Added puzzle PS_THB0b - Possibility Storm - Theros Beyond Death 00b (Preseason Puzzle 2)

See merge request core-developers/forge!2466
 2020-01-26 16:45:38 +00:00
Agetian
f86d6fc2a8 - Added puzzle PS_THB0b. 2020-01-26 13:55:07 +03:00
CCTV-1
747fa3eb3c update translation 2020-01-26 09:17:09 +08:00
CCTV-1
f723f3347a fix INVALID PROPERTY: 'lblAbleToCastAnytingNiceBeing.' 2020-01-26 09:16:56 +08:00
CCTV-1
3fd3b2d642 update translation 2020-01-25 20:58:08 +08:00
CCTV-1
0f853983c9 translate some Achievements 2020-01-25 20:57:10 +08:00
CCTV-1
1d20aeddda update translation 2020-01-25 13:57:54 +08:00
CCTV-1
ba10aa935a display localization card name/type 2020-01-25 13:57:34 +08:00
CCTV-1
56c63bc6d1 translate some text 2020-01-25 13:54:32 +08:00
CCTV-1
ef70434277 update translation 2020-01-25 10:51:00 +08:00
CCTV-1
313112a488 translate some text 2020-01-25 10:50:39 +08:00
CCTV-1
9030939938 Merge remote-tracking branch 'upstream/master' 2020-01-25 09:20:03 +08:00
Michael Kamensky
c87fdb820b Merge branch 'issue1253' into 'master' 
Number of colors matters cards

Closes #1253

See merge request core-developers/forge!2464
 2020-01-24 15:21:09 +00:00
Tim Mocny
fd260af645 Number of colors matters cards 2020-01-24 15:21:08 +00:00
CCTV-1
f7904aac2b Merge remote-tracking branch 'upstream/master' 2020-01-24 09:43:40 +08:00
CCTV-1
c338988650 update translation 2020-01-24 09:42:12 +08:00
CCTV-1
07c4e1b57b fix translation lable typo,incorrect use of symbolLookup. 2020-01-24 09:41:38 +08:00
Michael Kamensky
a5b58aa3ae Merge branch 'patch-3' into 'master' 
Update nightcreep, added missing RemoveIntrinsicAbilities

See merge request core-developers/forge!2463
 2020-01-23 09:13:11 +00:00
Hans Mackowiak
31fc6e3650 Update nightcreep, added missing RemoveIntrinsicAbilities 2020-01-23 09:13:11 +00:00
CCTV-1
75dc2674d6 update translation 2020-01-23 12:54:10 +08:00
CCTV-1
f212cf1dc8 translate SleeveSelector 2020-01-23 12:53:10 +08:00
CCTV-1
0a3f1bf43c Merge remote-tracking branch 'upstream/master' 2020-01-23 12:52:10 +08:00
Michael Kamensky
1039657a82 Merge branch '22Jan2020' into 'master' 
thassa_deep_dwelling.txt fix

Closes #1246

See merge request core-developers/forge!2461
 2020-01-23 04:37:59 +00:00
Tim Mocny
43299a5298 thassa_deep_dwelling.txt fix 2020-01-23 04:37:59 +00:00
CCTV-1
5f8f82fc93 update Simplified Chinese characters list 2020-01-23 11:51:50 +08:00
CCTV-1
171cc23dba THB card translation 2020-01-23 11:50:12 +08:00
CCTV-1
9e5e05ae3c add ELD Scryfall missing translation 2020-01-23 11:49:55 +08:00
CCTV-1
e67b63375c update translation 2020-01-22 12:52:07 +08:00
CCTV-1
dda23854a3 translate some text 2020-01-22 12:51:44 +08:00
CCTV-1
625673e167 Merge remote-tracking branch 'upstream/master' 2020-01-22 12:48:25 +08:00
swordshine
d8845a413d Merge branch 'removeNoCyclingRule' into 'master' 
Remove no cycling rule

See merge request core-developers/forge!2460
 2020-01-22 03:43:53 +00:00
Hans Mackowiak
30f80f75df Remove no cycling rule 2020-01-22 03:43:53 +00:00
swordshine
c4c9d5e042 Merge branch 'master' into 'master' 
Improve the AI play logic for Lotus Field.

See merge request core-developers/forge!2459
 2020-01-22 03:42:08 +00:00
swordshine
b56de30ea2 Merge branch '21Jan2020' into 'master' 
Psychic Possession (issue 1239)

Closes #1239

See merge request core-developers/forge!2458
 2020-01-22 03:41:37 +00:00
Tim Mocny
2782046bed Psychic Possession (issue 1239) 2020-01-22 03:41:37 +00:00
Agetian
116fa84b16 - Improve the AI play logic for Lotus Field. 2020-01-21 23:02:24 +03:00
Michael Kamensky
bdb10fe59c Merge branch 'master' into 'master' 
Added puzzle PS_THB0a - Possibility Storm - Theros Beyond Death 00a (preseason 1)

See merge request core-developers/forge!2457
 2020-01-21 17:50:53 +00:00
Agetian
7aa93d61b3 - Added puzzle PS_THB0a. 2020-01-21 20:31:03 +03:00
CCTV-1
74ed34b6dd Merge remote-tracking branch 'upstream/master' 2020-01-21 17:22:43 +08:00
CCTV-1
faf9ace2ab update translation 2020-01-21 17:22:27 +08:00
Michael Kamensky
1602a1e78a Merge branch 'autodownload-expansion' into 'master' 
Auto download from Quest WinLose screen

See merge request core-developers/forge!2456
 2020-01-21 06:38:01 +00:00
Michael Kamensky
c6b0a0e072 Merge branch 'fixEnumTypes' into 'master' 
Use EnumSet in Conditions/Restrictions

See merge request core-developers/forge!2455
 2020-01-21 06:37:53 +00:00
Hans Mackowiak
311eaa70e3 Use EnumSet in Conditions/Restrictions 2020-01-21 06:37:53 +00:00
friarsol
659b1c7a63 Auto download from Quest WinLose screen 2020-01-20 21:55:12 -05:00
CCTV-1
c29432cef2 update translation 2020-01-20 23:46:12 +08:00
CCTV-1
7256cc2f8f translate mobile PlanarConquest and other some text 2020-01-20 23:45:49 +08:00
Sol
a9693495d7 Update mystic_sanctuary.txt 2020-01-20 04:22:24 +00:00
CCTV-1
feae4ebf81 fix:charset detect don't work 2020-01-20 11:24:20 +08:00
CCTV-1
e97ca38cbe fix var name wrong 2020-01-20 09:35:06 +08:00