Merge branch 'main' into doolys-branch

BasisVR · Dec 31, 2024 · f9b4a42 · f9b4a42
2 parents 2da6bfc + 5518b90
commit f9b4a42
Show file tree

Hide file tree

Showing 408 changed files with 23 additions and 207,440 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,26 @@
 # Export from building Basis Server
 /[Bb]asis\ [Ss]erver\ [Ee]xport
 
+# C# build artifacts
+[Bb]in/
+[Oo]bj/
+
+# Nix stuff
+.direnv/
+.envrc
+
+# Jetbrains Rider
+.idea/
+
+# Visual Studio cache directory
+.vs/
+
+# Gradle cache directory
+.gradle/
+
+# Vim
+*.swp
+*.swo
+
+# MacOS
+.DS_Store
diff --git a/Basis Server/.vs/Basis Network Server/DesignTimeBuild/.dtbcache.v2 b/Basis Server/.vs/Basis Network Server/DesignTimeBuild/.dtbcache.v2
diff --git a/Basis Server/.vs/Basis Network Server/v17/.futdcache.v2 b/Basis Server/.vs/Basis Network Server/v17/.futdcache.v2
diff --git a/Basis Server/.vs/Basis Network Server/v17/DocumentLayout.backup.json b/Basis Server/.vs/Basis Network Server/v17/DocumentLayout.backup.json
diff --git a/Basis Server/.vs/Basis Network Server/v17/DocumentLayout.json b/Basis Server/.vs/Basis Network Server/v17/DocumentLayout.json
diff --git a/Basis Server/.vs/Basis Network Server/v17/HierarchyCache.v1.txt b/Basis Server/.vs/Basis Network Server/v17/HierarchyCache.v1.txt
diff --git a/Basis Server/.vs/BasisNetworkServer/DesignTimeBuild/.dtbcache.v2 b/Basis Server/.vs/BasisNetworkServer/DesignTimeBuild/.dtbcache.v2
diff --git a/Basis Server/.vs/BasisNetworkServer/v17/.futdcache.v2 b/Basis Server/.vs/BasisNetworkServer/v17/.futdcache.v2