Commit Graph

42709 Commits

Author SHA1 Message Date
swordshine
ec9e725823 Merge branch 'patch-30' into 'master'
Winding Way

See merge request core-developers/forge!1772
2019-06-04 00:44:01 +00:00
swordshine
ba882998a6 Merge branch 'patch-29' into 'master'
Update ephemerate script clean up.

See merge request core-developers/forge!1771
2019-06-04 00:43:21 +00:00
swordshine
41306dd95a Merge branch 'master' into 'master'
Moving hard-coded text to en-US.properties file

See merge request core-developers/forge!1768
2019-06-04 00:41:46 +00:00
swordshine
9dcdcd787d Merge branch 'mh1-cards-3' into 'master'
Add Springbloom Druid, Soul-Strike Technique, Settle Beyond Reality

See merge request core-developers/forge!1767
2019-06-04 00:39:33 +00:00
Charles Baker
0abffed28f Winding Way 2019-06-03 23:29:07 +00:00
Charles Baker
2acbf4d576 Update ephemerate.txt 2019-06-03 22:34:59 +00:00
Churrufli
318a6eea8f Update es-es.properties 2019-06-03 22:01:18 +00:00
Charles Baker
7c3783c935 Update ephemeral script clean up. 2019-06-03 21:25:50 +00:00
pfirpfel
8d35381454 Add Return from Extinction, Shatter Assumptions 2019-06-03 21:58:41 +02:00
pfirpfel
c30828acd3 Add Spiteful Sliver, Scuttling Sliver 2019-06-03 21:15:02 +02:00
Churrufli
b886cbadd2 Update en-US.properties 2019-06-03 18:30:57 +00:00
Churrufli
f3286e6474 Update de-DE.properties 2019-06-03 18:25:28 +00:00
churrufli
83817e21b6 Moving hard-coded text to en-US.properties file 2019-06-03 20:15:13 +02:00
pfirpfel
41e7bdba1d Add Springbloom Druid, Soul-Strike Technique, Settle Beyond Reality 2019-06-03 20:03:03 +02:00
Michael Kamensky
737253fe73 Merge branch 'even-more-mh1-cards' into 'master'
Add Pyrophobia, Orcish Hellraiser, On Thin Ice

See merge request core-developers/forge!1766
2019-06-03 17:39:32 +00:00
churrufli
f008eaba9a Merge remote-tracking branch 'forgecoredevelopers/master' 2019-06-03 18:51:35 +02:00
pfirpfel
52f9c5d644 Fix On Thin Ice aura target 2019-06-03 16:40:25 +02:00
pfirpfel
720ab6840c Add Pyrophobia 2019-06-03 15:46:28 +02:00
pfirpfel
97d048bfbf Add Orcish Hellraiser 2019-06-03 15:36:28 +02:00
pfirpfel
e1d1d41e04 Add On Thin Ice 2019-06-03 15:35:54 +02:00
Michael Kamensky
2a258ffe12 Merge branch 'patch-27' into 'master'
Hogaak, Arisen Necropolis

See merge request core-developers/forge!1756
2019-06-03 09:16:51 +00:00
Michael Kamensky
5822435635 Merge branch 'exploitedThis' into 'master'
Exploited: add info about exploited creature

See merge request core-developers/forge!1764
2019-06-03 08:12:45 +00:00
Hans Mackowiak
361860f23f Exploited: add info about exploited creature 2019-06-03 08:12:44 +00:00
austinio7116
23a95d86dd Merge branch 'patch' into 'master'
MH1: more cards

See merge request core-developers/forge!1763
2019-06-03 04:49:05 +00:00
swordshine
188e944c4f Add Farmstead Gleaner 2019-06-03 12:13:12 +08:00
swordshine
51a0942b87 Add four cards 2019-06-03 12:08:05 +08:00
swordshine
b1d37fe4fb Add two cards 2019-06-03 11:46:27 +08:00
swordshine
ea8ccec5d5 Add two cards 2019-06-03 09:56:21 +08:00
swordshine
27b7243a9a Fix Answered Prayers 2019-06-03 09:03:07 +08:00
swordshine
dc1320925b Fix Mirrodin Besieged 2019-06-03 09:00:28 +08:00
swordshine
739a154f40 Merge branch 'patch-28' into 'master'
Mirrodin Besieged

See merge request core-developers/forge!1762
2019-06-03 00:47:17 +00:00
swordshine
7fc94a9ec1 Merge branch 'patch' into 'master'
MH1: add some cards

See merge request core-developers/forge!1761
2019-06-03 00:38:06 +00:00
Charles Baker
3594b38149 Mirrodin Besieged 2019-06-02 22:32:28 +00:00
churrufli
f74a4a8461 updating res files 2019-06-02 19:40:10 +02:00
Michael Kamensky
a8e8bed9ac Merge branch 'unboundChangeX' into 'master'
ChangeX: add new Api to change the X value of a spell on the stack

See merge request core-developers/forge!1759
2019-06-02 16:08:13 +00:00
Hans Mackowiak
3ff3fbdcf5 ChangeX: add new Api to change the X value of a spell on the stack 2019-06-02 16:08:13 +00:00
swordshine
9087da3806 Add Fallen Shinobi 2019-06-02 22:59:21 +08:00
austinio7116
a7c97c58bf Fix for answered prayers animate 2019-06-02 15:45:36 +01:00
swordshine
1414b55467 Add Wrenn and Six 2019-06-02 22:19:47 +08:00
swordshine
c5e79213fe Merge branch 'mhspoilers2' into 'master'
Added booster details for mh1

See merge request core-developers/forge!1760
2019-06-02 14:15:23 +00:00
austinio7116
8f0c1b92a8 Added booster details for mh1 2019-06-02 14:34:44 +01:00
Michael Kamensky
134a7a122e Merge branch 'master' into 'master'
Fixed a missing reference

See merge request core-developers/forge!1757
2019-06-01 16:14:50 +00:00
Agetian
afda688f56 Merge remote-tracking branch 'origin/master' into agetian-master 2019-06-01 19:14:18 +03:00
Agetian
095fbda8a3 - Fix a reference in Finale of Devastation. 2019-06-01 19:13:27 +03:00
swordshine
0009ee8012 Merge branch 'patch-26' into 'master'
Ephemerate

See merge request core-developers/forge!1755
2019-06-01 12:03:45 +00:00
Charles Baker
29772c440a Hogaak, Arisen Necropolis 2019-06-01 11:32:35 +00:00
Charles Baker
86bc2b215e Ephemerate 2019-06-01 11:24:59 +00:00
swordshine
86de03e5ea Merge branch 'patch' into 'master'
Update some scripts

See merge request core-developers/forge!1754
2019-06-01 07:50:21 +00:00
swordshine
29b35df7ac Update some scripts 2019-06-01 15:48:35 +08:00
Michael Kamensky
5312ff0138 Merge branch 'master' into 'master'
Add the Human Sideboard for AI option to mobile Forge.

See merge request core-developers/forge!1753
2019-06-01 07:07:20 +00:00