Merge branch 'master' into mg_incomplete

Conflicts:
	appinfo.properties
	buildnumber.properties
This commit is contained in:
StevenLawson
2013-08-12 08:14:55 -04:00
11 changed files with 171 additions and 25 deletions

View File

@ -962,6 +962,7 @@ 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,
@ -981,4 +982,9 @@ public class TFM_Util
{
return COLOR_POOL.get(RANDOM.nextInt(COLOR_POOL.size()));
}
public static String colorise(String string)
{
return ChatColor.translateAlternateColorCodes('&', string);
}
}