Merge branch 'master' into mg_incomplete

This commit is contained in:
StevenLawson
2013-08-12 10:05:01 -04:00
3 changed files with 7 additions and 8 deletions

View File

@ -962,7 +962,6 @@ public class TFM_Util
while (checkClass.getSuperclass() != Object.class && ((checkClass = checkClass.getSuperclass()) != null));
return null;
}
public static final List<ChatColor> COLOR_POOL = Arrays.asList(
ChatColor.DARK_BLUE,
ChatColor.DARK_GREEN,