Commit Graph

44186 Commits

Author SHA1 Message Date
swordshine
ef9fb6ea68 Merge branch 'temp' into 'master'
Hostage Taker wording

See merge request core-developers/forge!2427
2020-01-15 00:47:59 +00:00
swordshine
7055c11d16 Merge branch 'Jan14Oracle' into 'master'
January 14 Oracle Changes

See merge request core-developers/forge!2426
2020-01-15 00:47:28 +00:00
Tim Mocny
b0bc918bc1 January 14 Oracle Changes 2020-01-15 00:47:28 +00:00
Michael Kamensky
bc030355fc Merge branch 'master' into 'master'
Fix references in Sunbird's Invocation.

See merge request core-developers/forge!2428
2020-01-14 18:06:15 +00:00
Agetian
873c748e76 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2020-01-14 20:58:45 +03:00
Agetian
9a987ec7a3 - Fix references in Sunbird's Invocation. 2020-01-14 20:55:08 +03:00
Adam Pantel
b7d2790a8b Hostage Taker wording 2020-01-14 12:07:47 -05:00
swordshine
98c7b47681 Merge branch 'patch' into 'master'
Fix Hero of the Games

See merge request core-developers/forge!2425
2020-01-14 15:58:43 +00:00
swordshine
992c81263a Fix Hero of the Games 2020-01-14 23:53:21 +08:00
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