Merge remote-tracking branch 'origin/master'

delebash · Mar 4, 2024 · 5e73ede · 5e73ede
2 parents f2ad57d + 753ab5f
commit 5e73ede
Show file tree

Hide file tree

Showing 21 changed files with 4 additions and 155 deletions.
diff --git a/.gitignore b/.gitignore
@@ -72,3 +72,7 @@ Intermediate/*
 
 # Cache files for the editor to use
 DerivedDataCache/*
+
+#IDE junk
+.idea/*
+.vsconfig
diff --git a/.idea/.idea.GlobalEnvironmentalSystem.dir/.idea/.gitignore b/.idea/.idea.GlobalEnvironmentalSystem.dir/.idea/.gitignore
diff --git a/.idea/.idea.GlobalEnvironmentalSystem.dir/.idea/encodings.xml b/.idea/.idea.GlobalEnvironmentalSystem.dir/.idea/encodings.xml
diff --git a/.idea/.idea.GlobalEnvironmentalSystem.dir/.idea/indexLayout.xml b/.idea/.idea.GlobalEnvironmentalSystem.dir/.idea/indexLayout.xml
diff --git a/.idea/.idea.GlobalEnvironmentalSystem.dir/.idea/vcs.xml b/.idea/.idea.GlobalEnvironmentalSystem.dir/.idea/vcs.xml
diff --git a/.idea/.idea.UE_GlobalEnvironmentalSystem 5.3.dir/.idea/.gitignore b/.idea/.idea.UE_GlobalEnvironmentalSystem 5.3.dir/.idea/.gitignore
diff --git a/.idea/.idea.UE_GlobalEnvironmentalSystem 5.3.dir/.idea/encodings.xml b/.idea/.idea.UE_GlobalEnvironmentalSystem 5.3.dir/.idea/encodings.xml
diff --git a/.idea/.idea.UE_GlobalEnvironmentalSystem 5.3.dir/.idea/indexLayout.xml b/.idea/.idea.UE_GlobalEnvironmentalSystem 5.3.dir/.idea/indexLayout.xml
diff --git a/.idea/.idea.UE_GlobalEnvironmentalSystem 5.3.dir/.idea/vcs.xml b/.idea/.idea.UE_GlobalEnvironmentalSystem 5.3.dir/.idea/vcs.xml
diff --git a/.idea/.idea.UE_GlobalEnvironmentalSystem 5.3_Dev.dir/.idea/.gitignore b/.idea/.idea.UE_GlobalEnvironmentalSystem 5.3_Dev.dir/.idea/.gitignore
diff --git a/.idea/.idea.UE_GlobalEnvironmentalSystem 5.3_Dev.dir/.idea/encodings.xml b/.idea/.idea.UE_GlobalEnvironmentalSystem 5.3_Dev.dir/.idea/encodings.xml
diff --git a/.idea/.idea.UE_GlobalEnvironmentalSystem 5.3_Dev.dir/.idea/indexLayout.xml b/.idea/.idea.UE_GlobalEnvironmentalSystem 5.3_Dev.dir/.idea/indexLayout.xml
diff --git a/.idea/.idea.UE_GlobalEnvironmentalSystem 5.3_Dev.dir/.idea/vcs.xml b/.idea/.idea.UE_GlobalEnvironmentalSystem 5.3_Dev.dir/.idea/vcs.xml
diff --git a/.idea/.idea.UE_GlobalEnvironmentalSystem.dir/.idea/.gitignore b/.idea/.idea.UE_GlobalEnvironmentalSystem.dir/.idea/.gitignore
diff --git a/.idea/.idea.UE_GlobalEnvironmentalSystem.dir/.idea/encodings.xml b/.idea/.idea.UE_GlobalEnvironmentalSystem.dir/.idea/encodings.xml
diff --git a/.idea/.idea.UE_GlobalEnvironmentalSystem.dir/.idea/indexLayout.xml b/.idea/.idea.UE_GlobalEnvironmentalSystem.dir/.idea/indexLayout.xml
diff --git a/.idea/.idea.UE_GlobalEnvironmentalSystem.dir/.idea/vcs.xml b/.idea/.idea.UE_GlobalEnvironmentalSystem.dir/.idea/vcs.xml
diff --git a/.idea/.idea.UE_GlobalEnvironmentalSystem_Dev_53.dir/.idea/.gitignore b/.idea/.idea.UE_GlobalEnvironmentalSystem_Dev_53.dir/.idea/.gitignore
diff --git a/.idea/.idea.UE_GlobalEnvironmentalSystem_Dev_53.dir/.idea/encodings.xml b/.idea/.idea.UE_GlobalEnvironmentalSystem_Dev_53.dir/.idea/encodings.xml
diff --git a/.idea/.idea.UE_GlobalEnvironmentalSystem_Dev_53.dir/.idea/indexLayout.xml b/.idea/.idea.UE_GlobalEnvironmentalSystem_Dev_53.dir/.idea/indexLayout.xml
diff --git a/.idea/.idea.UE_GlobalEnvironmentalSystem_Dev_53.dir/.idea/vcs.xml b/.idea/.idea.UE_GlobalEnvironmentalSystem_Dev_53.dir/.idea/vcs.xml