diff --git a/CSM/beta/VersionFeed.xml b/CSM/beta/VersionFeed.xml index f774b2d8..99fac226 100644 --- a/CSM/beta/VersionFeed.xml +++ b/CSM/beta/VersionFeed.xml @@ -5,21 +5,21 @@ Conan Server Manager Version Feed This is the Conan Server Manager beta version feed. - 2020-05-28T00:00:00Z + 2020-06-03T00:00:00Z - urn:uuid:84F25550-B942-4C86-9822-F71265A1EC8F - 1.1.35 (1.1.35.1) - 1.1.35.1 + urn:uuid:855F4319-6E7D-4DB7-A7C8-AD6DC2A4C074 + 1.1.36 (1.1.36.1) + 1.1.36.1 - 2020-05-28T00:00:00Z + 2020-06-03T00:00:00Z

CHANGE

    -
  • Added additional logging when the server is being started.
  • +
  • Globalisation - added some additional strings to the globalisation files.

diff --git a/CSM/beta/en-US.xaml b/CSM/beta/en-US.xaml index 16752329..9bb02fe9 100644 --- a/CSM/beta/en-US.xaml +++ b/CSM/beta/en-US.xaml @@ -17,6 +17,14 @@ Unknown + + Live + + + + The Exiled Lands + + Low Below Normal @@ -998,6 +1006,7 @@ The name of the branch to download (leave blank to use the release branch). Branch Password: The password that is used to access the branch download. + Clear Branch Error Command Line Priority: @@ -1039,6 +1048,8 @@ Server File Details NOTE: Any changes will require a server restart to take effect. + Load Error + Save Error Blacklisted Add Blacklisted Player @@ -1065,12 +1076,37 @@ Checking Scheduled Tasks... - - Live + + The server port is outside the valid range ({PortMinimum}-{PortMaximum}). + The server peer port is outside the valid range ({PortMinimum}-{PortMaximum}). + The query port is outside the valid range ({PortMinimum}-{PortMaximum}). + The rcon port is outside the valid range ({PortMinimum}-{PortMaximum}). + + The map name has not been entered. + + Server files have not been downloaded, server folder does not exist. + Server files have not been downloaded properly, server executable file ({ServerExe}) does not exist. + The server files are for a different application. + + Mod {modId} has not been downloaded, mod file does not exist. + Mod {modId} is for a different application. + Mod {modId} is outdated. + Mod {modId} details could not be retrieved from steam. - - The Exiled Lands + + Saving... + Saving Profile File... + Saving Config Files... + Saving Launcher File... + Checking Directory Permissions... + Checking Scheduled Tasks... + + + + Backup file could not be found or does not exist. + The server save folder could not be found or does not exist.\r\n{saveFolder} + The backup does not contain the world save file. \ No newline at end of file diff --git a/CSM/beta/latest.txt b/CSM/beta/latest.txt index 9cd18aa3..80242d26 100644 --- a/CSM/beta/latest.txt +++ b/CSM/beta/latest.txt @@ -1 +1 @@ -1.1.35.1 +1.1.36.1 diff --git a/CSM/beta/latest.zip b/CSM/beta/latest.zip index ca8cb176..43d37b57 100644 Binary files a/CSM/beta/latest.zip and b/CSM/beta/latest.zip differ