Commit Graph

43884 Commits

Author SHA1 Message Date
friarsol
ca1504b839 Fix missing translation 2020-01-17 23:20:39 -05:00
Sol
e265cb84cc Merge branch 'thb-formats' into 'master'
Add THB to rotating formats

See merge request core-developers/forge!2447
2020-01-18 03:01:27 +00:00
friarsol
6452189938 Add THB to rotating formats 2020-01-17 21:43:17 -05:00
Sol
3d7bd388e1 Merge branch 'patch-3' into 'master'
Update arena_trickster.txt

See merge request core-developers/forge!2446
2020-01-17 20:56:17 +00:00
Sol
21cfcac0c9 Merge branch 'thb17jan' into 'master'
THB 1/17

See merge request core-developers/forge!2445
2020-01-17 19:34:29 +00:00
Tim Mocny
5eae6acae0 THB 1/17 2020-01-17 19:34:28 +00:00
Sol
1c0cb3a885 Update arena_trickster.txt 2020-01-17 19:33:52 +00:00
Hans Mackowiak
b43fbcfabc Merge branch 'patch-3' into 'master'
Update dreamshaper_shaman.txt

See merge request core-developers/forge!2444
2020-01-17 14:27:07 +00:00
Sol
76146d3c6b Update dreamshaper_shaman.txt 2020-01-17 14:08:36 +00:00
Sol
641a443c82 Merge branch 'migrate-tbd' into 'master'
Migrating Theros Beyond Death

See merge request core-developers/forge!2443
2020-01-17 13:37:39 +00:00
tehdiplomat
e1027ce7ef Migrating Theros Beyond Death 2020-01-17 08:31:28 -05:00
Sol
46422a163b Merge branch 'patch-2' into 'master'
Update ANNOUNCEMENTS.txt

See merge request core-developers/forge!2442
2020-01-17 13:20:30 +00:00
Sol
556d8bfd48 Update ANNOUNCEMENTS.txt 2020-01-17 13:15:15 +00:00
swordshine
5b8e709271 Merge branch 'mana-duplication' into 'master'
Maybe fix Mana Reflection mana duplication

See merge request core-developers/forge!2430
2020-01-17 13:09:25 +00:00
Michael Kamensky
6fce5cc5a4 Merge branch 'patch011520' into 'master'
More Oracle updates, Essence of the Wild fix (issue #1234) and Once and Future QOL

Closes #1234

See merge request core-developers/forge!2439
2020-01-17 04:19:39 +00:00
Tim Mocny
b504b60112 More Oracle updates, Essence of the Wild fix (issue #1234) and Once and Future QOL 2020-01-17 04:19:39 +00:00
Michael Kamensky
c8b4e574b8 Merge branch 'thbdraft' into 'master'
Draft Rankings for THB and other settings to allow drafting

See merge request core-developers/forge!2441
2020-01-17 04:19:29 +00:00
austinio7116
32f117c7ec Added draft block, printsheet and booster details 2020-01-16 21:59:42 +00:00
maustin
95d3642d2e Merge branch 'coremaster' into thbdraft 2020-01-16 21:51:55 +00:00
austinio7116
c2ed631327 Merge branch 'thb15' into 'master'
THB 1/15 tweaks and such

See merge request core-developers/forge!2440
2020-01-16 21:49:58 +00:00
Tim Mocny
1f90f4e470 THB 1/15 tweaks and such 2020-01-16 21:49:58 +00:00
austinio7116
d397db9cfb Added draft rankings 2020-01-16 21:42:42 +00:00
swordshine
b5616362b0 Merge branch 'patch-6' into 'master'
Update es-ES.properties

See merge request core-developers/forge!2438
2020-01-16 01:14:41 +00:00
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