Merge origin/master

This commit is contained in:
LevelX2 2015-07-21 14:56:05 +02:00
commit cbc2518c05

View file

@ -148,7 +148,7 @@ class GarrukApexPredatorBeastToken extends Token {
public GarrukApexPredatorBeastToken() { public GarrukApexPredatorBeastToken() {
super("Beast", "3/3 black Beast creature token with deathtouch"); super("Beast", "3/3 black Beast creature token with deathtouch");
setOriginalExpansionSetCode("M15"); setOriginalExpansionSetCode("M15");
setTokenType(2); setTokenType(1);
cardType.add(CardType.CREATURE); cardType.add(CardType.CREATURE);
color.setBlack(true); color.setBlack(true);
subtype.add("Beast"); subtype.add("Beast");