themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge remote branch 'origin' into general-devel

Browse source
This commit is contained in:
k0rd 2013-10-04 17:16:47 -04:00
commit 1b3f105bbf
2 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/ConfigFile.cs
View file

@ -137,8 +137,6 @@ namespace TShockAPI
[Description("This will turn on token requirement for the public REST API endpoints.")] public bool
EnableTokenEndpointAuthentication;
[Description("Deprecated. Use ServerName instead.")] public string ServerNickname = "TShock Server";
[Description("Enable/disable the rest api.")] public bool RestApiEnabled;
[Description("This is the port which the rest api will listen on.")] public int RestApiPort = 7878;

2
TShockAPI/TShock.cs
View file

@ -1671,8 +1671,6 @@ namespace TShockAPI
RconHandler.ListenPort = file.RconPort;
Utils.HashAlgo = file.HashAlgorithm;
file.ServerName = file.ServerNickname;
}
}
}