Merge branch 'master' into master

This commit is contained in:
theelk801 2017-09-15 18:18:10 -04:00 committed by GitHub
commit ecbc4950cd
50 changed files with 3141 additions and 8 deletions

View file

@ -320,7 +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),
TRILOBITE("Trilobite",SubTypeSet.CreatureType),
TWILEK("Twi'lek", SubTypeSet.CreatureType, true), // Star Wars
// U