Merge pull request #29 from winglessraven/dev

Dev
winglessraven · Mar 26, 2021 · 641fb95 · 641fb95
2 parents bcf399d + 2eaed50
commit 641fb95
Show file tree

Hide file tree

Showing 13 changed files with 573 additions and 564 deletions.
diff --git a/Dead Matter Server Manager/.vs/Dead Matter Server Manager/v16/.suo b/Dead Matter Server Manager/.vs/Dead Matter Server Manager/v16/.suo
diff --git a/Dead Matter Server Manager/Dead Matter Server Manager/Properties/AssemblyInfo.cs b/Dead Matter Server Manager/Dead Matter Server Manager/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.11.1.0")]
-[assembly: AssemblyFileVersion("1.11.1.0")]
+[assembly: AssemblyVersion("1.12.0.0")]
+[assembly: AssemblyFileVersion("1.12.0.0")]
diff --git a/Dead Matter Server Manager/Dead Matter Server Manager/ServerManager.Designer.cs b/Dead Matter Server Manager/Dead Matter Server Manager/ServerManager.Designer.cs
diff --git a/Dead Matter Server Manager/Dead Matter Server Manager/ServerManager.cs b/Dead Matter Server Manager/Dead Matter Server Manager/ServerManager.cs
diff --git a/...er Server Manager/Dead Matter Server Manager/bin/x64/Debug/Dead Matter Server Manager.exe b/...er Server Manager/Dead Matter Server Manager/bin/x64/Debug/Dead Matter Server Manager.exe
diff --git a/...er Server Manager/Dead Matter Server Manager/bin/x64/Debug/Dead Matter Server Manager.pdb b/...er Server Manager/Dead Matter Server Manager/bin/x64/Debug/Dead Matter Server Manager.pdb
diff --git a/Dead Matter Server Manager/Dead Matter Server Manager/bin/x64/Debug/defaultEngine.txt b/Dead Matter Server Manager/Dead Matter Server Manager/bin/x64/Debug/defaultEngine.txt
@@ -4,21 +4,28 @@ Paths=%GAMEDIR%Content
 Paths=../../../deadmatter/Plugins/PivotTool/Content
 Paths=../../../Engine/Plugins/Runtime/SunPosition/Content
 Paths=../../../deadmatter/Plugins/DialoguePlugin/Content
+Paths=../../../Engine/Plugins/Runtime/Synthesis/Content
+Paths=../../../Engine/Plugins/Runtime/AudioSynesthesia/Content
 Paths=../../../Engine/Plugins/Tests/EditorTests/Content
 Paths=../../../Engine/Plugins/Tests/RuntimeTests/Content
 Paths=../../../Engine/Plugins/FX/NiagaraExtras/Content
 Paths=../../../Engine/Plugins/Experimental/Landmass/Content
-Paths=../../../deadmatter/Plugins/AbxyxxTools/Content
+Paths=../../../deadmatter/Plugins/BasedData/Content
 Paths=../../../deadmatter/Plugins/DiscordGameAPI/Content
+Paths=../../../Engine/Plugins/Experimental/Water/Content
+Paths=../../../Engine/Plugins/FX/Niagara/Content
+Paths=../../../Engine/Plugins/Experimental/GeometryProcessing/Content
+Paths=../../../deadmatter/Plugins/AbxyxxTools/Content
+Paths=../../../deadmatter/Plugins/CircularDependenciesDetector/Content
 Paths=../../../deadmatter/Plugins/Steamworker/Content
+Paths=../../../deadmatter/Plugins/Wwise/Content
 Paths=../../../Engine/Plugins/Developer/AnimationSharing/Content
 Paths=../../../Engine/Plugins/Editor/GeometryMode/Content
+Paths=../../../Engine/Plugins/Editor/SpeedTreeImporter/Content
 Paths=../../../Engine/Plugins/Experimental/ChaosClothEditor/Content
-Paths=../../../Engine/Plugins/Experimental/GeometryProcessing/Content
 Paths=../../../Engine/Plugins/Experimental/GeometryCollectionPlugin/Content
 Paths=../../../Engine/Plugins/Experimental/ChaosSolverPlugin/Content
 Paths=../../../Engine/Plugins/Experimental/ChaosNiagara/Content
-Paths=../../../Engine/Plugins/FX/Niagara/Content
+Paths=../../../Engine/Plugins/Experimental/MotoSynth/Content
 Paths=../../../Engine/Plugins/MagicLeap/MagicLeapPassableWorld/Content
-Paths=../../../Engine/Plugins/MovieScene/MovieRenderPipeline/Content
 
diff --git a/Dead Matter Server Manager/Dead Matter Server Manager/defaultEngine.txt b/Dead Matter Server Manager/Dead Matter Server Manager/defaultEngine.txt
@@ -4,21 +4,28 @@ Paths=%GAMEDIR%Content
 Paths=../../../deadmatter/Plugins/PivotTool/Content
 Paths=../../../Engine/Plugins/Runtime/SunPosition/Content
 Paths=../../../deadmatter/Plugins/DialoguePlugin/Content
+Paths=../../../Engine/Plugins/Runtime/Synthesis/Content
+Paths=../../../Engine/Plugins/Runtime/AudioSynesthesia/Content
 Paths=../../../Engine/Plugins/Tests/EditorTests/Content
 Paths=../../../Engine/Plugins/Tests/RuntimeTests/Content
 Paths=../../../Engine/Plugins/FX/NiagaraExtras/Content
 Paths=../../../Engine/Plugins/Experimental/Landmass/Content
-Paths=../../../deadmatter/Plugins/AbxyxxTools/Content
+Paths=../../../deadmatter/Plugins/BasedData/Content
 Paths=../../../deadmatter/Plugins/DiscordGameAPI/Content
+Paths=../../../Engine/Plugins/Experimental/Water/Content
+Paths=../../../Engine/Plugins/FX/Niagara/Content
+Paths=../../../Engine/Plugins/Experimental/GeometryProcessing/Content
+Paths=../../../deadmatter/Plugins/AbxyxxTools/Content
+Paths=../../../deadmatter/Plugins/CircularDependenciesDetector/Content
 Paths=../../../deadmatter/Plugins/Steamworker/Content
+Paths=../../../deadmatter/Plugins/Wwise/Content
 Paths=../../../Engine/Plugins/Developer/AnimationSharing/Content
 Paths=../../../Engine/Plugins/Editor/GeometryMode/Content
+Paths=../../../Engine/Plugins/Editor/SpeedTreeImporter/Content
 Paths=../../../Engine/Plugins/Experimental/ChaosClothEditor/Content
-Paths=../../../Engine/Plugins/Experimental/GeometryProcessing/Content
 Paths=../../../Engine/Plugins/Experimental/GeometryCollectionPlugin/Content
 Paths=../../../Engine/Plugins/Experimental/ChaosSolverPlugin/Content
 Paths=../../../Engine/Plugins/Experimental/ChaosNiagara/Content
-Paths=../../../Engine/Plugins/FX/Niagara/Content
+Paths=../../../Engine/Plugins/Experimental/MotoSynth/Content
 Paths=../../../Engine/Plugins/MagicLeap/MagicLeapPassableWorld/Content
-Paths=../../../Engine/Plugins/MovieScene/MovieRenderPipeline/Content
 
diff --git a/...ter Server Manager/obj/x64/Debug/Dead Matter Server Manager.csproj.GenerateResource.cache b/...ter Server Manager/obj/x64/Debug/Dead Matter Server Manager.csproj.GenerateResource.cache
diff --git a/...er Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.exe b/...er Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.exe
diff --git a/...er Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.pdb b/...er Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.pdb
diff --git a/...r Server Manager/DeadMatterServerManagerInstaller/DeadMatterServerManagerInstaller.vdproj b/...r Server Manager/DeadMatterServerManagerInstaller/DeadMatterServerManagerInstaller.vdproj
@@ -6766,15 +6766,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Dead Matter Server Manager"
-        "ProductCode" = "8:{F3A0DB99-9F3F-47C0-889C-6EEEB7CAE41C}"
-        "PackageCode" = "8:{C64373C0-86EB-4018-9D82-C7B98E106CFF}"
+        "ProductCode" = "8:{C67FD7CF-B74A-49D3-A713-15DA530AFFAD}"
+        "PackageCode" = "8:{58AB8DBE-9ABC-4CCA-B9FD-4C4D217CA778}"
         "UpgradeCode" = "8:{BC345328-E944-4F2F-9559-E95043070B11}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.11.1"
+        "ProductVersion" = "8:1.12.0"
         "Manufacturer" = "8:winglessraven"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

diff --git a/... Matter Server Manager/DeadMatterServerManagerInstaller/Debug/DeadMatterServerManager.msi b/... Matter Server Manager/DeadMatterServerManagerInstaller/Debug/DeadMatterServerManager.msi