Merge fail

This commit is contained in:
Deathmax 2012-01-20 14:35:59 +08:00
parent 733be6b84e
commit 672d360e9d
5 changed files with 25 additions and 20 deletions

View file

@ -63,6 +63,9 @@ namespace TShockAPI
[Description("Prevents you from being kicked by hacked health detection")] public static readonly string
ignorestathackdetection;
[Description("Prevents your actions from being ignored if damage is too high")] public static readonly string
ignoredamagecap;
[Description("Specific log messages are sent to users with this permission")] public static readonly string logs;
[Description("Allows you to bypass the max slots for up to 5 slots above your max")] public static readonly string