Merge remote-tracking branch 'origin/master' into 1.7

# Conflicts: # Flax.flaxproj
2023-10-09 12:40:47 +02:00
parent 18aafb6fc7 8e23781153
commit 09f2be907e
86 changed files with 1406 additions and 686 deletions
--- a/Source/Editor/Windows/ContentWindow.cs
+++ b/Source/Editor/Windows/ContentWindow.cs
@@ -329,7 +329,7 @@ namespace FlaxEditor.Windows
                b.Checked = ShowPluginsFiles;
                b.CloseMenuOnClick = false;
                b.AutoCheck = true;
-                
+
                b = show.ContextMenu.AddButton("Generated files", () => ShowGeneratedFiles = !ShowGeneratedFiles);
                b.TooltipText = "Shows generated files";
                b.Checked = ShowGeneratedFiles;
@@ -755,7 +755,7 @@ namespace FlaxEditor.Windows
        }

        /// <summary>
-        /// Stars creating the folder.
+        /// Starts creating the folder.
        /// </summary>
        public void NewFolder()
        {