Merge remote-tracking branch 'origin/general-devel' into general-devel

This commit is contained in:
Deathmax 2011-07-31 20:34:21 +08:00
commit 247d96e1c3
4 changed files with 27 additions and 14 deletions

View file

@ -48,7 +48,7 @@ namespace TShockAPI
public bool DisableBuild;
public int TileThreshold = 60;
public float[] AdminChatRGB = { 255, 0, 0 };
public float[] SuperAdminChatRGB = { 255, 0, 0 };
public string AdminChatPrefix = "(Admin) ";
public bool AdminChatEnabled = true;