Merge remote-tracking branch 'origin/main'

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

Saved/Config/CrashReportClient/UE4CC-Windows-D6E4B11D48C624E56C25BFB66DE47B67/CrashReportClient.ini

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

Saved/Config/Windows/EditorPerProjectUserSettings.ini

@@ -127,21 +127,26 @@ PerInstanceSettings=(ConfigName="FourPanes2x2.Viewport 1.Viewport3",ConfigSettin
 CurrentPosGridSize=1
 
 [EditorStartup]
-LastLevel=/Game/Emmy_Testing
+LastLevel=/Game/Map
 
 [AssetEditorSubsystem]
+<<<<<<< HEAD
+CleanShutdown=True
+OpenAssetsAtExit=/Game/Materials/Wandgemälde.Wandgemälde
+=======
 CleanShutdown=False
 OpenAssetsAtExit=/Game/Fang/Base.Base
 OpenAssetsAtExit=/Game/Fang/Fang.Fang
 OpenAssetsAtExit=/Game/Fang/Fang_Dance.Fang_Dance
 OpenAssetsAtExit=/Game/ThirdPersonBP/Blueprints/ThirdPersonCharacter.ThirdPersonCharacter
 OpenAssetsAtExit=/Game/Blueprints/BP_Dance.BP_Dance
+>>>>>>> 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
 
@@ -170,7 +175,7 @@ ContentBrowserTab1.ActiveTypeFilters=
 ContentBrowserTab1.EnabledTypeFilters=
 ContentBrowserTab1.ActiveFrontendFilters=
 ContentBrowserTab1.EnabledFrontendFilters=
-ContentBrowserTab1.SelectedPaths=/Game/Blueprints
+ContentBrowserTab1.SelectedPaths=/Game/Assets
 ContentBrowserTab1.PluginFilters=
 ContentBrowserTab1.Favorites.SelectedPaths=
 FavoritePaths=
@@ -1122,21 +1127,37 @@ AnimationEditor.TimeStamp=2024.05.13-09.53.19
 AnimationEditor.LastCompileMethod=Unknown
 
 [MRU]
-MRUItem0=/Game/Emmy_Testing
-MRUItem1=/Game/Map
+MRUItem0=/Game/Map
+MRUItem1=/Game/Emmy_Testing
 MRUItem2=/Game/Test
 
 [PlacementMode]
+<<<<<<< HEAD
+RecentlyPlaced=/Game/Assets/Cacti3.Cacti3;
+RecentlyPlaced=/Game/Assets/Cacti2.Cacti2;
+RecentlyPlaced=/Game/Assets/Cacti1.Cacti1;
+RecentlyPlaced=/Game/Assets/Cacti5.Cacti5;
+RecentlyPlaced=/Game/Assets/Cacti4.Cacti4;
+RecentlyPlaced=/Game/Assets/Trap.Trap;
+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/Materials/Wandgemälde.Wandgemälde;
+RecentlyPlaced=/Script/Engine.DecalActor;/Engine/Transient.ActorFactoryDeferredDecal_0
+=======
 RecentlyPlaced=/Game/Blueprints/BP_Dance.BP_Dance;
+>>>>>>> origin/main
 RecentlyPlaced=/Game/Fang/Fang.Fang;
 RecentlyPlaced=/Game/Fang/Fang_Anim_rig_Dance.Fang_Anim_rig_Dance;
 RecentlyPlaced=/Game/Blueprints/BP_Door.BP_Door;
-RecentlyPlaced=/Game/Materials/gen.gen;
 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;
 RecentlyPlaced=/Game/Materials/gen2.gen2;
+<<<<<<< HEAD
+=======
 RecentlyPlaced=/Game/Assets/Plattform_broken__1_.Plattform_broken__1_;
 RecentlyPlaced=/Game/Shader+Effekte/FireSmall.FireSmall;
 RecentlyPlaced=/Game/Assets/Fackel2.Fackel2;
@@ -1147,6 +1168,7 @@ RecentlyPlaced=/Game/Assets/Fackel3.Fackel3;
 RecentlyPlaced=/Game/Assets/Fackel1.Fackel1;
 RecentlyPlaced=/Game/Assets/test.test;
 RecentlyPlaced=/Game/Materials/Lagerfeuer.Lagerfeuer;
+>>>>>>> origin/main
 None=======
 None=======
 
@@ -2042,6 +2064,13 @@ AnimStateNode.GraphNodeDetail=True
 AnimStateNode.Animation State=True
 AnimGraphNode_SequencePlayer.Settings=True
 AnimGraphNode_SequencePlayer.Relevancy=True
+<<<<<<< HEAD
+DecalActor.TransformCommon=True
+DecalActor.Decal=True
+DecalActor.Rendering=True
+DecalActor.Tags=True
+DecalActor.Cooking=True
+=======
 BoneProxy.Transform=True
 BoneProxy.Bone=True
 BoneProxy.Reference Transform=True
@@ -2083,6 +2112,7 @@ BP_Dance_C.Input=True
 BP_Dance_C.TransformCommon=True
 EditorAnimSegment.Animation Segment=True
 EditorAnimSegment.Montage=True
+>>>>>>> origin/main
 
 [PluginBrowser]
 InstalledPlugins=XRVisualization
@@ -2090,7 +2120,6 @@ InstalledPlugins=XRVisualization
 [/Script/UnrealEd.MaterialEditorOptions]
 bHideUnrelatedNodes=False
 bUseUnsortedMenus=False
-bShowGrid=False
 
 [FBX_Import_UI_Option_FbxImportUI]
 bOverrideFullName=True
@@ -2203,9 +2232,31 @@ bForceFrontXAxis=False
 bConvertSceneUnit=False
 
 [MessageLog]
-LastLogListing=LightingResults
+LastLogListing=FBXImport
 
 [ContentBrowserRecent]
+<<<<<<< HEAD
+MRUItem0=/Game/Assets/Material
+MRUItem1=/Game/Assets/Trap
+MRUItem2=/Game/Textures/Wandgemälde
+MRUItem3=/Game/Materials/Wandgemälde
+MRUItem4=/Game/Map
+MRUItem5=/Game/Fang/Walk_RunBS
+MRUItem6=/Game/Mannequin/Animations/ThirdPerson_IdleRun_2D
+MRUItem7=/Game/Mannequin/Animations/ThirdPerson_AnimBP
+MRUItem8=/Game/ThirdPersonBP/Blueprints/ThirdPersonCharacter
+MRUItem9=/Game/Fang/Fang_AnimBP
+MRUItem10=/Game/Fang/Base
+MRUItem11=/Game/Fang/Fang_Anim_rig_Walking
+MRUItem12=/Game/Fang/Fang_Anim_rig_JumpFLYING
+MRUItem13=/Game/Fang/Fang_Anim_JumpFLYING
+MRUItem14=/Game/Fang/Base_Roughness
+MRUItem15=/Game/Fang/Fang
+MRUItem16=/Game/Assets/Plattform_broken__1_
+MRUItem17=/Game/Assets/Plattform_broken
+MRUItem18=/Game/Materials/platform_broken
+MRUItem19=/Game/Assets/FeuFeu
+=======
 MRUItem0=/Game/Fang/Fang_Dance
 MRUItem1=/Game/Blueprints/BP_BrokenPlattform
 MRUItem2=/Game/Blueprints/BPI_JumpAndRun
@@ -2226,6 +2277,7 @@ MRUItem16=/Game/Fang/Base_Roughness
 MRUItem17=/Game/Fang/Fang
 MRUItem18=/Game/Assets/Plattform_broken__1_
 MRUItem19=/Game/Assets/Plattform_broken
+>>>>>>> origin/main
 
 [AssetEditorToolkitTabLocation]
 /Game/Assets/BSurfaceMesh.BSurfaceMesh=1
@@ -2298,9 +2350,14 @@ None=======
 /Game/Assets/Plattform_broken.Plattform_broken=1
 /Game/Fang/Base_Roughness.Base_Roughness=0
 /Game/Fang/Base.Base=0
+<<<<<<< HEAD
+/Game/Textures/Wandgemälde.Wandgemälde=0
+/Game/Assets/Material.Material=0
+=======
 /Game/Fang/Fang_Anim_rig_Walking.Fang_Anim_rig_Walking=0
 /Game/Fang/Fang_AnimBP.Fang_AnimBP=0
 /Game/Fang/Fang_Dance.Fang_Dance=0
+>>>>>>> origin/main
 
 [MaterialEditor]
 PrimType=1
@@ -2573,6 +2630,7 @@ NodeTemplateCacheCapMB=20.000000
 
 [SelectionDetails]
 PreserveScaleRatio=True
+DecalSize_PreserveScaleRatio=False
 
 [FoliageEdit]
 Radius=27.397949

Saved/Config/Windows/Engine.ini

@@ -58,11 +58,3 @@ MLSDKPath=(Path="")
 [/Script/UnrealEd.EditorEngine]
 FlipNormalMapGreenChannel=False
 
-[WindowsApplication.Accessibility]
-StickyKeysHotkey=True
-ToggleKeysHotkey=True
-FilterKeysHotkey=True
-StickyKeysConfirmation=True
-ToggleKeysConfirmation=True
-FilterKeysConfirmation=True
-