Merged up to current

This commit is contained in:
Mark Langen 2016-09-01 15:44:14 -06:00
commit 463576dbd0
220 changed files with 68405 additions and 29458 deletions

View file

@ -87,6 +87,7 @@ public class PermanentToken extends PermanentImpl {
this.toughness.modifyBaseValue(token.getToughness().getBaseValueModified());
this.supertype = token.getSupertype();
this.subtype = token.getSubtype();
this.tokenDescriptor = token.getTokenDescriptor();
}
@Override