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

44177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans Mackowiak
d9e9076fb4 Merge branch 'patch-5' into 'master' 
Update Throne of Eldraine.txt

See merge request core-developers/forge!2424
 2020-01-14 14:21:35 +00:00
Tim Mocny
938d5259a4 Update Throne of Eldraine.txt 2020-01-14 14:21:35 +00:00
CCTV-1
8d64694ac7 update translation 2020-01-14 13:19:20 +08:00
CCTV-1
1a55341dd3 translate some text 2020-01-14 13:18:43 +08:00
swordshine
3f2d70c315 Merge branch 'patch' into 'master' 
Add more cards

See merge request core-developers/forge!2421
 2020-01-14 01:54:48 +00:00
swordshine
fe005f3232 Add more cards 2020-01-14 09:46:49 +08:00
Hans Mackowiak
38f573bfce Merge branch 'patch' into 'master' 
Add more THB cards

See merge request core-developers/forge!2417
 2020-01-14 01:15:22 +00:00
swordshine
efc2d3a8e6 Merge branch 'thb13a' into 'master' 
THB 1/13

See merge request core-developers/forge!2420
 2020-01-14 01:13:09 +00:00
Tim Mocny
b2f0f0ca84 THB 1/13 2020-01-14 01:13:09 +00:00
swordshine
fd347c10d0 Merge branch 'savant' into 'master' 
Arcane Savant and friends

See merge request core-developers/forge!2396
 2020-01-14 01:12:09 +00:00
swordshine
0aacc3e2da Merge branch 'patch-5' into 'master' 
Update rankle_master_of_pranks.txt

See merge request core-developers/forge!2418
 2020-01-14 01:03:20 +00:00
Tim Mocny
fea69dfe06 Update rankle_master_of_pranks.txt 2020-01-14 01:03:20 +00:00
swordshine
e8e45cc378 Add Shadowspear 2020-01-13 23:02:49 +08:00
swordshine
5d6047ca7d Merge branch 'patch' into 'master' 
Add more THB cards

See merge request core-developers/forge!2416
 2020-01-13 14:37:37 +00:00
swordshine
6ad5e6d974 Add more THB cards 2020-01-13 14:37:37 +00:00
swordshine
82ced80a3e Merge branch 'patch' into 'master' 
Add more THB cards

See merge request core-developers/forge!2414
 2020-01-13 12:47:52 +00:00
swordshine
79347c0f9c Add more THB cards 2020-01-13 12:47:52 +00:00
swordshine
7b060320b5 Merge branch 'patch-4' into 'master' 
Update es-ES.properties. Fixed some translations.

See merge request core-developers/forge!2413
 2020-01-13 10:38:49 +00:00
klaxnek
38f4d4aa1b Update es-ES.properties. Fixed some translations. 2020-01-13 10:30:30 +00:00
swordshine
3dc80a8342 Merge branch 'master' into 'master' 
translate some text

See merge request core-developers/forge!2412
 2020-01-13 08:01:55 +00:00
swordshine
8dbfd9050c Merge branch 'thb10b' into 'master' 
THB 1/10!

See merge request core-developers/forge!2406
 2020-01-13 07:59:46 +00:00
Tim Mocny
c5604bddac THB 1/10! 2020-01-13 07:59:46 +00:00
CCTV-1
789401ed24 fix:some text translate 2020-01-13 13:44:16 +08:00
CCTV-1
c0d967a467 update translation 2020-01-13 13:34:14 +08:00
CCTV-1
75d49554da translate some text 2020-01-13 13:33:55 +08:00
swordshine
d228429b56 Merge branch 'stacktranslation01' into 'master' 
StackTranslation01 - Translate PermanentEffect Card Name

See merge request core-developers/forge!2411
 2020-01-13 00:44:14 +00:00
swordshine
9630d1a26b Merge branch 'spanishcardsfinal' into 'master' 
Spanish Cards Translation (T..Z)

See merge request core-developers/forge!2410
 2020-01-13 00:43:35 +00:00
klaxnek
2922f99ae3 Undo changes 2020-01-12 16:41:06 +01:00
klaxnek
cf7a7177c7 Translate PermanentCreatureEffect Card Name 2020-01-12 16:37:06 +01:00
klaxnek
f5dcbf4e6e Wrong commit 2020-01-12 15:02:03 +01:00
klaxnek
60c946a501 Spanish Cards Translation (T..Z). Fixed some untranslated cards. Finished!!! 2020-01-12 14:58:57 +01:00
Peter
28393d4571 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2020-01-12 14:46:55 +01:00
Michael Kamensky
eacfa96df4 Merge branch 'thb' into 'master' 
Whirlwind Denial

See merge request core-developers/forge!2409
 2020-01-12 04:40:30 +00:00
Michael Kamensky
576f83b5dc Merge branch 'master' into 'master' 
Improve CopyPermanentAi for Bramble Sovereign.

Closes #1231

See merge request core-developers/forge!2408
 2020-01-12 04:39:47 +00:00
Adam Pantel
b35ea79083 Whirlwind Denial 2020-01-11 18:20:30 -05:00
Agetian
45f2193e2a - NPE guard. 2020-01-11 16:44:44 +03:00
Agetian
b329786659 - Improve CopyPermanentAi for Bramble Sovereign. 2020-01-11 16:43:20 +03:00
Michael Kamensky
adf181aaec Merge branch 'patch-4' into 'master' 
Update seven_dwarves.txt

See merge request core-developers/forge!2407
 2020-01-11 04:16:10 +00:00
Sol
a95fff5ae3 Update seven_dwarves.txt 2020-01-11 03:25:58 +00:00
Adam Pantel
f401c3900c Arcane Savant and friends 2020-01-10 18:29:44 -05:00
Michael Kamensky
1f01e2ae16 Merge branch '1228-test-failure-testclonetransform' into 'master' 
Resolve "Test failure: testCloneTransform"

Closes #1228

See merge request core-developers/forge!2404
 2020-01-10 10:24:07 +00:00
Hans Mackowiak
d5cc3289dc Resolve "Test failure: testCloneTransform" 2020-01-10 10:24:07 +00:00
swordshine
9a0ba159b0 Merge branch 'master' into 'master' 
Override getParamOrDefault for the sake of WrappedAbility, fixes Verdurous Gearhulk AI

Closes #1227

See merge request core-developers/forge!2403
 2020-01-10 07:47:33 +00:00
Michael Kamensky
71dfe3146b Merge branch 'patch' into 'master' 
Add Eidolon of Obstruction

See merge request core-developers/forge!2402
 2020-01-10 07:31:00 +00:00
Agetian
9ed01ebbb6 - Override getParamOrDefault for the sake of WrappedAbility, fixes Verdurous Gearhulk AI allocation. 2020-01-10 10:27:30 +03:00
swordshine
0e7af09df3 Add Eidolon of Obstruction 2020-01-10 15:13:26 +08:00
swordshine
3c4844e46d Merge branch 'thb' into 'master' 
Fix Dig in Thassas Oracle

See merge request core-developers/forge!2401
 2020-01-10 01:11:48 +00:00
swordshine
965b67577a Merge branch 'thb9' into 'master' 
THB 1/9

See merge request core-developers/forge!2399
 2020-01-10 01:11:28 +00:00
Tim Mocny
8bcb38d4fc THB 1/9 2020-01-10 01:11:28 +00:00
Adam Pantel
071873718e Fix Dig in Thassas Oracle, disallow cancel 2020-01-09 14:16:39 -05:00