Update 1

Author: CrimsofallTechDeV

.gitignore

@@ -1,37 +1,21 @@
-<<<<<<< HEAD
-# =============== #
-# Unity Generated #
-# =============== #
-
-[Ll]ibrary/
-[Tt]emp/
-[Oo]bj/
-[Bb]uild/
-[Bb]uilds/
-[Ll]ogs/
-[Mm]emoryCaptures/
-
-# Asset Store tools
-[Aa]sset[Ss]tore/
-
-# Cache
-[Cc]ache/
-
-# Autogenerated Visual Studio / Rider files
-.vs/
-=======
-# ---> Unity
+
 # This .gitignore file should be placed at the root of your Unity project directory
 #
 # Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
 #
+.utmp/
 /[Ll]ibrary/
 /[Tt]emp/
 /[Oo]bj/
 /[Bb]uild/
 /[Bb]uilds/
 /[Ll]ogs/
 /[Uu]ser[Ss]ettings/
+*.log
+
+# By default unity supports Blender asset imports, *.blend1 blender files do not need to be commited to version control.
+*.blend1
+*.blend1.meta
 
 # MemoryCaptures can get excessive in size.
 # They also could contain extremely sensitive data
@@ -45,6 +29,8 @@
 
 # Autogenerated Jetbrains Rider plugin
 /[Aa]ssets/Plugins/Editor/JetBrains*
+# Jetbrains Rider personal-layer settings
+*.DotSettings.user
 
 # Visual Studio cache directory
 .vs/
@@ -55,7 +41,6 @@
 # Autogenerated VS/MD/Consulo solution and project files
 ExportedObj/
 .consulo/
->>>>>>> 68b4c7663067781d885187678039d84025c8903f
 *.csproj
 *.unityproj
 *.sln
@@ -65,19 +50,6 @@ ExportedObj/
 *.userprefs
 *.pidb
 *.booproj
-<<<<<<< HEAD
-
-# Crash Reports
-sysinfo.txt
-
-# Ignore Unity Collaborate
-.Collab/
-
-# Others
-*.apk
-*.aab
-*.unitypackage
-=======
 *.svd
 *.pdb
 *.mdb
@@ -92,24 +64,37 @@ sysinfo.txt
 # Unity3D generated file on crash reports
 sysinfo.txt
 
+# Mono auto generated files
+mono_crash.*
+
 # Builds
 *.apk
 *.aab
 *.unitypackage
 *.unitypackage.meta
 *.app
-*.zip
-*.rar
-*.7z
 
 # Crashlytics generated file
 crashlytics-build.properties
 
-# Packed Addressables
-/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
-
-# Temporary auto-generated Android Assets
-/[Aa]ssets/[Ss]treamingAssets/aa.meta
-/[Aa]ssets/[Ss]treamingAssets/aa/*
-
->>>>>>> 68b4c7663067781d885187678039d84025c8903f
+# TestRunner generated files
+InitTestScene*.unity*
+
+# Addressables default ignores, before user customizations
+/ServerData
+/[Aa]ssets/StreamingAssets/aa*
+/[Aa]ssets/AddressableAssetsData/link.xml*
+/[Aa]ssets/Addressables_Temp*
+# By default, Addressables content builds will generate addressables_content_state.bin
+# files in platform-specific subfolders, for example:
+# /Assets/AddressableAssetsData/OSX/addressables_content_state.bin
+/[Aa]ssets/AddressableAssetsData/*/*.bin*
+
+# Visual Scripting auto-generated files
+/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db
+/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta
+/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers
+/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers.meta
+
+# Auto-generated scenes by play mode tests
+/[Aa]ssets/[Ii]nit[Tt]est[Ss]cene*.unity*