Commit Graph

43661 Commits

Author SHA1 Message Date
klaxnek
5d2a32c114 Update es-ES.properties 2020-01-15 15:38:43 +00:00
swordshine
5a64b6c297 Merge branch 'master' into 'master'
translate some text

See merge request core-developers/forge!2436
2020-01-15 13:42:36 +00:00
Michael Kamensky
095e720435 Merge branch 'patch-5' into 'master'
Update StaticAbilityContinuous: for Gain Abilities, only set OriginalHost if it wasn't already set

See merge request core-developers/forge!2437
2020-01-15 13:37:15 +00:00
Hans Mackowiak
6e4908acc3 Update StaticAbilityContinuous: for Gain Abilities, only set OriginalHost if it wasn't already set 2020-01-15 13:37:15 +00:00
CCTV-1
b053f79de3 update translation 2020-01-15 20:20:48 +08:00
CCTV-1
33564d023c translate some text 2020-01-15 20:20:25 +08:00
swordshine
57f445b791 Merge branch 'master' into 'master'
update translation

See merge request core-developers/forge!2433
2020-01-15 11:31:57 +00:00
swordshine
f79e3cad2a Merge branch 'patch-5' into 'master'
Update es-ES.properties

See merge request core-developers/forge!2434
2020-01-15 11:31:27 +00:00
swordshine
0d8a2d4a1d Merge branch 'patch' into 'master'
Add Heliod's Punishment

See merge request core-developers/forge!2435
2020-01-15 11:31:21 +00:00
swordshine
2df1770781 Fix a typo in the oracle text 2020-01-15 18:51:47 +08:00
klaxnek
51ec73bdf9 Update es-ES.properties 2020-01-15 10:42:05 +00:00
klaxnek
4299db4041 Update es-ES.properties 2020-01-15 10:41:09 +00:00
swordshine
c3a95a07a1 Add Heliod's Punishment 2020-01-15 18:39:46 +08:00
CCTV-1
38d614a567 update simplified chinese translation 2020-01-15 16:54:28 +08:00
CCTV-1
c0d77a7fdf fix translation key does not match 2020-01-15 16:53:54 +08:00
swordshine
806d62129b Merge branch 'patch' into 'master'
Add three cards

See merge request core-developers/forge!2432
2020-01-15 08:46:47 +00:00
swordshine
dffd0cd62c Add three cards 2020-01-15 16:33:43 +08:00
swordshine
333a96bb8d Merge branch 'patch' into 'master'
Add Hateful Eidolon

See merge request core-developers/forge!2431
2020-01-15 08:30:41 +00:00
swordshine
1aadc7991f Add Hateful Eidolon 2020-01-15 13:12:47 +08:00
swordshine
a41dc4bbd9 Merge branch 'master' into 'master'
translate some text

See merge request core-developers/forge!2422
2020-01-15 04:00:38 +00:00
friarsol
6529e02c83 Maybe fix Mana Reflection mana duplication 2020-01-14 21:12:47 -05:00
swordshine
476c2e4ce3 Merge branch 'patch' into 'master'
Fix The Birth of Meletis

See merge request core-developers/forge!2429
2020-01-15 02:08:41 +00:00
swordshine
706055f1b5 Fix The Birth of Meletis 2020-01-15 09:21:34 +08:00
swordshine
18c964ee3c Merge branch 'thb14' into 'master'
THB 1/14

See merge request core-developers/forge!2423
2020-01-15 00:48:35 +00:00
Tim Mocny
2a6ba11552 THB 1/14 2020-01-15 00:48:35 +00:00
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