Merge branch 'general-devel' of github.com:TShock/TShock into general-devel

This commit is contained in:
Zack Piispanen 2013-10-01 04:53:06 -04:00
commit 98a282cd2a
12 changed files with 164 additions and 27 deletions

View file

@ -105,6 +105,8 @@ namespace TShockAPI
[Description("Enables kicking of banned users by matching their IP Address.")] public bool EnableIPBans = true;
[Description("Enables kicking of banned users by matching their client UUID.")] public bool EnableUUIDBans = true;
[Description("Enables kicking of banned users by matching their Character Name.")] public bool EnableBanOnUsernames;
[Description("Selects the default group name to place new registrants under.")] public string
@ -206,6 +208,10 @@ namespace TShockAPI
[Description("Disable users from being able to login with account password when joining.")] public bool
DisableLoginBeforeJoin;
[Description("Disable users from being able to login with their client UUID.")]
public bool
DisableUUIDLogin;
[Description("Allows users to register any username with /register.")] public bool AllowRegisterAnyUsername;
[Description("Allows users to login with any username with /login.")] public bool AllowLoginAnyUsername = true;