Commit graph

22085 commits

Author SHA1 Message Date
spjspj
cf95e5fa08 Merge branch 'master' of https://github.com/spjspj/mage
Conflicts:
	Mage.Sets/src/mage/sets/Commander2017.java
2017-08-13 23:04:01 +10:00
spjspj
a39ceae9a1 Implement Crimson Honor Guard (C17) 2017-08-13 22:59:45 +10:00
Saga
3ad7c71b42 Update HungryLynx.java 2017-08-13 14:37:48 +02:00
Christian
df07c7fa0c Created Kindred Dominance 2017-08-12 20:54:53 -04:00
Saga\Robert
ce0dded9ca - removed unused imports 2017-08-13 00:24:27 +02:00
Saga\Robert
497f6a9342 - added Herald's Horn
- added Horn to C17
2017-08-13 00:20:48 +02:00
Saga\Robert
b49f46dcf6 - added Bloodsworn Steward
- added Hungry Lynx
- added both cards to C17
2017-08-12 19:22:51 +02:00
Saga\Robert
9a2ea73ec0 - added Rat token with Deathtouch 2017-08-12 19:19:35 +02:00
spjspj
20d4fced25 Merge pull request #3803 from spjspj/master
Implement Nazahn, Revered Bladesmith (C17)
2017-08-12 17:58:30 +10:00
spjspj
10e4d20e47 Merge branch 'master' into master 2017-08-12 17:58:24 +10:00
spjspj
f41effe979 Implement Nazahn, Revered Bladesmith (C17) 2017-08-12 17:56:55 +10:00
spjspj
e152fda404 Merge pull request #3802 from spjspj/master
Implement Patron of the Vein / Qasali Slingers (C17)
2017-08-12 17:06:15 +10:00
spjspj
c83ad3a4ed Implement Patron of the Vein / Qasali Slingers (C17) 2017-08-12 17:05:33 +10:00
Evan Kranzler
53f194552c Implemented Consuming Ferocity, Crash Landing, Credit Voucher, Crooked Scales and Deathmark Prelate 2017-08-11 18:40:53 -04:00
theelk801
967b9da1bb Merge pull request #21 from theelk801/morecrads2
merge
2017-08-11 18:38:45 -04:00
Justin Herlehy
4e15194d08 Merge pull request #3784 from Eleros/feature/HASCON2017Promos
Implemented Grimlock, Dinobot Leader // Grimlock, Ferocious King & Balan, Wandering Knight
2017-08-11 15:26:23 -07:00
theelk801
ff47290039 Merge pull request #20 from magefree/master
merge
2017-08-11 18:20:53 -04:00
theelk801
cfdf83929e Implemented Chain of Acid, Chain of Silence, Chain of Smog and Chain Stasis (#3796)
* Implement Epicenter

* Implement Infested Roothold

* Implement Brown Ouphe

* Implement Rust

* Implement Ouphe Vandals

* Implement Fatal Attraction

* Implement Fighting Chance

* Implement Arcbound Fiend

* Implement Carry Away

* Implement Caverns of Despair

* Implement Amulet of Unmaking

* Implement Aphetto Exterminator

* Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor

* Implement Bola Warrior, Brass Talon Chimera, Briar Patch and Brine Shaman

* Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter

* Implement Brown Ouphe

* Implemented Break Open

* Implemented Carrion

* Implemented Cephalid Pathmage

* Implemented Cephalid Inkshrouder

* Implemented Ceremonial Guard

* Implemented Chain of Acid, Chain of Silence, and Chain of Smog

* Implemented Chain of Acid, Chain of Silence, and Chain of Smog

* Implemented Chain Stasis
2017-08-11 17:01:57 -05:00
spjspj
edef93d860 Merge pull request #3800 from spjspj/master
Implement Scalelord Reckoner (C17)
2017-08-12 01:13:19 +10:00
spjspj
04037a6d70 Implement Scalelord Reckoner (C17) 2017-08-12 01:12:30 +10:00
spjspj
ee73b72f19 Merge pull request #3799 from spjspj/master
C17 - Implement 3 cards
2017-08-11 19:58:51 +10:00
spjspj
10159cd157 Implement Taigam, Sidisi's Hand (C17) 2017-08-11 19:56:25 +10:00
spjspj
7d2c4b9ab3 Implement Teferi's Protection (C17) 2017-08-11 17:28:03 +10:00
spjspj
625620efcc Implement Traverse the Outlands (C17) 2017-08-11 16:50:57 +10:00
spjspj
1b00198b5a Merge pull request #3798 from spjspj/master
C17 spoilers (201708)
2017-08-11 14:19:41 +10:00
spjspj
8b88e9eed4 C17 spoilers (201708) 2017-08-11 14:18:44 +10:00
Evan Kranzler
82fbb18c0d Implemented Dark Triumph 2017-08-10 13:55:30 -04:00
Evan Kranzler
fbc5d9a0ff Implemented Crookclaw Elder 2017-08-10 10:04:23 -04:00
Evan Kranzler
91a52a8b8f Implemented Complex Automaton 2017-08-10 09:50:22 -04:00
theelk801
b116e446f1 Merge pull request #19 from theelk801/morecrads2
merge
2017-08-10 09:36:49 -04:00
Evan Kranzler
1e1bb6c3ba Implemented Chime of Night 2017-08-10 09:34:03 -04:00
Evan Kranzler
da77fbf90b Implemented Cleansing 2017-08-10 09:28:20 -04:00
Evan Kranzler
4038aa3408 Implemented Chill Haunting 2017-08-10 09:03:19 -04:00
Evan Kranzler
976f2ff1ac Implemented Coiling Woodworm 2017-08-10 08:52:16 -04:00
Evan Kranzler
946cab1355 Implemented Chieftain en-Dal 2017-08-10 08:37:16 -04:00
Evan Kranzler
fcd6edfe6f Implemented Charmed Griffin, added filter, fixed Hunted Wumpus wording 2017-08-10 08:18:27 -04:00
Evan Kranzler
abb3a680fc Implemented Chain Stasis 2017-08-10 08:01:32 -04:00
spjspj
c22a8d4ec6 Merge pull request #3795 from spjspj/master
C17 spoilers (201708)
2017-08-10 20:54:14 +10:00
spjspj
127f8d2b96 C17 spoilers (201708) 2017-08-10 20:52:49 +10:00
LevelX2
a3e7aa6230 * Karn Liberated - fixed that after using its -14 ability the game does not properly set the starting player of the new game (fixes #3786). 2017-08-10 07:04:32 +02:00
theelk801
3a52ce609d Implemented Carrion, Cephalid Pathmage, Cephalid Inkshrouder and Ceremonial Guard (#3793)
* Implement Epicenter

* Implement Infested Roothold

* Implement Brown Ouphe

* Implement Rust

* Implement Ouphe Vandals

* Implement Fatal Attraction

* Implement Fighting Chance

* Implement Arcbound Fiend

* Implement Carry Away

* Implement Caverns of Despair

* Implement Amulet of Unmaking

* Implement Aphetto Exterminator

* Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor

* Implement Bola Warrior, Brass Talon Chimera, Briar Patch and Brine Shaman

* Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter

* Implement Brown Ouphe

* Implemented Break Open

* Implemented Carrion

* Implemented Cephalid Pathmage

* Implemented Cephalid Inkshrouder

* Implemented Ceremonial Guard
2017-08-09 23:13:36 -05:00
Evan Kranzler
fd15838257 Merge origin/morecrads into morecrads
Conflicts:
	Mage.Sets/src/mage/cards/c/ChainOfAcid.java
	Mage.Sets/src/mage/cards/c/ChainOfSmog.java
2017-08-09 21:17:47 -04:00
Evan Kranzler
f7ba430299 Merge commit '6af09943682f52de7b3dca92ecd6f096b5ceb3c0' into HEAD
Conflicts:
	Mage.Sets/src/mage/cards/c/ChainOfAcid.java
	Mage.Sets/src/mage/cards/c/ChainOfSmog.java
2017-08-09 20:51:39 -04:00
Evan Kranzler
6af0994368 Implemented Chain of Acid, Chain of Silence, and Chain of Smog 2017-08-09 20:27:38 -04:00
Evan Kranzler
91ca015cac Implemented Chain of Acid, Chain of Silence, and Chain of Smog 2017-08-09 19:09:43 -04:00
Eleros
b770e8ba51 Merge branch 'master' into feature/HASCON2017Promos 2017-08-09 22:11:19 +02:00
Evan Kranzler
050b2d0c1c Implemented Ceremonial Guard 2017-08-09 12:41:37 -04:00
Evan Kranzler
75853463e9 Implemented Cephalid Inkshrouder 2017-08-09 12:41:35 -04:00
Evan Kranzler
c77971e588 Implemented Cephalid Pathmage 2017-08-09 12:41:34 -04:00
Evan Kranzler
7838049c14 Implemented Carrion 2017-08-09 12:41:32 -04:00