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

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

Saved/Config/Windows/EditorPerProjectUserSettings.ini

@@ -132,13 +132,8 @@ LastLevel=/Game/Emmy_Testing
 CleanShutdown=True
 
 [RootWindow]
-<<<<<<< HEAD
-ScreenPosition=X=58.400 Y=0.000
-WindowSize=X=1310.400 Y=750.400
-=======
 ScreenPosition=X=56.800 Y=39.200
 WindowSize=X=1305.600 Y=745.600
->>>>>>> origin/main
 InitiallyMaximized=True
 
 [SlateAdditionalLayoutConfig]
@@ -184,7 +179,7 @@ AssetPropertyPicker.ThumbnailSizeScale=0.100000
 AssetPropertyPicker.CurrentViewType=0
 
 [Directories2]
-UNR=../../../../../../Users/bib/Documents/GAR/Dino Game/Content
+UNR=../../../../../../Users/bib/Documents/GARGame/Content
 BRUSH=../../../../../../Users/bib/Documents/GARGame/Content/
 FBX=../../../../../../Users/bib/Documents/GARGame/Content/
 FBXAnim=../../../../../../Users/bib/Documents/GARGame/Content/
@@ -1082,30 +1077,13 @@ ExternalImagePicker.TimeStamp=2024.05.13-09.53.39
 ExternalImagePicker.LastCompileMethod=Unknown
 StaticMeshEditor.TimeStamp=2024.05.13-09.53.46
 StaticMeshEditor.LastCompileMethod=Unknown
-TextureEditor.TimeStamp=2024.05.13-09.54.05
-TextureEditor.LastCompileMethod=Unknown
-UATHelper.TimeStamp=2024.05.13-09.54.05
-UATHelper.LastCompileMethod=Unknown
 
 [MRU]
-MRUItem0=/Game/Map
-MRUItem1=/Game/Emmy_Testing
+MRUItem0=/Game/Emmy_Testing
+MRUItem1=/Game/Map
 MRUItem2=/Game/Test
 
 [PlacementMode]
-<<<<<<< HEAD
-RecentlyPlaced=/Game/Materials/gen.gen;
-RecentlyPlaced=/Game/Materials/gen2.gen2;
-RecentlyPlaced=/Game/Materials/Säule.Säule;
-RecentlyPlaced=/Game/Materials/Säule_destroyed.Säule_destroyed;
-RecentlyPlaced=/Game/Materials/Treppe.Treppe;
-RecentlyPlaced=/Game/Assets/saeule.saeule;
-RecentlyPlaced=/Game/Assets/saeule_destroyed.saeule_destroyed;
-RecentlyPlaced=/Engine/BasicShapes/Cube.Cube;/Engine/Transient.ActorFactoryBasicShape_0
-RecentlyPlaced=/Game/Assets/treppe_Cube.treppe_Cube;
-RecentlyPlaced=/Game/Assets/treppe_Cube_001.treppe_Cube_001;
-RecentlyPlaced=/Game/Assets/treppe_Cube_002.treppe_Cube_002;
-=======
 RecentlyPlaced=/Game/Assets/door_Cube.door_Cube;
 RecentlyPlaced=/Game/Blueprints/BP_Lever.BP_Lever;
 RecentlyPlaced=/Script/Engine.PointLight;/Engine/Transient.ActorFactoryPointLight_0
@@ -1114,7 +1092,6 @@ RecentlyPlaced=/Game/Blueprints/BP_Door.BP_Door;
 RecentlyPlaced=/Game/Blueprints/BP_Spawner.BP_Spawner;
 RecentlyPlaced=/Game/Blueprints/BP_Projectile.BP_Projectile;
 RecentlyPlaced=/Game/Blueprints/BP_BrokenPlattform.BP_BrokenPlattform;
->>>>>>> origin/main
 RecentlyPlaced=/Game/Blueprints/BP_Deathbox.BP_Deathbox;
 RecentlyPlaced=/Game/Blueprints/Elevator.Elevator;
 RecentlyPlaced=/Game/Blueprints/BP_CheckpointGame.BP_CheckpointGame;
@@ -1123,12 +1100,10 @@ RecentlyPlaced=/Script/Engine.Character;/Engine/Transient.ActorFactoryCharacter_
 RecentlyPlaced=/Game/Shader+Effekte/Flamethrower.Flamethrower;
 RecentlyPlaced=/Game/Shader+Effekte/FireSmall.FireSmall;
 RecentlyPlaced=/Game/Assets/Fackel1.Fackel1;
+RecentlyPlaced=/Game/Assets/treppe_Cube.treppe_Cube;
 RecentlyPlaced=/Engine/BasicShapes/Cylinder.Cylinder;/Engine/Transient.ActorFactoryBasicShape_0
-<<<<<<< HEAD
-=======
 RecentlyPlaced=/Game/Assets/Fackel2.Fackel2;
 RecentlyPlaced=/Game/Assets/Fackel3.Fackel3;
->>>>>>> origin/main
 
 [DetailCategories]
 Actor.TransformCommon=True
@@ -1715,30 +1690,6 @@ BP_Spawner_C.Collision=True
 BP_Spawner_C.Actor=True
 BP_Spawner_C.Input=True
 BP_Deathbox_C.TransformCommon=True
-<<<<<<< HEAD
-GeomModifier_Pen.Settings=True
-Texture2D.Compression=True
-Texture2D.Texture=True
-Texture2D.File Path=True
-Texture2D.Adjustments=True
-Texture2D.LevelOfDetail=True
-Texture2D.Compositing=True
-MaterialExpressionPanner.MaterialExpressionPanner=True
-MaterialExpressionPanner.MaterialExpression=True
-MaterialExpressionDivide.MaterialExpressionDivide=True
-MaterialExpressionDivide.MaterialExpression=True
-MaterialExpressionAdd.MaterialExpressionAdd=True
-MaterialExpressionAdd.MaterialExpression=True
-MaterialExpressionAppendVector.MaterialExpression=True
-MaterialExpressionConstant.MaterialExpressionConstant=True
-MaterialExpressionConstant.MaterialExpression=True
-MaterialExpressionOneMinus.MaterialExpression=True
-BP_CheckpointGame_C.TransformCommon=True
-BP_CheckpointGame_C.Rendering=True
-BP_CheckpointGame_C.Replication=True
-BP_CheckpointGame_C.Collision=True
-BP_CheckpointGame_C.Actor=True
-=======
 BP_BrokenPlattform_C.Tick=True
 BP_BrokenPlattform_C.Replication=True
 BP_BrokenPlattform_C.Rendering=True
@@ -1816,7 +1767,6 @@ K2Node_VariableSet.DefaultValueCategory=True
 K2Node_VariableSet.Events=True
 K2Node_Timeline.GraphNodeDetail=True
 BP_Projectile_C.Tick=True
->>>>>>> origin/main
 
 [PluginBrowser]
 InstalledPlugins=XRVisualization
@@ -1824,6 +1774,7 @@ InstalledPlugins=XRVisualization
 [/Script/UnrealEd.MaterialEditorOptions]
 bHideUnrelatedNodes=False
 bUseUnsortedMenus=False
+bShowGrid=False
 
 [FBX_Import_UI_Option_FbxImportUI]
 bOverrideFullName=True
@@ -1939,28 +1890,6 @@ bConvertSceneUnit=False
 LastLogListing=FBXImport
 
 [ContentBrowserRecent]
-<<<<<<< HEAD
-MRUItem0=/Game/Textures/Treppe/Treppe_Normal_DirectX
-MRUItem1=/Game/Materials/Treppe
-MRUItem2=/Game/Textures/gen/M_Sandstone_normal
-MRUItem3=/Game/Textures/Säule_destroyed/Material_Base_color
-MRUItem4=/Game/Textures/Säule_destroyed/Material_Normal_DirectX
-MRUItem5=/Game/Textures/gen/M_Sandstone_basecolor
-MRUItem6=/Game/Map
-MRUItem7=/Game/Materials/gen2
-MRUItem8=/Game/Materials/gen
-MRUItem9=/Game/Materials/Säule_destroyed
-MRUItem10=/Game/Materials/Säule
-MRUItem11=/Game/Emmy_Testing
-MRUItem12=/Game/Textures/gen/M_Sandstone_roughness
-MRUItem13=/Game/Blueprints/BP_Deathbox
-MRUItem14=/Game/Blueprints/BP_Spawner
-MRUItem15=/Game/Blueprints/Materials/grastexture
-MRUItem16=/Game/Blueprints/Foliage/gras
-MRUItem17=/Game/Blueprints/Elevator
-MRUItem18=/Game/ThirdPersonBP/Blueprints/ThirdPersonCharacter
-MRUItem19=/Game/Blueprints/Blueprints/BP_Deathbox
-=======
 MRUItem0=/Game/Blueprints/BP_Projectile
 MRUItem1=/Game/Blueprints/BP_Spawner
 MRUItem2=/Game/Assets/FallenKugel
@@ -1981,7 +1910,6 @@ MRUItem16=/Game/Assets/treppe_Cube
 MRUItem17=/Game/Shader+Effekte/Flamethrower
 MRUItem18=/Game/Shader+Effekte/FireSmall
 MRUItem19=/Game/Shader+Effekte/Fire
->>>>>>> origin/main
 
 [AssetEditorToolkitTabLocation]
 /Game/Assets/BSurfaceMesh.BSurfaceMesh=1
@@ -2000,19 +1928,6 @@ MRUItem19=/Game/Shader+Effekte/Fire
 /Game/Blueprints/Foliage/gras.gras=0
 /Game/Blueprints/Materials/grastexture.grastexture=0
 /Game/Blueprints/Elevator.Elevator=0
-<<<<<<< HEAD
-/Game/Blueprints/BP_Spawner.BP_Spawner=1
-/Game/Blueprints/BP_Deathbox.BP_Deathbox=1
-/Game/Materials/Säule.Säule=1
-/Game/Materials/Säule_destroyed.Säule_destroyed=1
-/Game/Materials/gen.gen=1
-/Game/Materials/gen2.gen2=1
-/Game/Textures/gen/M_Sandstone_basecolor.M_Sandstone_basecolor=1
-/Game/Textures/Säule_destroyed/Material_Normal_DirectX.Material_Normal_DirectX=1
-/Game/Textures/Säule_destroyed/Material_Base_color.Material_Base_color=1
-/Game/Textures/gen/M_Sandstone_normal.M_Sandstone_normal=1
-/Game/Textures/Treppe/Treppe_Normal_DirectX.Treppe_Normal_DirectX=1
-=======
 /Game/Blueprints/BP_BrokenPlattform.BP_BrokenPlattform=0
 /Game/Blueprints/BP_CheckpointGame.BP_CheckpointGame=0
 /Game/Assets/FallenKugel.FallenKugel=0
@@ -2021,7 +1936,6 @@ MRUItem19=/Game/Shader+Effekte/Fire
 /Game/Assets/door_Cube.door_Cube=0
 /Game/Blueprints/BP_Spawner.BP_Spawner=0
 /Game/Blueprints/BP_Projectile.BP_Projectile=0
->>>>>>> origin/main
 
 [MaterialEditor]
 PrimType=1
@@ -2190,7 +2104,7 @@ BP_Spawner_C=ThirdPersonCharacter_C.Physics.ConstraintsGroup,ThirdPersonCharacte
 
 [DetailPropertyExpansion]
 MaterialExpressionDynamicParameter="\"Object.ParamNames\" \"Object.DefaultValue\" "
-MaterialExpression=
+MaterialExpression="\"Object.DefaultValue\" "
 Object=
 MaterialExpressionScalarParameter="\"Object.DefaultValue\" "
 MaterialExpressionParameter="\"Object.DefaultValue\" "
@@ -2198,13 +2112,7 @@ ThirdPersonCharacter_C="\"Object.Character.Mesh.Object.Rendering.CustomPrimitive
 Character="\"Object.Character.Mesh.Object.Rendering.CustomPrimitiveData\" \"Object.Character.Mesh.Object.Lighting.LightingChannels\" \"Object.Character.Mesh.Object.Collision.BodyInstance\" \"Object.Character.Mesh.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Character.CharacterMovement.Object.Character Movement: Walking.CurrentFloor\" \"Object.Character.CharacterMovement.Object.Character Movement (Rotation Settings).RotationRate\" \"Object.Character.CharacterMovement.Object.NavMovement.NavAgentProps\" \"Object.Character.CapsuleComponent.Object.Shape.ShapeColor\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Character.CapsuleComponent.Object.Rendering.CustomPrimitiveData\" "
 Pawn="\"Object.Character.Mesh.Object.Rendering.CustomPrimitiveData\" \"Object.Character.Mesh.Object.Lighting.LightingChannels\" \"Object.Character.Mesh.Object.Collision.BodyInstance\" \"Object.Character.Mesh.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Character.CharacterMovement.Object.Character Movement: Walking.CurrentFloor\" \"Object.Character.CharacterMovement.Object.Character Movement (Rotation Settings).RotationRate\" \"Object.Character.CharacterMovement.Object.NavMovement.NavAgentProps\" \"Object.Character.CapsuleComponent.Object.Shape.ShapeColor\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance\" \"Object.Character.CapsuleComponent.Object.Collision.BodyInstance.WalkableSlopeOverride\" \"Object.Character.CapsuleComponent.Object.Rendering.CustomPrimitiveData\" "
 MaterialExpressionVectorParameter="\"Object.DefaultValue\" "
-<<<<<<< HEAD
-GeomModifier_Pen="\"Object.Settings\" "
-GeomModifier_Edit="\"Object.Settings\" "
-GeomModifier="\"Object.Settings\" "
-=======
 InputSettings="\"Object.Bindings.ActionMappings.ActionMappings[4]\" "
->>>>>>> origin/main
 
 [/Script/UnrealEd.EditorLoadingSavingSettings]
 bSCCUseGlobalSettings=False