diff --git a/CSM/ConanServerManager_1.1.74.exe b/CSM/ConanServerManager_1.1.74.exe
new file mode 100644
index 00000000..7432cd43
Binary files /dev/null and b/CSM/ConanServerManager_1.1.74.exe differ
diff --git a/CSM/ConanServerManager_1.1.74.zip b/CSM/ConanServerManager_1.1.74.zip
new file mode 100644
index 00000000..b0a7803e
Binary files /dev/null and b/CSM/ConanServerManager_1.1.74.zip differ
diff --git a/CSM/VersionFeed.xml b/CSM/VersionFeed.xml
index 1091afdf..ccb5eb97 100644
--- a/CSM/VersionFeed.xml
+++ b/CSM/VersionFeed.xml
@@ -5,7 +5,31 @@
Conan Server Manager Version Feed
This is the Conan Server Manager release version feed.
- 2022-05-21T00:00:00Z
+ 2022-06-13T00:00:00Z
+
+
+ urn:uuid:4E189446-9861-4B64-9B27-0E3E655CD1CA
+ 1.1.74 (1.1.74.3)
+ 1.1.74.3
+
+ 2022-06-16T00:00:00Z
+
+
+
+ CHANGE
+
+
+ - Updated to query master timeouts from 10 seconds to 30 seconds.
+ - RCON Message Modes - now loads them from the gamedata file, so they can be extended without a code change.
+
+
+
+
+
+ bletch
+ bletch1971@hotmail.com
+
+
urn:uuid:D0681B47-5715-473E-99D3-63F475A997C4
diff --git a/CSM/en-US.xaml b/CSM/en-US.xaml
index 9ad687cc..becff1ce 100644
--- a/CSM/en-US.xaml
+++ b/CSM/en-US.xaml
@@ -81,6 +81,14 @@
Debug
+
+ Command
+ Global
+ Broadcast
+ Alert (requires Pippi mod)
+ Server (requires Pippi mod)
+
+
x
%
@@ -565,12 +573,6 @@
Can't open logs
Unable to open the logs directory at {0}. Please make sure this directory exists and that you have permission to access it.\nException: {1}
- Command
- Global
- Broadcast
- Alert (requires Pippi mod)
- Server (requires Pippi mod)
-
Disconnected
Connected
diff --git a/CSM/latest.exe b/CSM/latest.exe
index adf916f1..7432cd43 100644
Binary files a/CSM/latest.exe and b/CSM/latest.exe differ
diff --git a/CSM/latest.txt b/CSM/latest.txt
index 197724df..e9e9a2af 100644
--- a/CSM/latest.txt
+++ b/CSM/latest.txt
@@ -1 +1 @@
-1.1.73
+1.1.74
diff --git a/CSM/latest.zip b/CSM/latest.zip
index 8cd12d77..b0a7803e 100644
Binary files a/CSM/latest.zip and b/CSM/latest.zip differ