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

This commit is contained in:
Zidonuke Ghost 2013-10-01 06:22:25 -04:00
commit 262e6d8349
8 changed files with 102 additions and 28 deletions

View file

@ -276,6 +276,7 @@ namespace TShockAPI
[Description("The number of reserved slots past your max server slot that can be joined by reserved players")] public int ReservedSlots = 20;
[Description("The number of reserved slots past your max server slot that can be joined by reserved players")] public bool LogRest = false;
/// <summary>
/// Reads a configuration file from a given path
/// </summary>