Merge remote-tracking branch 'origin/main'

# Conflicts:
#	Intermediate/CachedAssetRegistry.bin
#	Saved/Config/Windows/EditorPerProjectUserSettings.ini
#	Saved/Logs/DesertGame.log

Saved/Config/CrashReportClient/UE4CC-Windows-95AF66C8494A0D0DAB59E0AF64F8D894/CrashReportClient.ini

@@ -0,0 +1,5 @@
+[CrashReportClient]
+bHideLogFilesOption=false
+bIsAllowedToCloseWithoutSending=true
+CrashConfigPurgeDays=2
+

Saved/Config/Windows/EditorPerProjectUserSettings.ini

@@ -130,15 +130,20 @@ CurrentPosGridSize=1
 LastLevel=/Game/Emmy_Testing
 
 [AssetEditorSubsystem]
+<<<<<<< HEAD
+CleanShutdown=True
+OpenAssetsAtExit=/Game/Materials/Tür.Tür
+=======
 CleanShutdown=False
 OpenAssetsAtExit=/Game/Fang/Base.Base
 OpenAssetsAtExit=/Game/Fang/Fang.Fang
+>>>>>>> origin/main
 
 [RootWindow]
 ScreenPosition=X=58.400 Y=0.000
 ScreenPosition=X=56.800 Y=39.200
 WindowSize=X=1310.400 Y=750.400
-WindowSize=X=1332.800 Y=772.800
+WindowSize=X=1334.400 Y=774.400
 None=======
 InitiallyMaximized=True
 
@@ -167,7 +172,7 @@ ContentBrowserTab1.ActiveTypeFilters=
 ContentBrowserTab1.EnabledTypeFilters=
 ContentBrowserTab1.ActiveFrontendFilters=
 ContentBrowserTab1.EnabledFrontendFilters=
-ContentBrowserTab1.SelectedPaths=/Game/Blueprints
+ContentBrowserTab1.SelectedPaths=/Game/Materials
 ContentBrowserTab1.PluginFilters=
 ContentBrowserTab1.Favorites.SelectedPaths=
 FavoritePaths=
@@ -1124,6 +1129,8 @@ MRUItem1=/Game/Map
 MRUItem2=/Game/Test
 
 [PlacementMode]
+<<<<<<< HEAD
+=======
 RecentlyPlaced=/Game/Fang/Fang.Fang;
 RecentlyPlaced=/Game/Fang/Fang_Anim_rig_Dance.Fang_Anim_rig_Dance;
 RecentlyPlaced=/Game/Blueprints/BP_Door.BP_Door;
@@ -1132,18 +1139,36 @@ RecentlyPlaced=/Game/Materials/M_Water.M_Water;
 RecentlyPlaced=/Game/Materials/Treppe.Treppe;
 RecentlyPlaced=/Game/Materials/Säule_destroyed.Säule_destroyed;
 RecentlyPlaced=/Game/Materials/platform_broken.platform_broken;
+>>>>>>> origin/main
 RecentlyPlaced=/Game/Materials/gen2.gen2;
+RecentlyPlaced=/Game/Assets/wand4.wand4;
+RecentlyPlaced=/Game/Blueprints/BP_Lever.BP_Lever;
+RecentlyPlaced=/Game/Materials/gen.gen;
 RecentlyPlaced=/Game/Assets/Plattform_broken__1_.Plattform_broken__1_;
-RecentlyPlaced=/Game/Shader+Effekte/FireSmall.FireSmall;
-RecentlyPlaced=/Game/Assets/Fackel2.Fackel2;
 RecentlyPlaced=/Game/Shader+Effekte/Fire.Fire;
 RecentlyPlaced=/Game/Assets/FeuFeu.FeuFeu;
+<<<<<<< HEAD
+RecentlyPlaced=/Game/Materials/M_Water.M_Water;
+RecentlyPlaced=/Game/Assets/wand3.wand3;
+RecentlyPlaced=/Game/Assets/wand6.wand6;
+RecentlyPlaced=/Game/Assets/wand5.wand5;
+RecentlyPlaced=/Game/Assets/wand_destroyed.wand_destroyed;
+RecentlyPlaced=/Game/Assets/wand.wand;
+RecentlyPlaced=/Game/Shader+Effekte/FireSmall.FireSmall;
+RecentlyPlaced=/Game/Assets/Fackel1.Fackel1;
+RecentlyPlaced=/Game/Materials/Tür.Tür;
+RecentlyPlaced=/Game/Assets/door_Cube.door_Cube;
+RecentlyPlaced=/Game/Blueprints/BP_Door.BP_Door;
+RecentlyPlaced=/Game/Materials/Treppe.Treppe;
+RecentlyPlaced=/Game/Materials/Säule_destroyed.Säule_destroyed;
+=======
 RecentlyPlaced=/Game/Shader+Effekte/Fire_Matrial.Fire_Matrial;
 RecentlyPlaced=/Game/Assets/Fackel3.Fackel3;
 RecentlyPlaced=/Game/Assets/Fackel1.Fackel1;
 RecentlyPlaced=/Game/Assets/test.test;
 RecentlyPlaced=/Game/Materials/Lagerfeuer.Lagerfeuer;
 RecentlyPlaced=/Game/Assets/wand7.wand7;
+>>>>>>> origin/main
 None=======
 None=======
 
@@ -2160,6 +2185,28 @@ bConvertSceneUnit=False
 LastLogListing=LightingResults
 
 [ContentBrowserRecent]
+<<<<<<< HEAD
+MRUItem0=/Game/Materials/M_Water
+MRUItem1=/Game/Blueprints/BP_Door
+MRUItem2=/Game/Textures/Tür/Texture/DefaultMaterial_Roughness
+MRUItem3=/Game/Textures/Tür/Texture/DefaultMaterial_Mixed_AO
+MRUItem4=/Game/Materials/Tür
+MRUItem5=/Game/Map
+MRUItem6=/Game/Assets/Plattform_broken__1_
+MRUItem7=/Game/Assets/Plattform_broken
+MRUItem8=/Game/Materials/platform_broken
+MRUItem9=/Game/Assets/FeuFeu
+MRUItem10=/Game/Assets/Fackel1
+MRUItem11=/Game/Assets/Fackel3
+MRUItem12=/Game/Materials/coals
+MRUItem13=/Game/Assets/Fackel2
+MRUItem14=/Game/Assets/flame
+MRUItem15=/Game/Assets/holders
+MRUItem16=/Game/Assets/metal
+MRUItem17=/Game/Materials/Fackeln/Lagerfeuer
+MRUItem18=/Game/Blueprints/BPI_JumpAndRun
+MRUItem19=/Game/Blueprints/BP_Spawner
+=======
 MRUItem0=/Game/ThirdPersonBP/Blueprints/ThirdPersonCharacter
 MRUItem1=/Game/Fang/Fang_AnimBP
 MRUItem2=/Game/Fang/Base
@@ -2180,6 +2227,7 @@ MRUItem16=/Game/Assets/Fackel2
 MRUItem17=/Game/Assets/flame
 MRUItem18=/Game/Assets/holders
 MRUItem19=/Game/Assets/metal
+>>>>>>> origin/main
 
 [AssetEditorToolkitTabLocation]
 /Game/Assets/BSurfaceMesh.BSurfaceMesh=1
@@ -2235,7 +2283,7 @@ None=======
 /Game/Blueprints/BP_GameInstance.BP_GameInstance=0
 /Game/Mannequin/Animations/ThirdPerson_AnimBP.ThirdPerson_AnimBP=0
 /Game/Mannequin/Animations/ThirdPerson_IdleRun_2D.ThirdPerson_IdleRun_2D=0
-/Game/Materials/M_Water.M_Water=1
+/Game/Materials/M_Water.M_Water=0
 /Game/Assets/Fackel2.Fackel2=0
 /Game/Assets/Fackel3.Fackel3=1
 /Game/Assets/door_Cube_001.door_Cube_001=1
@@ -2424,10 +2472,16 @@ PropertyWrapper=StaticMeshComponent.Rendering.TextureStreaming,StaticMeshCompone
 K2Node_VariableSet=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,StaticMeshComponent.Rendering.TextureStreaming,StaticMeshComponent.Rendering.RayTracing,StaticMeshComponent.Rendering.LOD,
 Landscape=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,
 PersonaPreviewSceneDescription=AssetViewerSettings.Settings.Environment,
+<<<<<<< HEAD
+PreviewMeshCollection=
+Actor=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacter_C.Rendering.TextureStreaming,ThirdPersonCharacter_C.Rendering.LOD,
+PrimitiveComponent=
+=======
 PreviewMeshCollection=AssetViewerSettings.Settings.Environment,
 CharacterMovementComponent=
 Fang_AnimBP_C=
 Character=
+>>>>>>> origin/main
 
 [DetailPropertyExpansion]
 MaterialExpressionDynamicParameter="\"Object.ParamNames\" \"Object.DefaultValue\" "
@@ -2445,10 +2499,17 @@ GeomModifier="\"Object.Settings\" "
 None=======
 InputSettings="\"Object.Bindings.ActionMappings.ActionMappings[4]\" "
 StaticMeshComponent="\"Object.Rendering.WireframeColorOverride\" \"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightmassSettings\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
+<<<<<<< HEAD
+MeshComponent="\"Object.Rendering.WireframeColorOverride\" \"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightmassSettings\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
+PrimitiveComponent=
+SceneComponent=
+ActorComponent=
+=======
 MeshComponent="\"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
 PrimitiveComponent="\"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
 SceneComponent="\"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
 ActorComponent="\"Object.NavMovement.NavAgentProps\" "
+>>>>>>> origin/main
 SkeletalMeshComponent="\"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
 SkinnedMeshComponent="\"Object.Rendering.OverrideMaterials\" \"Object.Lighting.LightingChannels\" \"Object.Collision.BodyInstance\" \"Object.Collision.BodyInstance.WalkableSlopeOverride\" "
 CapsuleComponent=