Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky

# Conflicts:
#	Content/Maps/Interiors/GP13/S01/Interior/GP13_S01_A14_F08-09.umap

Binaries/Win64/Ivazowsky.target

@@ -28,14 +28,6 @@
 			"Path": "$(ProjectDir)/Binaries/Win64/D3D12/d3d12SDKLayers.dll",
 			"Type": "DynamicLibrary"
 		},
-		{
-			"Path": "$(ProjectDir)/Binaries/Win64/DML/DirectML.Debug.dll",
-			"Type": "DynamicLibrary"
-		},
-		{
-			"Path": "$(ProjectDir)/Binaries/Win64/DML/DirectML.dll",
-			"Type": "DynamicLibrary"
-		},
 		{
 			"Path": "$(ProjectDir)/Binaries/Win64/Ivazowsky.exe",
 			"Type": "Executable"
@@ -90,10 +82,6 @@
 			"Path": "$(EngineDir)/Binaries/ThirdParty/MsQuic/v220/win64/msquic.dll",
 			"Type": "NonUFS"
 		},
-		{
-			"Path": "$(EngineDir)/Binaries/ThirdParty/NVIDIA/GPUDirect/Win64/dvp.dll",
-			"Type": "NonUFS"
-		},
 		{
 			"Path": "$(EngineDir)/Binaries/ThirdParty/NVIDIA/NVaftermath/Win64/GFSDK_Aftermath_Lib.x64.dll",
 			"Type": "NonUFS"
@@ -2906,18 +2894,6 @@
 			"Path": "$(EngineDir)/Plugins/Bridge/Bridge.uplugin",
 			"Type": "UFS"
 		},
-		{
-			"Path": "$(EngineDir)/Plugins/Compositing/Composure/Composure.uplugin",
-			"Type": "UFS"
-		},
-		{
-			"Path": "$(EngineDir)/Plugins/Compositing/OpenCVLensDistortion/OpenCVLensDistortion.uplugin",
-			"Type": "UFS"
-		},
-		{
-			"Path": "$(EngineDir)/Plugins/Compositing/OpenColorIO/OpenColorIO.uplugin",
-			"Type": "UFS"
-		},
 		{
 			"Path": "$(EngineDir)/Plugins/Developer/AnimationSharing/AnimationSharing.uplugin",
 			"Type": "UFS"
@@ -3086,22 +3062,6 @@
 			"Path": "$(EngineDir)/Plugins/Experimental/LocalizableMessage/LocalizableMessage.uplugin",
 			"Type": "UFS"
 		},
-		{
-			"Path": "$(EngineDir)/Plugins/Experimental/NNERuntimeORTCpu/NNERuntimeORTCpu.uplugin",
-			"Type": "UFS"
-		},
-		{
-			"Path": "$(EngineDir)/Plugins/Experimental/NNERuntimeORTGpu/NNERuntimeORTGpu.uplugin",
-			"Type": "UFS"
-		},
-		{
-			"Path": "$(EngineDir)/Plugins/Experimental/NNERuntimeRDG/NNERuntimeRDG.uplugin",
-			"Type": "UFS"
-		},
-		{
-			"Path": "$(EngineDir)/Plugins/Experimental/NNE/NNE.uplugin",
-			"Type": "UFS"
-		},
 		{
 			"Path": "$(EngineDir)/Plugins/Experimental/OpenImageDenoise/OpenImageDenoise.uplugin",
 			"Type": "UFS"
@@ -3114,10 +3074,6 @@
 			"Path": "$(EngineDir)/Plugins/Experimental/PlatformCrypto/PlatformCrypto.uplugin",
 			"Type": "UFS"
 		},
-		{
-			"Path": "$(EngineDir)/Plugins/Experimental/ProxyLODPlugin/ProxyLODPlugin.uplugin",
-			"Type": "UFS"
-		},
 		{
 			"Path": "$(EngineDir)/Plugins/Experimental/PythonScriptPlugin/PythonScriptPlugin.uplugin",
 			"Type": "UFS"
@@ -3154,14 +3110,6 @@
 			"Path": "$(EngineDir)/Plugins/Interchange/Runtime/Interchange.uplugin",
 			"Type": "UFS"
 		},
-		{
-			"Path": "$(EngineDir)/Plugins/Marketplace/BlueprintJson/BlueprintJson.uplugin",
-			"Type": "UFS"
-		},
-		{
-			"Path": "$(EngineDir)/Plugins/Marketplace/MetaHuman/MetaHuman.uplugin",
-			"Type": "UFS"
-		},
 		{
 			"Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/ThirdParty/Win64/Development/nvngx_dlss.dll",
 			"Type": "DebugNonUFS"
@@ -3234,30 +3182,10 @@
 			"Path": "$(EngineDir)/Plugins/Marketplace/VaRestPlugin/VaRest.uplugin",
 			"Type": "UFS"
 		},
-		{
-			"Path": "$(EngineDir)/Plugins/Media/ImgMedia/ImgMedia.uplugin",
-			"Type": "UFS"
-		},
-		{
-			"Path": "$(EngineDir)/Plugins/Media/MediaCompositing/MediaCompositing.uplugin",
-			"Type": "UFS"
-		},
-		{
-			"Path": "$(EngineDir)/Plugins/Media/MediaFrameworkUtilities/MediaFrameworkUtilities.uplugin",
-			"Type": "UFS"
-		},
-		{
-			"Path": "$(EngineDir)/Plugins/Media/MediaIOFramework/MediaIOFramework.uplugin",
-			"Type": "UFS"
-		},
 		{
 			"Path": "$(EngineDir)/Plugins/Media/MediaPlate/MediaPlate.uplugin",
 			"Type": "UFS"
 		},
-		{
-			"Path": "$(EngineDir)/Plugins/Media/MediaPlayerEditor/MediaPlayerEditor.uplugin",
-			"Type": "UFS"
-		},
 		{
 			"Path": "$(EngineDir)/Plugins/Media/PixelCapture/PixelCapture.uplugin",
 			"Type": "UFS"
@@ -3390,10 +3318,6 @@
 			"Path": "$(EngineDir)/Plugins/Runtime/InputDebugging/InputDebugging.uplugin",
 			"Type": "UFS"
 		},
-		{
-			"Path": "$(EngineDir)/Plugins/Runtime/MeshModelingToolset/MeshModelingToolset.uplugin",
-			"Type": "UFS"
-		},
 		{
 			"Path": "$(EngineDir)/Plugins/Runtime/Metasound/Metasound.uplugin",
 			"Type": "UFS"
@@ -3402,18 +3326,6 @@
 			"Path": "$(EngineDir)/Plugins/Runtime/MsQuic/MsQuic.uplugin",
 			"Type": "UFS"
 		},
-		{
-			"Path": "$(EngineDir)/Plugins/Runtime/OSC/OSC.uplugin",
-			"Type": "UFS"
-		},
-		{
-			"Path": "$(EngineDir)/Plugins/Runtime/OpenCV/Binaries/ThirdParty/Win64/opencv_world455.dll",
-			"Type": "NonUFS"
-		},
-		{
-			"Path": "$(EngineDir)/Plugins/Runtime/OpenCV/OpenCV.uplugin",
-			"Type": "UFS"
-		},
 		{
 			"Path": "$(EngineDir)/Plugins/Runtime/OpenXR/OpenXR.uplugin",
 			"Type": "UFS"
@@ -3466,14 +3378,6 @@
 			"Path": "$(EngineDir)/Plugins/TraceUtilities/TraceUtilities.uplugin",
 			"Type": "UFS"
 		},
-		{
-			"Path": "$(EngineDir)/Plugins/VirtualProduction/CameraCalibrationCore/CameraCalibrationCore.uplugin",
-			"Type": "UFS"
-		},
-		{
-			"Path": "$(EngineDir)/Plugins/VirtualProduction/CameraCalibration/CameraCalibration.uplugin",
-			"Type": "UFS"
-		},
 		{
 			"Path": "$(EngineDir)/Plugins/VirtualProduction/RemoteControlInterception/RemoteControlInterception.uplugin",
 			"Type": "UFS"
@@ -3494,14 +3398,6 @@
 			"Path": "$(ProjectDir)/Binaries/Win64/D3D12/d3d12SDKLayers.dll",
 			"Type": "NonUFS"
 		},
-		{
-			"Path": "$(ProjectDir)/Binaries/Win64/DML/DirectML.Debug.dll",
-			"Type": "NonUFS"
-		},
-		{
-			"Path": "$(ProjectDir)/Binaries/Win64/DML/DirectML.dll",
-			"Type": "NonUFS"
-		},
 		{
 			"Path": "$(ProjectDir)/Binaries/Win64/NvmlWrapper.dll",
 			"Type": "NonUFS"

Config/DefaultGame.ini

@@ -2,7 +2,7 @@
 
 [/Script/EngineSettings.GeneralProjectSettings]
 ProjectID=B89CCC284A7D213231762AB505314AAD
-ProjectVersion=3.41
+ProjectVersion=3.42
 ProjectName=Ivazowsky
 CompanyName=GraffInteractive
 Homepage=Graff.tech