Merge origin/master

This commit is contained in:
LevelX2 2017-09-15 21:57:54 +02:00
commit 82d2953d7b
4 changed files with 189 additions and 19 deletions

View file

@ -320,6 +320,7 @@ public enum SubType {
TURTLE("Turtle", SubTypeSet.CreatureType),
TUSKEN("Tusken", SubTypeSet.CreatureType, true), // Star Wars
TROOPER("Trooper", SubTypeSet.CreatureType, true), // Star Wars
TRILOBYTE("Trilobyte",SubTypeSet.CreatureType),
TWILEK("Twi'lek", SubTypeSet.CreatureType, true), // Star Wars
// U