diff --git a/ASM/ArkServerManager_1.1.413.exe b/ASM/ArkServerManager_1.1.413.exe new file mode 100644 index 00000000..1a1028be Binary files /dev/null and b/ASM/ArkServerManager_1.1.413.exe differ diff --git a/ASM/ArkServerManager_1.1.413.zip b/ASM/ArkServerManager_1.1.413.zip new file mode 100644 index 00000000..cc332221 Binary files /dev/null and b/ASM/ArkServerManager_1.1.413.zip differ diff --git a/ASM/VersionFeed.xml b/ASM/VersionFeed.xml index 36923baa..246b09f1 100644 --- a/ASM/VersionFeed.xml +++ b/ASM/VersionFeed.xml @@ -5,7 +5,55 @@ Ark Server Manager Version Feed This is the Ark Server Manager release version feed. - 2021-12-15T00:00:00Z + 2021-12-20T00:00:00Z + + + urn:uuid:3E33DCB2-ECFE-4489-B1A4-56F5D386F9DC + 1.1.413 (1.1.413.17) + 1.1.413.17 + + 2021-12-20T00:00:00Z + +
+

+ BUGFIX +
+

    +
  • Fixed the cleanup of the log files generated by the auto processes (Backup, Update and Shutdown/Restart).
    NOTE: It will not cleanup the existing files, you need to do that manually.
    • +
+ NEW +
+
    +
  • Main Window - Added Discord Bot Status and a button to Stop/Start the discord bot.
    • +
  • Global Settings - Discord Bot section - Added a log level droplist.
    • +
  • Global Settings - Discord Bot section - Added a checkbox to allow all bots.
    • +
  • Global Settings - Discord Bot section - Added a whitelist to allow bots to send commands to the server manager.
    • +
  • Global Settings - Added new Log settings which allow you to turn if on/off and set the number of days/files to retain.
    • +
  • Server Settings - Discord Bot section - Added an alias that can be used with the discord command instead of the profile id.
    • +
+ CHANGE +
+
    +
  • Discord Bot - all commands are now case INsensitive, along with the profile id and the alias.
    • +
  • Discord Bot - removed the mandatory requirement to enter the '!' after the discord prefix. The '!' has been added to the existing prefix so no change to existing functionality, but you can now change it.
    • +
  • Server Settings - Discord Bot section - Add a reset to default button.
    • +
  • Profile Sync - Added Discord Bot section to the list.
    • +
  • Auto-Update process - have reworked parts of the process and the logging.
    • +
  • Manual-Update process - have reworked parts of the logging.
    • +
  • Out of Date Mod Check - Added Valid mod check, so will not include mod that are invalid.
    • +
  • Made changes to the code to help improve performance.
    • +
  • pt-BR Translation file updated.
    • +
  • ru-RU Translation file updated.
    • +
  • zh-CN Translation file updated.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + urn:uuid:18276A38-2C71-4BB8-9A83-96D5EBFE9C87 diff --git a/ASM/beta/VersionFeed.xml b/ASM/beta/VersionFeed.xml index e297873f..f9356c3f 100644 --- a/ASM/beta/VersionFeed.xml +++ b/ASM/beta/VersionFeed.xml @@ -7,6 +7,29 @@ 2021-12-20T00:00:00Z + + urn:uuid:B08AA2A8-9E9C-4CD2-8992-6848AA5F0757 + 1.1.413 (1.1.413.17) + 1.1.413.17 + + 2021-12-20T00:00:00Z + +
+

+ CHANGE +
+

    +
  • Added better status detection for stopping servers.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + + urn:uuid:D8C3D087-64DB-4FB8-829F-7FA665F77309 1.1.413 (1.1.413.16) diff --git a/ASM/beta/latest.txt b/ASM/beta/latest.txt index b8cd6724..09406e9f 100644 --- a/ASM/beta/latest.txt +++ b/ASM/beta/latest.txt @@ -1 +1 @@ -1.1.413.16 +1.1.413.17 diff --git a/ASM/beta/latest.zip b/ASM/beta/latest.zip index 4e736423..8e678245 100644 Binary files a/ASM/beta/latest.zip and b/ASM/beta/latest.zip differ diff --git a/ASM/en-US.xaml b/ASM/en-US.xaml index f6281726..eacac073 100644 --- a/ASM/en-US.xaml +++ b/ASM/en-US.xaml @@ -83,12 +83,21 @@ All - + Normal Minimized Maximized + + Critical + Error + Warning + Info + Verbose + Debug + + Run as Administrator This application requires administration priviledges to access ALL functionality. Would you like to Run as Administrator? @@ -558,6 +567,7 @@ Backup Interval: How often to perform the server backup, in hours and minutes (hh:mm). Set to 00:00 to disable. Delete Old Backup Files + If enabled, when the auto-backup runs the old backup files will be deleted. Older Than: How old the backup file must be to be deleted in days. WorldSave Message: @@ -622,8 +632,17 @@ The id of the discord server the bot will listen to. Prefix: The prefix that must be used when sending a command via discord. + Log Level: Get Token... Help... + Allow All Bots + If enabled, the server manager bot will respond to all other bots, otherwise they will be ignored unless they are in the whitelist. + Bot Whitelist + Bot ID + The id of the bot to whitelist. + Add Whitelist + Clear Whitelists + Delete Whitelist If enabled, the backup command can be sent from discord. If enabled, the restart command can be sent from discord. If enabled, the shutdown command can be sent from discord. @@ -673,6 +692,12 @@ If enabled, after the server has been updated from the cache, it will perform a server verification using steamcmd. Update Directory Permissions on Save If enabled, when a save is performed, all folders under the server directory will be have the permissions check and if necessary fixed. WARNING: Disabling could prevent your server from running properly. + Enable Logging + If enabled, all logging will be enabled. + Delete Logs After + How old the log files must be to be deleted in days. + Max Number of Logs + The maximum number of log files that will be kept. Confirm Settings Reset Action Click 'Yes' to confirm you want to perform the settings reset. @@ -774,12 +799,18 @@ Enable Enable the auto-update scheduled task Next Run Time: + Discord Bot: + Start + Start the discord bot + Stop + Stop the discord bot Unknown Disabled Queued Ready Running + Stopped Profile failed to load The profile at {0} failed to load. The error was: {1}\r\n{2} @@ -824,6 +855,7 @@ hours days dinos + files items xp players @@ -1208,6 +1240,8 @@ Discord Bot Details Channel Id: The id of the discord server channel this profile will listen to. + Alias: + A unique name to identify your server when using the discord commands, can be used instead of the profile id. Allow Backup If enabled, the profile will listen for backup commands from discord. Allow Restart @@ -1870,7 +1904,7 @@ If enabled, will remove the prerequisites needed to unlock the engram. Auto Unlock If enabled, the engram will be automatically unlocked at the specified level. - Unlock Level + Auto Unlock Level Player level when the engram is automatically unlocked. Auto Unlock must be enabled. Remove this Engram @@ -5589,7 +5623,8 @@ Discord Bot Error - The discord bot requires a valid token so it can log into the discord server\r\nThis can be set in the global settings. + The discord bot requires a valid token so it can log into the discord server.\r\nThis can be set in the global settings. + The discord bot requires a valid prefix.\r\nThis can be set in the global settings. The discord bot prefix contains invalid characters. Only letters and numbers are allowed. Command '{0}' has not been enabled. @@ -5598,8 +5633,9 @@ Another command '{0}' is currently running against profile '{1}'. Command '{0}' has been disabled for profile '{1}'. - The '{0}' command requires a profile id. + The '{0}' command requires a profile id or alias. Profile '{0}' was not found or is not associated with the channel. + Multiple profiles with '{0}' were found in the channel, command aborted. Profile '{0}' is in a state '{1}' that cannot run this command. Profile '{0}' is currently being updated. diff --git a/ASM/latest.exe b/ASM/latest.exe index 3b854b72..1a1028be 100644 Binary files a/ASM/latest.exe and b/ASM/latest.exe differ diff --git a/ASM/latest.txt b/ASM/latest.txt index a03f4f61..3587d37d 100644 --- a/ASM/latest.txt +++ b/ASM/latest.txt @@ -1 +1 @@ -1.1.412 +1.1.413 diff --git a/ASM/latest.zip b/ASM/latest.zip index 350e1255..cc332221 100644 Binary files a/ASM/latest.zip and b/ASM/latest.zip differ diff --git a/CSM/ConanServerManager_1.1.58.exe b/CSM/ConanServerManager_1.1.58.exe new file mode 100644 index 00000000..65b95a72 Binary files /dev/null and b/CSM/ConanServerManager_1.1.58.exe differ diff --git a/CSM/ConanServerManager_1.1.58.zip b/CSM/ConanServerManager_1.1.58.zip new file mode 100644 index 00000000..8855371c Binary files /dev/null and b/CSM/ConanServerManager_1.1.58.zip differ diff --git a/CSM/VersionFeed.xml b/CSM/VersionFeed.xml index 9d75ce81..36694b99 100644 --- a/CSM/VersionFeed.xml +++ b/CSM/VersionFeed.xml @@ -5,7 +5,52 @@ Conan Server Manager Version Feed This is the Conan Server Manager release version feed. - 2021-12-15T00:00:00Z + 2021-12-20T00:00:00Z + + + urn:uuid:19B09A66-43F2-4D5F-AF33-5C77D7EA9A6B + 1.1.58 (1.1.58.17) + 1.1.58.17 + + 2021-12-20T00:00:00Z + +
+

+ BUGFIX +
+

    +
  • Fixed the cleanup of the log files generated by the auto processes (Backup, Update and Shutdown/Restart).
    NOTE: It will not cleanup the existing files, you need to do that manually.
    • +
+ NEW +
+
    +
  • Main Window - Added Discord Bot Status and a button to Stop/Start the discord bot.
    • +
  • Global Settings - Discord Bot section - Added a log level droplist.
    • +
  • Global Settings - Discord Bot section - Added a checkbox to allow all bots.
    • +
  • Global Settings - Discord Bot section - Added a whitelist to allow bots to send commands to the server manager.
    • +
  • Global Settings - Added new Log settings which allow you to turn if on/off and set the number of days/files to retain.
    • +
  • Server Settings - Discord Bot section - Added an alias that can be used with the discord command instead of the profile id.
    • +
+ CHANGE +
+
    +
  • Discord Bot - all commands are now case INsensitive, along with the profile id and the alias.
    • +
  • Discord Bot - removed the mandatory requirement to enter the '!' after the discord prefix. The '!' has been added to the existing prefix so no change to existing functionality, but you can now change it.
    • +
  • Server Settings - Discord Bot section - Add a reset to default button.
    • +
  • Profile Sync - Added Discord Bot section to the list.
    • +
  • Auto-Update process - have reworked parts of the process and the logging.
    • +
  • Manual-Update process - have reworked parts of the logging.
    • +
  • Out of Date Mod Check - Added Valid mod check, so will not include mod that are invalid.
    • +
  • Made changes to the code to help improve performance.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + urn:uuid:6383E79A-C31F-462B-9730-B26B28DC5EFF diff --git a/CSM/beta/VersionFeed.xml b/CSM/beta/VersionFeed.xml index 80cd2757..6602d667 100644 --- a/CSM/beta/VersionFeed.xml +++ b/CSM/beta/VersionFeed.xml @@ -7,6 +7,29 @@ 2021-12-20T00:00:00Z + + urn:uuid:25F39F6F-E7FE-417D-9BC9-EC6EF7DEC1BC + 1.1.58 (1.1.58.17) + 1.1.58.17 + + 2021-12-20T00:00:00Z + +
+

+ CHANGE +
+

    +
  • Added better status detection for stopping servers.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + + urn:uuid:0C184A8F-803D-4AC6-B9CB-599810F9AD29 1.1.58 (1.1.58.16) diff --git a/CSM/beta/latest.txt b/CSM/beta/latest.txt index 11251017..9daddfbe 100644 --- a/CSM/beta/latest.txt +++ b/CSM/beta/latest.txt @@ -1 +1 @@ -1.1.58.16 +1.1.58.17 diff --git a/CSM/beta/latest.zip b/CSM/beta/latest.zip index 816f0d3a..e64d3985 100644 Binary files a/CSM/beta/latest.zip and b/CSM/beta/latest.zip differ diff --git a/CSM/en-US.xaml b/CSM/en-US.xaml index 50e599fb..2436f054 100644 --- a/CSM/en-US.xaml +++ b/CSM/en-US.xaml @@ -57,12 +57,21 @@ All - + Normal Minimized Maximized + + Critical + Error + Warning + Info + Verbose + Debug + + x % @@ -70,6 +79,7 @@ minutes hours days + files items xp players @@ -606,12 +616,18 @@ Enable Enable the auto-update scheduled task Next Run Time: + Discord Bot: + Start + Start the discord bot + Stop + Stop the discord bot Unknown Disabled Queued Ready Running + Stopped Profile failed to load The profile at {0} failed to load. The error was: {1}\r\n{2} @@ -712,6 +728,7 @@ Backup Interval: How often to perform the server backup, in hours and minutes (hh:mm). Set to 00:00 to disable. Delete Old Backup Files + If enabled, when the auto-backup runs the old backup files will be deleted. Older Than: How old the backup file must be to be deleted in days. WorldSave Message: @@ -720,6 +737,12 @@ If enabled, after the server has been updated from the cache, it will perform a server verification using steamcmd. Update Directory Permissions on Save If enabled, when a save is performed, all folders under the server directory will be have the permissions check and if necessary fixed. WARNING: Disabling could prevent your server from running properly. + Enable Logging + If enabled, all logging will be enabled. + Delete Logs After + How old the log files must be to be deleted in days. + Max Number of Logs + The maximum number of log files that will be kept. Enable Auto Update Game Server @@ -780,8 +803,17 @@ The id of the discord server the bot will listen to. Prefix: The prefix that must be used when sending a command via discord. + Log Level: Get Token... Help... + Allow All Bots + If enabled, the server manager bot will respond to all other bots, otherwise they will be ignored unless they are in the whitelist. + Bot Whitelist + Bot ID + The id of the bot to whitelist. + Add Whitelist + Clear Whitelists + Delete Whitelist If enabled, the backup command can be sent from discord. If enabled, the restart command can be sent from discord. If enabled, the shutdown command can be sent from discord. @@ -1148,6 +1180,8 @@ Discord Bot Details Channel Id: The id of the discord server channel this profile will listen to. + Alias: + A unique name to identify your server when using the discord commands, can be used instead of the profile id. Allow Backup If enabled, the profile will listen for backup commands from discord. Allow Restart @@ -1237,6 +1271,7 @@ Discord Bot Error The discord bot requires a valid token so it can log into the discord server\r\nThis can be set in the global settings. + The discord bot requires a valid prefix.\r\nThis can be set in the global settings. The discord bot prefix contains invalid characters. Only letters and numbers are allowed. Command '{0}' has not been enabled. @@ -1245,8 +1280,9 @@ Another command '{0}' is currently running against profile '{1}'. Command '{0}' has been disabled for profile '{1}'. - The '{0}' command requires a profile id. + The '{0}' command requires a profile id or alias. Profile '{0}' was not found or is not associated with the channel. + Multiple profiles with '{0}' were found in the channel, command aborted. Profile '{0}' is in a state '{1}' that cannot run this command. Profile '{0}' is currently being updated. diff --git a/CSM/latest.exe b/CSM/latest.exe index ff86db29..65b95a72 100644 Binary files a/CSM/latest.exe and b/CSM/latest.exe differ diff --git a/CSM/latest.txt b/CSM/latest.txt index 5df20b4e..832be217 100644 --- a/CSM/latest.txt +++ b/CSM/latest.txt @@ -1 +1 @@ -1.1.57 +1.1.58 diff --git a/CSM/latest.zip b/CSM/latest.zip index c039f9a4..8855371c 100644 Binary files a/CSM/latest.zip and b/CSM/latest.zip differ diff --git a/Plugins/Discord/ServerManager.Plugin.Discord_1.0.20.zip b/Plugins/Discord/ServerManager.Plugin.Discord_1.0.20.zip new file mode 100644 index 00000000..c249f217 Binary files /dev/null and b/Plugins/Discord/ServerManager.Plugin.Discord_1.0.20.zip differ diff --git a/Plugins/Discord/VersionFeed.xml b/Plugins/Discord/VersionFeed.xml index 52a870db..52867f19 100644 --- a/Plugins/Discord/VersionFeed.xml +++ b/Plugins/Discord/VersionFeed.xml @@ -5,7 +5,30 @@ Discord Plugin Version Feed This is the Discord Plugin release version feed. - 2021-12-12T00:00:00Z + 2021-12-20T00:00:00Z + + + urn:uuid:F8987FDF-7A69-4E03-99D8-E04ADFFFF0BB + 1.0.20 (1.0.20.1) + 1.0.20.1 + + 2021-12-20T00:00:00Z + +
+

+ CHANGE +
+

    +
  • Additional changes to config loading to prevent blanking the config file.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + urn:uuid:A9EC2F32-E026-485F-BD7B-C657DBA95B54 diff --git a/Plugins/Discord/latest.txt b/Plugins/Discord/latest.txt index ecba93a4..e4b14eaf 100644 --- a/Plugins/Discord/latest.txt +++ b/Plugins/Discord/latest.txt @@ -1 +1 @@ -1.0.19 +1.0.20 diff --git a/Plugins/Discord/latest.zip b/Plugins/Discord/latest.zip index f8f09d75..c249f217 100644 Binary files a/Plugins/Discord/latest.zip and b/Plugins/Discord/latest.zip differ