Merge remote-tracking branch 'origin/main' into merge-fix

# Conflicts: # .gitignore # project.godot
2026-08-18 14:40:41 +00:00
parent 88cd255040 2c3756b640
commit dbdc01f8d6
39 changed files with 2053 additions and 5 deletions
@@ -1,4 +1,4 @@
-# Godot editor cache / generated files
+# Godot 4 editor cache/import directory
 .godot/

 # Godot export artifacts