diff --git a/src/ARKServerManager/GameData/SurvivalEvolved.gamedata b/src/ARKServerManager/GameData/SurvivalEvolved.gamedata index 3c7e8e42..ef534c1e 100644 --- a/src/ARKServerManager/GameData/SurvivalEvolved.gamedata +++ b/src/ARKServerManager/GameData/SurvivalEvolved.gamedata @@ -12844,232 +12844,232 @@ "EngramPoints": 80 }, { - "XPRequired": 10073538, + "XPRequired": 10073540, "EngramPoints": 80 }, { - "XPRequired": 10473538, + "XPRequired": 10473540, "EngramPoints": 80 }, { - "XPRequired": 10873538, + "XPRequired": 10873540, "EngramPoints": 80 }, { - "XPRequired": 11273538, + "XPRequired": 11273540, "EngramPoints": 80 }, { - "XPRequired": 11673538, + "XPRequired": 11673540, "EngramPoints": 80 }, { - "XPRequired": 12073538, + "XPRequired": 12073540, "EngramPoints": 80 }, { - "XPRequired": 12473538, + "XPRequired": 12473540, "EngramPoints": 80 }, { - "XPRequired": 13373538, + "XPRequired": 13373540, "EngramPoints": 80 }, { - "XPRequired": 23373538, + "XPRequired": 23373540, "EngramPoints": 80 }, { - "XPRequired": 33373538, + "XPRequired": 33373540, "EngramPoints": 80 }, { - "XPRequired": 43373536, - "EngramPoints": 1 + "XPRequired": 43373540, + "EngramPoints": 0 }, { - "XPRequired": 53373536, - "EngramPoints": 1 + "XPRequired": 53373540, + "EngramPoints": 0 }, { - "XPRequired": 64048244, - "EngramPoints": 1 + "XPRequired": 64048240, + "EngramPoints": 0 }, { - "XPRequired": 74722952, - "EngramPoints": 1 + "XPRequired": 74722950, + "EngramPoints": 0 }, { - "XPRequired": 85397656, - "EngramPoints": 1 + "XPRequired": 85397660, + "EngramPoints": 0 }, { "XPRequired": 96072360, - "EngramPoints": 1 + "EngramPoints": 0 }, { - "XPRequired": 106747072, - "EngramPoints": 1 + "XPRequired": 106747100, + "EngramPoints": 0 }, { - "XPRequired": 117747072, - "EngramPoints": 1 + "XPRequired": 117747100, + "EngramPoints": 0 }, { - "XPRequired": 129747072, - "EngramPoints": 1 + "XPRequired": 129747100, + "EngramPoints": 0 }, { - "XPRequired": 142747072, - "EngramPoints": 1 + "XPRequired": 142747100, + "EngramPoints": 0 }, { - "XPRequired": 156747072, - "EngramPoints": 1 + "XPRequired": 156747100, + "EngramPoints": 0 }, { - "XPRequired": 171747072, - "EngramPoints": 1 + "XPRequired": 171747100, + "EngramPoints": 0 }, { - "XPRequired": 187747072, - "EngramPoints": 1 + "XPRequired": 187747100, + "EngramPoints": 0 }, { - "XPRequired": 204747072, - "EngramPoints": 1 + "XPRequired": 204747100, + "EngramPoints": 0 }, { - "XPRequired": 222747072, - "EngramPoints": 1 + "XPRequired": 222747100, + "EngramPoints": 0 }, { - "XPRequired": 241747072, - "EngramPoints": 1 + "XPRequired": 241747100, + "EngramPoints": 0 }, { - "XPRequired": 261747072, - "EngramPoints": 1 + "XPRequired": 261747100, + "EngramPoints": 0 }, { - "XPRequired": 282747072, - "EngramPoints": 1 + "XPRequired": 282747100, + "EngramPoints": 0 }, { - "XPRequired": 282747104, - "EngramPoints": 1 + "XPRequired": 282747100, + "EngramPoints": 0 }, { - "XPRequired": 305747104, - "EngramPoints": 1 + "XPRequired": 305747100, + "EngramPoints": 0 }, { - "XPRequired": 329747104, - "EngramPoints": 1 + "XPRequired": 329747100, + "EngramPoints": 0 }, { - "XPRequired": 354747104, - "EngramPoints": 1 + "XPRequired": 354747100, + "EngramPoints": 0 }, { "XPRequired": 380747100, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 407747100, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 435747100, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 464747100, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 494747100, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 525747100, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 557747100, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 590747100, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 624747100, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 659747100, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 695747100, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 732747100, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 770747100, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 809747100, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 849747100, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 892234400, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 934721900, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 977209200, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 1019697000, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 1104671000, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 1189646000, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 1274621000, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 1359595000, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 1444570000, - "EngramPoints": 1 + "EngramPoints": 0 }, { "XPRequired": 1529545000, - "EngramPoints": 1 + "EngramPoints": 0 } ], "PlayerAdditionalLevels": "75", @@ -13318,22 +13318,22 @@ "XPRequired": 9739986 }, { - "XPRequired": 10957484 + "XPRequired": 10957480 }, { "XPRequired": 12327170 }, { - "XPRequired": 13868066 + "XPRequired": 13868070 }, { - "XPRequired": 15601574 + "XPRequired": 15601570 }, { "XPRequired": 17551770 }, { - "XPRequired": 19745742 + "XPRequired": 19745740 }, { "XPRequired": 22213960 diff --git a/src/ARKServerManager/Globalization/de-DE/de-DE.xaml b/src/ARKServerManager/Globalization/de-DE/de-DE.xaml index a220e996..f5f9fad6 100644 --- a/src/ARKServerManager/Globalization/de-DE/de-DE.xaml +++ b/src/ARKServerManager/Globalization/de-DE/de-DE.xaml @@ -5626,7 +5626,6 @@ Der Befehl '{0}' erfordert eine Profil-ID oder einen Alias. Profil '{0}' wurde nicht gefunden oder ist nicht mit dem Kanal verbunden. - Es wurden mehrere Profile mit '{0}' im Kanal gefunden, der Befehl wurde abgebrochen. Das Profil '{0}' befindet sich in einem Zustand '{1}', in dem dieser Befehl nicht ausgeführt werden kann. Das Profil '{0}' wird gerade aktualisiert. diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml index 64797b7b..7cd93176 100644 --- a/src/ARKServerManager/Globalization/en-US/en-US.xaml +++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml @@ -1238,6 +1238,8 @@ 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 Cluster Alias + If enabled, the cluster id can be used as a discord alias to perform server commands. Allow Backup If enabled, the profile will listen for backup commands from discord. Allow Restart @@ -5646,8 +5648,7 @@ Command '{0}' has been disabled for profile '{1}'. 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/Alias '{0}' was not found or is not associated with the channel. Profile '{0}' is in a state '{1}' that cannot run this command. Profile '{0}' is currently being updated. No profiles are associated with the channel. diff --git a/src/ARKServerManager/Globalization/fr-FR/fr-FR.xaml b/src/ARKServerManager/Globalization/fr-FR/fr-FR.xaml index 8b622008..f03ee021 100644 --- a/src/ARKServerManager/Globalization/fr-FR/fr-FR.xaml +++ b/src/ARKServerManager/Globalization/fr-FR/fr-FR.xaml @@ -5645,7 +5645,6 @@ The '{0}' commande nécessite un ID du profil. Profile '{0}' n'a pas été trouvé ou n'est pas associé au canal. - Plusieurs profils avec '{0}' ont été trouvés dans le canal, commande avorté. Profile '{0}' est dans un état '{1}' qui ne peut pas exécuter cette commande. Profile '{0}' est actuellement mis à jour. diff --git a/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml b/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml index bd43b534..d5dea13c 100644 --- a/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml +++ b/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml @@ -639,6 +639,8 @@ Nível de registro: Obter Token... Ajuda... + Alias de todos os perfis: + Ao ser usado enviar um comando via discord para todos os perfis associados a um canal de discord. Não inclua espaços ou caracteres especiais. Para desabilitar o alias de Todos os Perfis, limpe o valor. Permitir todos os bots Se ativado, o bot do gerenciador do servidor responderá a todos os outros bots, caso contrário, eles serão ignorados, a menos que estejam na lista de permissões. Bot Whitelist @@ -5649,9 +5651,9 @@ O comando '{0}' requer um id de perfil. O perfil '{0}' não foi encontrado ou não está associado ao canal. - Vários perfis com '{0}' foram encontrados no canal, comando abortado. O perfil '{0}' está em um estado '{1}' que não pode executar este comando. O perfil '{0}' está sendo atualizado. + Nenhum perfil está associado ao canal. A chamada para o servidor '{0}' falhou. Uma solicitação de backup para o servidor '{0}' foi enviada. diff --git a/src/ARKServerManager/Globalization/ru-RU/ru-RU.xaml b/src/ARKServerManager/Globalization/ru-RU/ru-RU.xaml index 5165bfc0..7570f908 100644 --- a/src/ARKServerManager/Globalization/ru-RU/ru-RU.xaml +++ b/src/ARKServerManager/Globalization/ru-RU/ru-RU.xaml @@ -5724,7 +5724,6 @@ Для команды '{0}' требуется идентификатор профиля. Профиль '{0}' не найден или не связан с каналом. - В канале было обнаружено несколько профилей с "{0}", команда прервана. Профиль '{0}' находится в состоянии '{1}', и эта команда не может быть запущена. Профиль '{0}' в настоящее время обновляется. diff --git a/src/ARKServerManager/Globalization/zh-CN/zh-CN.xaml b/src/ARKServerManager/Globalization/zh-CN/zh-CN.xaml index 68cfc11f..746880cc 100644 --- a/src/ARKServerManager/Globalization/zh-CN/zh-CN.xaml +++ b/src/ARKServerManager/Globalization/zh-CN/zh-CN.xaml @@ -6987,7 +6987,6 @@ 这个 '{0}' 命令需要配置文件ID或别名。 简介 '{0}'找不到或与通道不关联. - 具有多个配置文件 '{0}' 在通道中找到，命令中止. 简介 '{0}'他处于一种状态'{1}' 无法运行此命令的. 简介 '{0}' 目前正在更新. diff --git a/src/ARKServerManager/Lib/ServerProfile.cs b/src/ARKServerManager/Lib/ServerProfile.cs index a801308b..b4caab4e 100644 --- a/src/ARKServerManager/Lib/ServerProfile.cs +++ b/src/ARKServerManager/Lib/ServerProfile.cs @@ -960,6 +960,14 @@ namespace ServerManagerTool.Lib set { SetValue(DiscordAliasProperty, value); } } + public static readonly DependencyProperty AllowDiscordClusterAliasProperty = DependencyProperty.Register(nameof(AllowDiscordClusterAlias), typeof(bool), typeof(ServerProfile), new PropertyMetadata(true)); + [DataMember] + public bool AllowDiscordClusterAlias + { + get { return (bool)GetValue(AllowDiscordClusterAliasProperty); } + set { SetValue(AllowDiscordClusterAliasProperty, value); } + } + public static readonly DependencyProperty AllowDiscordBackupProperty = DependencyProperty.Register(nameof(AllowDiscordBackup), typeof(bool), typeof(ServerProfile), new PropertyMetadata(true)); [DataMember] public bool AllowDiscordBackup diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml index 21fa04ac..ab0c303c 100644 --- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml +++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml @@ -1537,10 +1537,11 @@ + - - - + + + diff --git a/src/ARKServerManager/Utils/DiscordBotHelper.cs b/src/ARKServerManager/Utils/DiscordBotHelper.cs index bf1b691a..1de7d20c 100644 --- a/src/ARKServerManager/Utils/DiscordBotHelper.cs +++ b/src/ARKServerManager/Utils/DiscordBotHelper.cs @@ -111,6 +111,7 @@ namespace ServerManagerTool.Utils string.Equals(profileIdOrAlias, s.Profile.ProfileID, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(s.Profile.DiscordAlias) && string.Equals(profileIdOrAlias, s.Profile.DiscordAlias, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(Config.Default.DiscordBotAllServersKeyword) && string.Equals(profileIdOrAlias, Config.Default.DiscordBotAllServersKeyword, StringComparison.OrdinalIgnoreCase) + || s.Profile.AllowDiscordClusterAlias && string.Equals(profileIdOrAlias, s.Profile.CrossArkClusterId, StringComparison.OrdinalIgnoreCase) ) ); @@ -178,6 +179,8 @@ namespace ServerManagerTool.Utils { responseList.Add(string.Format(_globalizer.GetResourceString("DiscordBot_InfoFailed"), profile.ServerName)); } + + _currentProfileCommands.Remove(profile.ProfileId); } return responseList; @@ -231,6 +234,7 @@ namespace ServerManagerTool.Utils string.Equals(profileIdOrAlias, s.Profile.ProfileID, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(s.Profile.DiscordAlias) && string.Equals(profileIdOrAlias, s.Profile.DiscordAlias, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(Config.Default.DiscordBotAllServersKeyword) && string.Equals(profileIdOrAlias, Config.Default.DiscordBotAllServersKeyword, StringComparison.OrdinalIgnoreCase) + || s.Profile.AllowDiscordClusterAlias && string.Equals(profileIdOrAlias, s.Profile.CrossArkClusterId, StringComparison.OrdinalIgnoreCase) ) ); @@ -282,6 +286,7 @@ namespace ServerManagerTool.Utils string.Equals(profileIdOrAlias, s.Profile.ProfileID, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(s.Profile.DiscordAlias) && string.Equals(profileIdOrAlias, s.Profile.DiscordAlias, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(Config.Default.DiscordBotAllServersKeyword) && string.Equals(profileIdOrAlias, Config.Default.DiscordBotAllServersKeyword, StringComparison.OrdinalIgnoreCase) + || s.Profile.AllowDiscordClusterAlias && string.Equals(profileIdOrAlias, s.Profile.CrossArkClusterId, StringComparison.OrdinalIgnoreCase) ) ); @@ -382,6 +387,7 @@ namespace ServerManagerTool.Utils string.Equals(profileIdOrAlias, s.Profile.ProfileID, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(s.Profile.DiscordAlias) && string.Equals(profileIdOrAlias, s.Profile.DiscordAlias, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(Config.Default.DiscordBotAllServersKeyword) && string.Equals(profileIdOrAlias, Config.Default.DiscordBotAllServersKeyword, StringComparison.OrdinalIgnoreCase) + || s.Profile.AllowDiscordClusterAlias && string.Equals(profileIdOrAlias, s.Profile.CrossArkClusterId, StringComparison.OrdinalIgnoreCase) ) ); @@ -487,6 +493,7 @@ namespace ServerManagerTool.Utils string.Equals(profileIdOrAlias, s.Profile.ProfileID, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(s.Profile.DiscordAlias) && string.Equals(profileIdOrAlias, s.Profile.DiscordAlias, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(Config.Default.DiscordBotAllServersKeyword) && string.Equals(profileIdOrAlias, Config.Default.DiscordBotAllServersKeyword, StringComparison.OrdinalIgnoreCase) + || s.Profile.AllowDiscordClusterAlias && string.Equals(profileIdOrAlias, s.Profile.CrossArkClusterId, StringComparison.OrdinalIgnoreCase) ) ); @@ -591,6 +598,7 @@ namespace ServerManagerTool.Utils string.Equals(profileIdOrAlias, s.Profile.ProfileID, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(s.Profile.DiscordAlias) && string.Equals(profileIdOrAlias, s.Profile.DiscordAlias, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(Config.Default.DiscordBotAllServersKeyword) && string.Equals(profileIdOrAlias, Config.Default.DiscordBotAllServersKeyword, StringComparison.OrdinalIgnoreCase) + || s.Profile.AllowDiscordClusterAlias && string.Equals(profileIdOrAlias, s.Profile.CrossArkClusterId, StringComparison.OrdinalIgnoreCase) ) ); @@ -696,6 +704,7 @@ namespace ServerManagerTool.Utils string.Equals(profileIdOrAlias, s.Profile.ProfileID, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(s.Profile.DiscordAlias) && string.Equals(profileIdOrAlias, s.Profile.DiscordAlias, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(Config.Default.DiscordBotAllServersKeyword) && string.Equals(profileIdOrAlias, Config.Default.DiscordBotAllServersKeyword, StringComparison.OrdinalIgnoreCase) + || s.Profile.AllowDiscordClusterAlias && string.Equals(profileIdOrAlias, s.Profile.CrossArkClusterId, StringComparison.OrdinalIgnoreCase) ) ); @@ -802,6 +811,7 @@ namespace ServerManagerTool.Utils string.Equals(profileIdOrAlias, s.Profile.ProfileID, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(s.Profile.DiscordAlias) && string.Equals(profileIdOrAlias, s.Profile.DiscordAlias, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(Config.Default.DiscordBotAllServersKeyword) && string.Equals(profileIdOrAlias, Config.Default.DiscordBotAllServersKeyword, StringComparison.OrdinalIgnoreCase) + || s.Profile.AllowDiscordClusterAlias && string.Equals(profileIdOrAlias, s.Profile.CrossArkClusterId, StringComparison.OrdinalIgnoreCase) ) ); diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index 6a600e9c..890820a0 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -5,7 +5,37 @@ Ark Server Manager Version Feed This is the Ark Server Manager release version feed. - 2022-04-16T00:00:00Z + 2022-04-23T00:00:00Z + + + urn:uuid:8AD6F2C4-D9BD-41D5-BE91-DA23F31A2FA4 + 1.1.423 (1.1.423.1) + 1.1.423.1 + + 2022-04-23T00:00:00Z + +
+

+ BUGFIX +
+

    +
  • Fixed the discord bot Info command, to release the profile once the command has finished running.
    • +
+ CHANGE +
+
    +
  • Profile Discord Settings - added new checkbox to allow the profile to be included in discord commands using the Cluster Id as the alias.
    • +
  • Realigned the default Player and Creature levels to the wiki.
    • +
  • pt-BR Translation file updated.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + urn:uuid:95C9671F-4AEC-4433-AD68-CF91854FEC1B diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index 02b66242..143ce664 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -5,68 +5,28 @@ Ark Server Manager Version Feed This is the Ark Server Manager beta version feed. - 2022-04-16T00:00:00Z + 2022-04-23T00:00:00Z - urn:uuid:B5B32577-54E7-49D3-9EDF-D623F54A47D9 - 1.1.422 (1.1.422.3) - 1.1.422.3 + urn:uuid:8AD6F2C4-D9BD-41D5-BE91-DA23F31A2FA4 + 1.1.423 (1.1.423.1) + 1.1.423.1 - 2022-04-16T00:00:00Z + 2022-04-23T00:00:00Z

- CHANGE + BUGFIX

    -
  • ru-RU Translation file updated.
    • +
  • Fixed the discord bot Info command, to release the profile once the command has finished running.
-

-
- - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:B5B32577-54E7-49D3-9EDF-D623F54A47D9 - 1.1.422 (1.1.422.2) - 1.1.422.2 - - 2022-04-14T00:00:00Z - -
-

CHANGE

    -
  • Global Settings - added new discord bot setting for an All Profiles alias. To disable to All Profiles feature, just clear the alias field.
    • -
  • Discord Bot - can now use the new All Profiles alias to send a command to all profiles associated with the channel.
    • -
-

-
- - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:95C9671F-4AEC-4433-AD68-CF91854FEC1B - 1.1.422 (1.1.422.1) - 1.1.422.1 - - 2022-03-23T00:00:00Z - -
-

- CHANGE -
-

    -
  • Changed the auto process message broadcast to use a config setting, not a hardcoded value.
    • +
  • Profile Discord Settings - added new checkbox to allow the profile to be included in discord commands using the Cluster Id as the alias.
    • +
  • Realigned the default Player and Creature levels to the wiki.
    • +
  • pt-BR Translation file updated.