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
Blacksmith
74005529f5 [maven-release-plugin] prepare release forge-1.6.31 forge-1.6.31 2020-01-08 02:20:31 +00:00
Blacksmith
4186a365cb Update README.txt for release 2020-01-08 02:18:23 +00:00
swordshine
4366db1acc Add Altar of the Pantheon 2020-01-08 08:42:28 +08:00
klaxnek
4679e00a9e Spanish cards translation (N-O-P-Q-R-S) 2020-01-07 17:32:06 +01:00
Michael Kamensky
51960f0e28 Merge branch 'temp' into 'master' 
DigUntil should do nothing on 0

See merge request core-developers/forge!2390
 2020-01-07 16:29:43 +00:00
Adam Pantel
a27f69b1c5 DigUntil does nothing on 0 2020-01-07 10:06:33 -05:00
Michael Kamensky
8ab01cce3e Merge branch 'patch' into 'master' 
Update Pharika's Spawn using ImmediateTrigger

See merge request core-developers/forge!2388
 2020-01-07 11:54:20 +00:00
swordshine
e10235aae9 Remove a cleanup for Atris 2020-01-07 16:48:27 +08:00
swordshine
05591c6bd9 Atris should use targeting 2020-01-07 16:46:16 +08:00
swordshine
a25e469291 Simplify the script of Aphemia, the Cacophony 2020-01-07 14:41:50 +08:00
swordshine
ebd14944c6 Update Pharika's Spawn using ImmediateTrigger 2020-01-07 14:35:23 +08:00
swordshine
1b08fc3592 Merge branch 'patch-5' into 'master' 
THB 1/6

See merge request core-developers/forge!2384
 2020-01-07 06:29:45 +00:00
Tim Mocny
57457946e5 THB 1/6 2020-01-07 06:29:45 +00:00
Michael Kamensky
918a39ab60 Merge branch 'prerelease-standardization' into 'master' 
Prerelease standardization

Closes #520

See merge request core-developers/forge!2379
 2020-01-07 05:59:26 +00:00
Sol
2cc39c2580 Prerelease standardization 2020-01-07 05:59:26 +00:00
swordshine
3aca94dc9b Merge branch 'temp' into 'master' 
Kiora, Uro

See merge request core-developers/forge!2385
 2020-01-07 05:52:40 +00:00
apantel
65ad9d61d9 Kiora, Uro 2020-01-06 23:41:40 -05:00
swordshine
138e3a4661 Merge branch 'bug-fixes' into 'master' 
Extracting two bugfixes from Lerio's MR

Closes #1211

See merge request core-developers/forge!2387
 2020-01-07 04:12:37 +00:00
Sol
41844ee7e3 Extracting two bugfixes from Lerio's MR 2020-01-07 04:12:37 +00:00
Sol
d4f2594e26 Merge branch 'patch-4' into 'master' 
ghireds_belligerence fix damage

See merge request core-developers/forge!2386
 2020-01-07 02:02:54 +00:00
Hans Mackowiak
babc9de575 ghireds_belligerence fix damage 2020-01-07 02:02:54 +00:00
Michael Kamensky
11a5683025 Merge branch 'patch-3' into 'master' 
Update missing translations in es-ES.properties

See merge request core-developers/forge!2383
 2020-01-06 14:42:21 +00:00
Michael Kamensky
b6f8f89c7a Merge branch 'spanishcards05' into 'master' 
Spanish cards translation (L and M)

See merge request core-developers/forge!2382
 2020-01-06 14:42:16 +00:00
klaxnek
0885fe5898 Update es-ES.properties 2020-01-06 14:14:15 +00:00
klaxnek
8aa1f049ab Update missing translations in es-ES.properties 2020-01-06 11:44:58 +00:00
Peter
f7aa7bf580 Spanish cards translation (L and M) 2020-01-06 11:43:01 +01:00
Michael Kamensky
b74033fe17 Merge branch 'temp' into 'master' 
Unneeded SubAbility on Primordial Mist

See merge request core-developers/forge!2380
 2020-01-06 06:35:34 +00:00
Michael Kamensky
596296cabf Merge branch 'dashAltFix' into 'master' 
Dash: fix keyword after AlternativeCost

See merge request core-developers/forge!2381
 2020-01-06 06:35:15 +00:00
Hans Mackowiak
adcd86e7d7 Dash: fix keyword after AlternativeCost 2020-01-06 06:35:14 +00:00
Adam Pantel
308768ae50 Unneeded SubAbility on Primordial Mist 2020-01-05 23:42:31 -05:00
swordshine
235636ca4a Merge branch 'patch' into 'master' 
Update more scripts

See merge request core-developers/forge!2376
 2020-01-05 08:13:41 +00:00
swordshine
359ce5e39d Update more scripts 2020-01-05 15:54:15 +08:00
swordshine
c6e13e98b3 Merge branch 'patch-9' into 'master' 
THB 1/4

See merge request core-developers/forge!2375
 2020-01-05 07:52:40 +00:00
Tim Mocny
0cc9687e39 THB 1/4 2020-01-05 07:52:39 +00:00
swordshine
3d59f1832c Allure of the Unknown should reveal first 2020-01-05 14:09:33 +08:00
swordshine
58fdd58e9a Update scripts 2020-01-05 13:29:50 +08:00
swordshine
ea661c4fbb Merge branch 'translation' into 'master' 
Keep translation files in sync

See merge request core-developers/forge!2374
 2020-01-05 03:08:51 +00:00
Dagin
28abe52106 Keep translation files in sync 2020-01-04 20:23:05 +01:00
swordshine
e689fd8721 Merge branch 'master' into 'master' 
fix card name translation

See merge request core-developers/forge!2373
 2020-01-04 15:51:00 +00:00
CCTV-1
fea6c85e97 Merge remote-tracking branch 'upstream/master' 2020-01-04 22:25:17 +08:00
CCTV-1
4e80a1b818 get correct localization card name 2020-01-04 22:23:20 +08:00
Michael Kamensky
bdde3520f4 Merge branch 'patch' into 'master' 
Update Haktos the Unscarred

See merge request core-developers/forge!2371
 2020-01-04 10:21:08 +00:00
swordshine
165ae649b1 Merge branch 'temp' into 'master' 
Fix more localization mismatches

See merge request core-developers/forge!2372
 2020-01-04 05:57:59 +00:00
Adam Pantel
0536ebf1c8 Fix more localization mismatches 2020-01-03 23:21:13 -05:00
swordshine
fb176abe05 Update Haktos the Unscarred 2020-01-04 12:08:52 +08:00
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
swordshine
df8d289ee0 Merge branch 'patch-7' into 'master' 
Update synthetic_destiny.txt

See merge request core-developers/forge!2367
 2020-01-04 01:17:03 +00:00
Tim Mocny
203de48dd4 Update synthetic_destiny.txt 2020-01-04 01:17:03 +00:00
swordshine
97f763b1a0 Merge branch 'patch-6' into 'master' 
THB 12/31

See merge request core-developers/forge!2360
 2020-01-04 01:15:59 +00:00