+ BUGFIX
+
+
+ - Gamedata File - set Rhyniognatha as tameable.
+
CHANGE
- - tr-TR Translation file updated.
+ - Gamedata File - add all events (as info: all events are color events only).
+ - Administration - add bad word filter.
+ - Administration - remove deprecated settings.
+ - Rules Section - allow decimal values for Ragnarok Volcano Interval.
+ - Dino Settings - add max imprint limit.
+ - Global Settings - add option to run auto backup sequential.
- pt-BR Translation file updated.
@@ -31,4 +41,4 @@
-
+
\ No newline at end of file
diff --git a/src/ARKServerManager/Windows/MainWindow.xaml b/src/ARKServerManager/Windows/MainWindow.xaml
index 42a02f37..880bb2f0 100644
--- a/src/ARKServerManager/Windows/MainWindow.xaml
+++ b/src/ARKServerManager/Windows/MainWindow.xaml
@@ -43,10 +43,6 @@
-
-
-
-
diff --git a/src/ARKServerManager/Windows/MainWindow.xaml.cs b/src/ARKServerManager/Windows/MainWindow.xaml.cs
index 5f232bab..5a29752b 100644
--- a/src/ARKServerManager/Windows/MainWindow.xaml.cs
+++ b/src/ARKServerManager/Windows/MainWindow.xaml.cs
@@ -1,6 +1,5 @@
using EO.Wpf;
using NLog;
-using ServerManagerTool.Common;
using ServerManagerTool.Common.Enums;
using ServerManagerTool.Common.Lib;
using ServerManagerTool.Common.Utils;
@@ -36,7 +35,6 @@ namespace ServerManagerTool
public static readonly DependencyProperty AppInstanceProperty = DependencyProperty.Register(nameof(AppInstance), typeof(App), typeof(MainWindow), new PropertyMetadata(null));
public static readonly DependencyProperty ConfigProperty = DependencyProperty.Register(nameof(Config), typeof(Config), typeof(MainWindow), new PropertyMetadata(null));
- public static readonly DependencyProperty CommonConfigProperty = DependencyProperty.Register(nameof(CommonConfig), typeof(CommonConfig), typeof(MainWindow), new PropertyMetadata(null));
public static readonly DependencyProperty ServerManagerProperty = DependencyProperty.Register(nameof(ServerManager), typeof(ServerManager), typeof(MainWindow), new PropertyMetadata(null));
public static readonly DependencyProperty AutoBackupStateProperty = DependencyProperty.Register(nameof(AutoBackupState), typeof(Microsoft.Win32.TaskScheduler.TaskState), typeof(MainWindow), new PropertyMetadata(Microsoft.Win32.TaskScheduler.TaskState.Unknown));
public static readonly DependencyProperty AutoBackupStateStringProperty = DependencyProperty.Register(nameof(AutoBackupStateString), typeof(string), typeof(MainWindow), new PropertyMetadata(string.Empty));
@@ -54,7 +52,6 @@ namespace ServerManagerTool
{
this.AppInstance = App.Instance;
this.Config = Config.Default;
- this.CommonConfig = CommonConfig.Default;
InitializeComponent();
WindowUtils.RemoveDefaultResourceDictionary(this, Config.Default.DefaultGlobalizationFile);
@@ -105,12 +102,6 @@ namespace ServerManagerTool
set { SetValue(ConfigProperty, value); }
}
- public CommonConfig CommonConfig
- {
- get { return GetValue(CommonConfigProperty) as CommonConfig; }
- set { SetValue(CommonConfigProperty, value); }
- }
-
public ServerManager ServerManager
{
get { return (ServerManager)GetValue(ServerManagerProperty); }
diff --git a/src/ARKServerManager/Windows/ProfileSyncWindow.xaml.cs b/src/ARKServerManager/Windows/ProfileSyncWindow.xaml.cs
index 64ed9f8a..3b468bc9 100644
--- a/src/ARKServerManager/Windows/ProfileSyncWindow.xaml.cs
+++ b/src/ARKServerManager/Windows/ProfileSyncWindow.xaml.cs
@@ -238,8 +238,6 @@ namespace ServerManagerTool
SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.MapSpawnerOverrides, SectionName = _globalizer.GetResourceString("ServerSettings_MapSpawnerOverridesLabel") });
if (Config.Default.SectionSupplyCrateOverridesEnabled)
SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.SupplyCrateOverrides, SectionName = _globalizer.GetResourceString("ServerSettings_SupplyCrateOverridesLabel") });
- if (Config.Default.SectionExcludeItemIndicesOverridesEnabled)
- SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.ExcludeItemIndicesOverrides, SectionName = _globalizer.GetResourceString("ServerSettings_ExcludeItemIndicesOverridesLabel") });
if (Config.Default.SectionStackSizeOverridesEnabled)
SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.StackSizeOverrides, SectionName = _globalizer.GetResourceString("ServerSettings_StackSizeOverridesLabel") });
if (Config.Default.SectionPreventTransferOverridesEnabled)
diff --git a/src/ARKServerManager/Windows/RCONWindow.xaml b/src/ARKServerManager/Windows/RCONWindow.xaml
index f2bb551b..5b41b84e 100644
--- a/src/ARKServerManager/Windows/RCONWindow.xaml
+++ b/src/ARKServerManager/Windows/RCONWindow.xaml
@@ -197,11 +197,6 @@
-
-
-
-
-
diff --git a/src/ARKServerManager/Windows/RCONWindow.xaml.cs b/src/ARKServerManager/Windows/RCONWindow.xaml.cs
index 9128ae74..efd139bc 100644
--- a/src/ARKServerManager/Windows/RCONWindow.xaml.cs
+++ b/src/ARKServerManager/Windows/RCONWindow.xaml.cs
@@ -645,57 +645,6 @@ namespace ServerManagerTool
}
}
-
- public ICommand KickPlayerProfileCommand
- {
- get
- {
- return new RelayCommand(
- execute: (player) =>
- {
- if (player.PlayerData != null)
- {
- this.ServerRCON.IssueCommand($"{ServerRcon.RCON_COMMAND_KICKPLAYER} {player.PlayerId.ToString()}");
- }
- },
- canExecute: (player) => player != null
- );
- }
- }
-
- public ICommand BanPlayerProfileCommand
- {
- get
- {
- return new RelayCommand(
- execute: (player) =>
- {
- if (player.PlayerData != null)
- {
- this.ServerRCON.IssueCommand($"{ServerRcon.RCON_COMMAND_BANPLAYER} {player.PlayerId.ToString()}");
- }
- },
- canExecute: (player) => player != null
- );
- }
- }
-
- public ICommand UnbanPlayerProfileCommand
- {
- get
- {
- return new RelayCommand(
- execute: (player) =>
- {
- if (player.PlayerData != null)
- {
- this.ServerRCON.IssueCommand($"{ServerRcon.RCON_COMMAND_UNBANPLAYER} {player.PlayerId.ToString()}");
- }
- },
- canExecute: (player) => player != null
- );
- }
- }
#endregion
#region Events
diff --git a/src/ARKServerManager/Windows/WorldSaveRestoreWindow.xaml b/src/ARKServerManager/Windows/WorldSaveRestoreWindow.xaml
index 7f591631..fe28e951 100644
--- a/src/ARKServerManager/Windows/WorldSaveRestoreWindow.xaml
+++ b/src/ARKServerManager/Windows/WorldSaveRestoreWindow.xaml
@@ -2,7 +2,6 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
- xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
MinWidth="700" MinHeight="480" Width="800" Height="480" ResizeMode="CanResize" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
Loaded="Window_Loaded"
Icon="../Art/favicon.ico" Title="{DynamicResource WorldSaveRestore_Title}">
@@ -56,18 +55,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/ConanServerManager/Windows/MainWindow.xaml.cs b/src/ConanServerManager/Windows/MainWindow.xaml.cs
index 56b28f8a..d9ec8a10 100644
--- a/src/ConanServerManager/Windows/MainWindow.xaml.cs
+++ b/src/ConanServerManager/Windows/MainWindow.xaml.cs
@@ -1,6 +1,5 @@
using EO.Wpf;
using NLog;
-using ServerManagerTool.Common;
using ServerManagerTool.Common.Enums;
using ServerManagerTool.Common.Lib;
using ServerManagerTool.Common.Utils;
@@ -36,7 +35,6 @@ namespace ServerManagerTool
public static readonly DependencyProperty AppInstanceProperty = DependencyProperty.Register(nameof(AppInstance), typeof(App), typeof(MainWindow), new PropertyMetadata(null));
public static readonly DependencyProperty ConfigProperty = DependencyProperty.Register(nameof(Config), typeof(Config), typeof(MainWindow), new PropertyMetadata(null));
- public static readonly DependencyProperty CommonConfigProperty = DependencyProperty.Register(nameof(CommonConfig), typeof(CommonConfig), typeof(MainWindow), new PropertyMetadata(null));
public static readonly DependencyProperty ServerManagerProperty = DependencyProperty.Register(nameof(ServerManager), typeof(ServerManager), typeof(MainWindow), new PropertyMetadata(null));
public static readonly DependencyProperty AutoBackupStateProperty = DependencyProperty.Register(nameof(AutoBackupState), typeof(Microsoft.Win32.TaskScheduler.TaskState), typeof(MainWindow), new PropertyMetadata(Microsoft.Win32.TaskScheduler.TaskState.Unknown));
public static readonly DependencyProperty AutoBackupStateStringProperty = DependencyProperty.Register(nameof(AutoBackupStateString), typeof(string), typeof(MainWindow), new PropertyMetadata(string.Empty));
@@ -54,7 +52,6 @@ namespace ServerManagerTool
{
this.AppInstance = App.Instance;
this.Config = Config.Default;
- this.CommonConfig = CommonConfig.Default;
InitializeComponent();
WindowUtils.RemoveDefaultResourceDictionary(this, Config.Default.DefaultGlobalizationFile);
@@ -105,12 +102,6 @@ namespace ServerManagerTool
set { SetValue(ConfigProperty, value); }
}
- public CommonConfig CommonConfig
- {
- get { return GetValue(CommonConfigProperty) as CommonConfig; }
- set { SetValue(CommonConfigProperty, value); }
- }
-
public ServerManager ServerManager
{
get { return (ServerManager)GetValue(ServerManagerProperty); }
diff --git a/src/ConanServerManager/Windows/WorldSaveRestoreWindow.xaml b/src/ConanServerManager/Windows/WorldSaveRestoreWindow.xaml
index 0abc7622..4f6f9332 100644
--- a/src/ConanServerManager/Windows/WorldSaveRestoreWindow.xaml
+++ b/src/ConanServerManager/Windows/WorldSaveRestoreWindow.xaml
@@ -2,7 +2,6 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
- xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
MinWidth="700" MinHeight="480" Width="800" Height="480" ResizeMode="CanResize" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
Loaded="Window_Loaded"
Icon="../Art/favicon.ico" Title="{DynamicResource WorldSaveRestore_Title}">
@@ -57,18 +56,6 @@
-
-
-
-
-
-
-
-