diff --git a/src/ConanServerManager/Globalization/en-US/en-US.xaml b/src/ConanServerManager/Globalization/en-US/en-US.xaml
index 2b51a4ab..4dba9c62 100644
--- a/src/ConanServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ConanServerManager/Globalization/en-US/en-US.xaml
@@ -1043,6 +1043,10 @@
Set the amount of AFK time before a character is kicked.Server Region:Selecting a server region will affect how your server is filtered in the list. Select your region to help players find a server that is close to them.
+ Enable Server Transfers
+ If enabled, will enable character server transfers.
+ Can Import Directly from Same Server
+ If enabled, will allow players to directly import characters that were exported from exactly the same server.Branch DetailsBranch Name:
diff --git a/src/ConanServerManager/Lib/ServerProfile.cs b/src/ConanServerManager/Lib/ServerProfile.cs
index 946c03b3..ed673611 100644
--- a/src/ConanServerManager/Lib/ServerProfile.cs
+++ b/src/ConanServerManager/Lib/ServerProfile.cs
@@ -380,6 +380,22 @@ namespace ServerManagerTool.Lib
set { SetValue(KickIdlePlayersPeriodProperty, value); }
}
+ public static readonly DependencyProperty ServerTransferEnabledProperty = DependencyProperty.Register(nameof(ServerTransferEnabled), typeof(bool), typeof(ServerProfile), new PropertyMetadata(true));
+ [IniFileEntry(IniFiles.ServerSettings, IniSections.ServerSettings_ServerSettings, ServerProfileCategory.Administration)]
+ public bool ServerTransferEnabled
+ {
+ get { return (bool)GetValue(ServerTransferEnabledProperty); }
+ set { SetValue(ServerTransferEnabledProperty, value); }
+ }
+
+ public static readonly DependencyProperty CanImportDirectlyFromSameServerProperty = DependencyProperty.Register(nameof(CanImportDirectlyFromSameServer), typeof(bool), typeof(ServerProfile), new PropertyMetadata(false));
+ [IniFileEntry(IniFiles.ServerSettings, IniSections.ServerSettings_ServerSettings, ServerProfileCategory.Administration)]
+ public bool CanImportDirectlyFromSameServer
+ {
+ get { return (bool)GetValue(CanImportDirectlyFromSameServerProperty); }
+ set { SetValue(CanImportDirectlyFromSameServerProperty, value); }
+ }
+
public static readonly DependencyProperty BranchNameProperty = DependencyProperty.Register(nameof(BranchName), typeof(string), typeof(ServerProfile), new PropertyMetadata(String.Empty));
[DataMember]
public string BranchName
diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml
index b4419727..36da152f 100644
--- a/src/ConanServerManager/VersionFeed.xml
+++ b/src/ConanServerManager/VersionFeed.xml
@@ -5,7 +5,30 @@
Conan Server Manager Version FeedThis is the Conan Server Manager release version feed.
- 2020-11-25T00:00:00Z
+ 2021-08-22T00:00:00Z
+
+
+ urn:uuid:2B49A030-A742-476B-B811-6F0D7780B117
+ 1.1.51 (1.1.51.1)
+ 1.1.51.1
+
+ 2021-08-22T00:00:00Z
+
+
+
+ NEW
+
+
+
Server Settings - Added new server transfer options (server whitelist option in future version).
+
+
+
+
+
+ bletch
+ bletch1971@hotmail.com
+
+ urn:uuid:6914861A-2D4E-4F08-89A3-D3D7A77F74C1
diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml
index 3d356bef..19ca771a 100644
--- a/src/ConanServerManager/VersionFeedBeta.xml
+++ b/src/ConanServerManager/VersionFeedBeta.xml
@@ -5,21 +5,21 @@
Conan Server Manager Version FeedThis is the Conan Server Manager beta version feed.
- 2020-11-25T00:00:00Z
+ 2021-08-22T00:00:00Z
- urn:uuid:6914861A-2D4E-4F08-89A3-D3D7A77F74C1
- 1.1.50 (1.1.50.1)
- 1.1.50.1
+ urn:uuid:2B49A030-A742-476B-B811-6F0D7780B117
+ 1.1.51 (1.1.51.1)
+ 1.1.51.1
- 2020-11-25T00:00:00Z
+ 2021-08-22T00:00:00Z
NEW
-
Global Settings - Added option to automatically manage the Public IP, default to True. If disabled, then the Public IP must be updated manually.
+
Server Settings - Added new server transfer options (server whitelist option in future version).