Commit Graph

41205 Commits

Author SHA1 Message Date
swordshine
e020fce608 Update some scripts 2019-05-24 11:52:20 +08:00
swordshine
ca8cb7c312 Merge branch 'patch-13' into 'master'
Umezawa's Charm

See merge request core-developers/forge!1703
2019-05-24 03:45:38 +00:00
swordshine
dccb60c541 Merge branch 'patch-12' into 'master'
Feaster of Fools

See merge request core-developers/forge!1701
2019-05-24 03:45:32 +00:00
swordshine
112ba12e6d Merge branch 'patch-11' into 'master'
Mother Bear

See merge request core-developers/forge!1700
2019-05-24 03:45:10 +00:00
swordshine
2e175c3adb Merge branch 'patch-9' into 'master'
Bazaar Trademage

See merge request core-developers/forge!1698
2019-05-24 03:44:16 +00:00
Charles Baker
96fedcea5c Umezawa's Charm 2019-05-24 02:59:30 +00:00
Michael Kamensky
b31dce4a59 Merge branch 'master' into 'master'
Fix Liliana's Triumph (both the card and the AI)

See merge request core-developers/forge!1702
2019-05-24 02:46:33 +00:00
Agetian
2b04494256 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-05-24 05:45:24 +03:00
Charles Baker
dd7f3f008c Feaster of Fools 2019-05-24 02:45:13 +00:00
Agetian
4c98b135be - Fix Defined declaration on Liliana's Triumph (also takes care of the AI issues with it). 2019-05-24 05:44:00 +03:00
Charles Baker
fa711fb1e1 Mother Bear 2019-05-24 02:32:41 +00:00
swordshine
69be7a0f7a Merge branch 'patch-10' into 'master'
Mox Tantalite

See merge request core-developers/forge!1699
2019-05-24 02:29:57 +00:00
swordshine
6112f17339 Merge branch 'patch-8' into 'master'
Collected Conjuring

See merge request core-developers/forge!1697
2019-05-24 02:27:45 +00:00
Charles Baker
08706e17f4 Mox Tantalite 2019-05-24 02:25:10 +00:00
Charles Baker
4b0a80adaf Bazaar Trademage 2019-05-24 02:24:06 +00:00
Charles Baker
619bf7bd02 Update collected_conjuring.txt 2019-05-24 02:17:36 +00:00
Charles Baker
e31856994f Collected Conjuring 2019-05-24 02:03:47 +00:00
swordshine
d4ac3153ce Merge branch 'master' into 'master'
Moving hard-coded text to res files

See merge request core-developers/forge!1632
2019-05-24 00:35:11 +00:00
swordshine
fac735edc7 Merge branch 'urza-mh1' into 'master'
Added Urza, Lord High Artificer.

See merge request core-developers/forge!1696
2019-05-24 00:33:54 +00:00
Agetian
2daf92608c - AI logic support for Urza, Lord High Artificer.
- Minor fix.
2019-05-23 21:51:39 +03:00
Agetian
009909042b - Added Urza, Lord High Artificer. 2019-05-23 21:40:41 +03:00
Churrufli
191488089e Update en-US.properties 2019-05-23 13:23:33 +00:00
swordshine
a099cb8916 Merge branch 'master' into 'master'
Update some scripts

See merge request core-developers/forge!1694
2019-05-23 06:06:49 +00:00
swordshine
8bd6b6393e Update some scripts 2019-05-23 14:06:33 +08:00
swordshine
bb75ce6030 Merge branch 'patch-5' into 'master'
Astral Drift

See merge request core-developers/forge!1689
2019-05-23 05:59:39 +00:00
swordshine
b7828a8a61 Merge branch 'mh1spoilers' into 'master'
Some of today's MH1 spoilers from forgescribe

See merge request core-developers/forge!1688
2019-05-23 05:59:22 +00:00
swordshine
aac5a857a1 Merge branch 'patch-7' into 'master'
Good-Fortune Unicorn

See merge request core-developers/forge!1691
2019-05-23 03:49:54 +00:00
Michael Kamensky
f838cc2b20 Merge branch 'master' into 'master'
Tweak and merge Indigo Dragon's card patch.

See merge request core-developers/forge!1693
2019-05-23 03:38:23 +00:00
Agetian
3de494d6ac - Fixed Ultimate on Jace, Arcane Strategist. 2019-05-23 06:37:35 +03:00
Agetian
210e9484a0 Merge branch 'patch-2' of git.cardforge.org:Indigo_Dragon/forge into agetian-master 2019-05-23 06:36:46 +03:00
Michael Kamensky
25d8d7c338 Merge branch 'master' into 'master'
Improve AI targeting logic for Transmogrifying Wand.

Closes #994

See merge request core-developers/forge!1692
2019-05-23 03:28:26 +00:00
Agetian
f2f1c8997e - Improve AI targeting logic for Transmogrifying Wand. 2019-05-23 06:27:30 +03:00
Charles Baker
6c2b1b4633 Good-Fortune Unicorn 2019-05-23 02:55:29 +00:00
swordshine
5ecd07b939 Merge branch 'patch-6' into 'master'
Cleaner script for Morophon

See merge request core-developers/forge!1690
2019-05-23 01:15:23 +00:00
Charles Baker
37942cfc28 Cleaner script for Morophon 2019-05-23 00:18:36 +00:00
Charles Baker
3ed4663212 Astral Drift 2019-05-23 00:10:13 +00:00
austinio7116
fcedd44e4b Fixed dregscape error 2019-05-22 20:36:56 +01:00
austinio7116
886ec03b3e Sliver cards from AStrangerIsHere merged with a few additions that forscribe suggested too. 2019-05-22 20:27:27 +01:00
austinio7116
16d158f34e Some of today's MH1 spoilers from forgescribe 2019-05-22 19:56:43 +01:00
Indigo Dragon
f1ba38c3ee Update jace_arcane_strategist.txt 2019-05-22 16:16:08 +00:00
Michael Kamensky
7a6bbcb578 Merge branch 'patch-4' into 'master'
Mind grind cost fix. Original patch was committed in error.

See merge request core-developers/forge!1687
2019-05-22 15:04:18 +00:00
Charles Baker
c6768bedfc Mind grind cost fix. Original patch was committed in error. 2019-05-22 14:31:25 +00:00
Indigo Dragon
a08a99f65f Update jace_arcane_strategist.txt | Planeswalker$ True | 2019-05-22 11:32:42 +00:00
Indigo Dragon
a338cb194a Update loyal_subordinate.txt 2019-05-22 11:30:59 +00:00
Indigo Dragon
c5cf438fbd Update loyal_drake.txt 2019-05-22 11:30:52 +00:00
Indigo Dragon
f0a8e32c4f Update loyal_guardian.txt 2019-05-22 11:30:37 +00:00
Indigo Dragon
4faea5809f Update loyal_apprentice.txt 2019-05-22 11:30:26 +00:00
Indigo Dragon
06130171a6 Update loyal_unicorn.txt 2019-05-22 11:26:49 +00:00
swordshine
daf9fd4160 Merge branch 'geneticalgorithmnetdecks' into 'master'
Added a new netdeck category to house the outputs of my genetic algorithm to find the best decks for the AI to play in each format

See merge request core-developers/forge!1685
2019-05-22 06:18:14 +00:00
swordshine
26e64d5c80 Merge branch 'patch-3' into 'master'
Seasoned Pyromancer

See merge request core-developers/forge!1683
2019-05-22 06:17:19 +00:00